virtio pmem driver
Subsystems (12)
v8 cover virtio pmem driver
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side. We have ack on ext4, xfs patches(4, 5 & 6) patch 2. Still need your ack on nvdimm patches(1 & 3) & virtio patch 2.
Changes done from v7 are only in patch(2 & 3) and not affecting existing reviews. Request to please review.
----
This patch series has implementation for "virtio pmem". "virtio pmem" is fake persistent memory(nvdimm) in guest which allows to bypass the guest page cache. This also implements a VIRTIO based asynchronous flush mechanism.
Sharing guest kernel driver in this patchset with the changes suggested in v4. Tested with Qemu side device emulation [6] for virtio-pmem. Documented the impact of possible page cache side channel attacks with suggested countermeasures.
Details of project idea for 'virtio pmem' flushing interface is shared [3] & [4].
Implementation is divided into two parts:
New virtio pmem guest driver and qemu code changes for new virtio pmem paravirtualized device.
1. Guest virtio-pmem kernel driver
---------------------------------
- Reads persistent memory range from paravirt device and registers with 'nvdimm_bus'.
- 'nvdimm/pmem' driver uses this information to allocate persistent memory region and setup filesystem operations to the allocated memory.
- virtio pmem driver implements asynchronous flushing interface to flush from guest to host.
2. Qemu virtio-pmem device
---------------------------------
- Creates virtio pmem device and exposes a memory range to KVM guest.
- At host side this is file backed memory which acts as persistent memory.
- Qemu side flush uses aio thread pool API's and virtio for asynchronous guest multi request handling.
David Hildenbrand CCed also posted a modified version[7] of qemu virtio-pmem code based on updated Qemu memory device API.
Virtio-pmem security implications and countermeasures:
-----------------------------------------------------
In previous posting of kernel driver, there was discussion [9] on possible implications of page cache side channel attacks with virtio pmem. After thorough analysis of details of known side channel attacks, below are the suggestions:
- Depends entirely on how host backing image file is mapped into guest address space.
- virtio-pmem device emulation, by default shared mapping is used to map host backing file. It is recommended to use separate backing file at host side for every guest. This will prevent any possibility of executing common code from multiple guests and any chance of inferring guest local data based based on execution time.
- If backing file is required to be shared among multiple guests it is recommended to don't support host page cache eviction commands from the guest driver. This will avoid any possibility of inferring guest local data or host data from another guest.
- Proposed device specification [8] for virtio-pmem device with details of possible security implications and suggested countermeasures for device emulation.
Virtio-pmem errors handling:
----------------------------------------
Checked behaviour of virtio-pmem for below types of errors Need suggestions on expected behaviour for handling these errors?
- Hardware Errors: Uncorrectable recoverable Errors:
a] virtio-pmem:
- As per current logic if error page belongs to Qemu process, host MCE handler isolates(hwpoison) that page and send SIGBUS. Qemu SIGBUS handler injects exception to KVM guest.
- KVM guest then isolates the page and send SIGBUS to guest userspace process which has mapped the page.
b] Existing implementation for ACPI pmem driver:
- Handles such errors with MCE notifier and creates a list of bad blocks. Read/direct access DAX operation return EIO if accessed memory page fall in bad block list.
- It also starts backgound scrubbing.
- Similar functionality can be reused in virtio-pmem with MCE notifier but without scrubbing(no ACPI/ARS)? Need inputs to confirm if this behaviour is ok or needs any change?
Changes from PATCH v7: [1]
- Corrected pending request queue logic (patch 2) - Jakub Staroń
- Used unsigned long flags for passing DAXDEV_F_SYNC (patch 3) - Dan
- Fixed typo => vma 'flag' to 'vm_flag' (patch 4)
- Added rob in patch 6 & patch 2
Changes from PATCH v6: [1]
- Corrected comment format in patch 5 & patch 6. [Dave]
- Changed variable declaration indentation in patch 6 [Darrick]
- Add Reviewed-by tag by 'Jan Kara' in patch 4 & patch 5
Changes from PATCH v5: [2]
Changes suggested in by - [Cornelia, Yuval]
- Remove assignment chaining in virtio driver
- Better error message and remove not required free
- Check nd_region before use
Changes suggested by - [Jan Kara]
- dax_synchronous() for !CONFIG_DAX
- Correct 'daxdev_mapping_supported' comment and non-dax implementation
Changes suggested by - [Dan Williams]
- Pass meaningful flag 'DAXDEV_F_SYNC' to alloc_dax
- Gate nvdimm_flush instead of additional async parameter
- Move block chaining logic to flush callback than common nvdimm_flush
- Use NULL flush callback for generic flush for better readability [Dan, Jan]
- Use virtio device id 27 from 25(already used) - [MST]
Changes from PATCH v4:
- Factor out MAP_SYNC supported functionality to a common helper [Dave, Darrick, Jan]
- Comment, indentation and virtqueue_kick failure handle - Yuval Shaia
Changes from PATCH v3:
- Use generic dax_synchronous() helper to check for DAXDEV_SYNC flag - [Dan, Darrick, Jan]
- Add 'is_nvdimm_async' function
- Document page cache side channel attacks implications & countermeasures - [Dave Chinner, Michael]
Changes from PATCH v2:
- Disable MAP_SYNC for ext4 & XFS filesystems - [Dan]
- Use name 'virtio pmem' in place of 'fake dax'
Changes from PATCH v1:
- 0-day build test for build dependency on libnvdimm
Changes suggested by - [Dan Williams]
- Split the driver into two parts virtio & pmem
- Move queuing of async block request to block layer
- Add "sync" parameter in nvdimm_flush function
- Use indirect call for nvdimm_flush
- Don’t move declarations to common global header e.g nd.h
- nvdimm_flush() return 0 or -EIO if it fails
- Teach nsio_rw_bytes() that the flush can fail
- Rename nvdimm_flush() to generic_nvdimm_flush()
- Use 'nd_region->provider_data' for long dereferencing
- Remove virtio_pmem_freeze/restore functions
- Remove BSD license text with SPDX license text
- Add might_sleep() in virtio_pmem_flush - [Luiz]
- Make spin_lock_irqsave() narrow
Pankaj Gupta (6):
libnvdimm: nd_region flush callback support
virtio-pmem: Add virtio-pmem guest driver
libnvdimm: add nd_region buffered dax_dev flag
dax: check synchronous mapping is supported
ext4: disable map_sync for virtio pmem
xfs: disable map_sync for virtio pmem
[1] https://lkml.org/lkml/2019/4/26/36
[2] https://lkml.org/lkml/2019/4/23/1092
[3] https://www.spinics.net/lists/kvm/msg149761.html
[4] https://www.spinics.net/lists/kvm/msg153095.html
[5] https://lkml.org/lkml/2018/8/31/413
[6] https://marc.info/?l=linux-kernel&m=153572228719237&w=2
[7] https://marc.info/?l=qemu-devel&m=153555721901824&w=2
[8] https://lists.oasis-open.org/archives/virtio-dev/201903/msg00083.html
[9] https://lkml.org/lkml/2019/1/9/1191
drivers/acpi/nfit/core.c | 4 - drivers/dax/bus.c | 2 drivers/dax/super.c | 13 +++ drivers/md/dm.c | 3 drivers/nvdimm/Makefile | 1 drivers/nvdimm/claim.c | 6 + drivers/nvdimm/nd.h | 1 drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/pmem.c | 18 +++-- drivers/nvdimm/region_devs.c | 33 +++++++++ drivers/nvdimm/virtio_pmem.c | 117 +++++++++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ fs/ext4/file.c | 10 +-- fs/xfs/xfs_file.c | 9 +- include/linux/dax.h | 25 ++++++- include/linux/libnvdimm.h | 9 ++ include/linux/virtio_pmem.h | 60 ++++++++++++++++++ include/uapi/linux/virtio_ids.h | 1 include/uapi/linux/virtio_pmem.h | 10 +++ 19 files changed, 436 insertions(+), 25 deletions(-)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v8 1/6 libnvdimm: nd_region flush callback support
This patch adds functionality to perform flush from guest to host over VIRTIO. We are registering a callback based on 'nd_region' type. virtio_pmem driver requires this special flush function. For rest of the region types we are registering existing flush function. Report error returned by host fsync failure to userspace.
--- drivers/acpi/nfit/core.c | 4 ++-- drivers/nvdimm/claim.c | 6 ++++-- drivers/nvdimm/nd.h | 1 + drivers/nvdimm/pmem.c | 13 ++++++++----- drivers/nvdimm/region_devs.c | 26 ++++++++++++++++++++++++-- include/linux/libnvdimm.h | 8 +++++++- 6 files changed, 46 insertions(+), 12 deletions(-)
drivers/acpi/nfit/core.c +2 -2
@@ -2434,7 +2434,7 @@ static void write_blk_ctl(struct nfit_blk *nfit_blk, unsigned int bw, offset =to_interleave_offset (offset, mmio);writeq (cmd, mmio->addr.base + offset); -nvdimm_flush (nfit_blk->nd_region); +nvdimm_flush (nfit_blk->nd_region,NULL );if (nfit_blk->dimm_flags &NFIT_BLK_DCR_LATCH )readq (mmio->addr.base + offset);
@@ -2483,7 +2483,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk, }if (rw) -nvdimm_flush (nfit_blk->nd_region); +nvdimm_flush (nfit_blk->nd_region,NULL ); rc =read_blk_stat (nfit_blk, lane) ? -EIO :0 ;return rc;
drivers/nvdimm/claim.c +4 -2
@@ -263,7 +263,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,struct nd_namespace_io *nsio =to_nd_namespace_io (&ndns->dev);unsigned int sz_align =ALIGN (size + (offset & (512 -1 )),512 );sector_t sector = offset >>9 ; -int rc =0 ; +int rc =0 , ret =0 ;if (unlikely (!size))return 0 ;
@@ -301,7 +301,9 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, }memcpy_flushcache (nsio->addr + offset, buf, size); -nvdimm_flush (to_nd_region (ndns->dev.parent)); + ret =nvdimm_flush (to_nd_region (ndns->dev.parent),NULL ); +if (ret) + rc = ret;return rc; }
drivers/nvdimm/nd.h +1 -0
@@ -159,6 +159,7 @@ struct nd_region {struct badblocks bb;struct nd_interleave_set *nd_set;struct nd_percpu_lane __percpu *lane; +int (*flush)(struct nd_region *nd_region,struct bio *bio);struct nd_mapping mapping[0 ]; };
drivers/nvdimm/pmem.c +8 -5
@@ -192,6 +192,7 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pmem, struct page *page,static blk_qc_t pmem_make_request (struct request_queue *q,struct bio *bio) { +int ret =0 ;blk_status_t rc =0 ;bool do_acct;unsigned long start;
@@ -201,7 +202,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)struct nd_region *nd_region =to_region (pmem);if (bio->bi_opf &REQ_PREFLUSH ) -nvdimm_flush (nd_region); + ret =nvdimm_flush (nd_region, bio); do_acct =nd_iostat_start (bio, &start);bio_for_each_segment (bvec, bio, iter) {
@@ -216,7 +217,10 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)nd_iostat_end (bio, start);if (bio->bi_opf &REQ_FUA ) -nvdimm_flush (nd_region); + ret =nvdimm_flush (nd_region, bio); + +if (ret) + bio->bi_status =errno_to_blk_status (ret);bio_endio (bio);return BLK_QC_T_NONE ;
@@ -469,7 +473,6 @@ static int pmem_attach_disk(struct device *dev, }dax_write_cache (dax_dev,nvdimm_has_cache (nd_region)); pmem->dax_dev = dax_dev; - gendev =disk_to_dev (disk); gendev->groups = pmem_attribute_groups;
@@ -527,14 +530,14 @@ static int nd_pmem_remove(struct device *dev)sysfs_put (pmem->bb_state); pmem->bb_state =NULL ; } -nvdimm_flush (to_nd_region (dev->parent)); +nvdimm_flush (to_nd_region (dev->parent),NULL );return 0 ; }static void nd_pmem_shutdown (struct device *dev) { -nvdimm_flush (to_nd_region (dev->parent)); +nvdimm_flush (to_nd_region (dev->parent),NULL ); }static void nd_pmem_notify (struct device *dev,enum nvdimm_event event)
drivers/nvdimm/region_devs.c +24 -2
@@ -295,7 +295,9 @@ static ssize_t deep_flush_store(struct device *dev, struct device_attribute *attreturn rc;if (!flush)return -EINVAL ; -nvdimm_flush (nd_region); + rc =nvdimm_flush (nd_region,NULL ); +if (rc) +return rc;return len; }
@@ -1085,6 +1087,11 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, dev->of_node = ndr_desc->of_node; nd_region->ndr_size =resource_size (ndr_desc->res); nd_region->ndr_start = ndr_desc->res->start; +if (ndr_desc->flush) + nd_region->flush = ndr_desc->flush; +else + nd_region->flush =NULL ; +nd_device_register (dev);return nd_region;
@@ -1125,11 +1132,24 @@ struct nd_region *nvdimm_volatile_region_create(struct nvdimm_bus *nvdimm_bus, }EXPORT_SYMBOL_GPL (nvdimm_volatile_region_create); +int nvdimm_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +if (!nd_region->flush) + rc =generic_nvdimm_flush (nd_region); +else { +if (nd_region->flush (nd_region, bio)) + rc = -EIO ; + } + +return rc; +}/** * nvdimm_flush - flush any posted write queues between the cpu and pmem media * @nd_region: blk or interleaved pmem region */ -void nvdimm_flush (struct nd_region *nd_region) +int generic_nvdimm_flush (struct nd_region *nd_region) {struct nd_region_data *ndrd =dev_get_drvdata (&nd_region->dev);int i, idx;
@@ -1153,6 +1173,8 @@ void nvdimm_flush(struct nd_region *nd_region)if (ndrd_get_flush_wpq (ndrd, i,0 ))writeq (1 ,ndrd_get_flush_wpq (ndrd, i, idx));wmb (); + +return 0 ; }EXPORT_SYMBOL_GPL (nvdimm_flush);
include/linux/libnvdimm.h +7 -1
@@ -65,6 +65,9 @@ enum {*/ ND_REGION_PERSIST_MEMCTRL =2 , +/* Platform provides asynchronous flush mechanism */ +ND_REGION_ASYNC =3 , +/* mark newly adjusted resources as requiring a label update */ DPA_RESOURCE_ADJUSTED = 1 << 0, };
@@ -121,6 +124,7 @@ struct nd_mapping_desc {int position; }; +struct nd_region ;struct nd_region_desc {struct resource *res;struct nd_mapping_desc *mapping;
@@ -133,6 +137,7 @@ struct nd_region_desc {int target_node;unsigned long flags;struct device_node *of_node; +int (*flush)(struct nd_region *nd_region,struct bio *bio); };struct device ;
@@ -260,7 +265,8 @@ unsigned long nd_blk_memremap_flags(struct nd_blk_region *ndbr);unsigned int nd_region_acquire_lane (struct nd_region *nd_region);void nd_region_release_lane (struct nd_region *nd_region,unsigned int lane);u64 nd_fletcher64 (void *addr,size_t len,bool le); -void nvdimm_flush (struct nd_region *nd_region); +int nvdimm_flush (struct nd_region *nd_region,struct bio *bio); +int generic_nvdimm_flush (struct nd_region *nd_region);int nvdimm_has_flush (struct nd_region *nd_region);int nvdimm_has_cache (struct nd_region *nd_region);int nvdimm_in_overwrite (struct nvdimm *nvdimm);
Signature · 1 line
2.20.1
PATCH v8 1/6 libnvdimm: nd_region flush callback support
In reply to Pankaj GuptaThis patch adds functionality to perform flush from guest to host over VIRTIO. We are registering a callback based on 'nd_region' type. virtio_pmem driver requires this special flush function. For rest of the region types we are registering existing flush function. Report error returned by host fsync failure to userspace.
--- drivers/acpi/nfit/core.c | 4 ++-- drivers/nvdimm/claim.c | 6 ++++-- drivers/nvdimm/nd.h | 1 + drivers/nvdimm/pmem.c | 13 ++++++++----- drivers/nvdimm/region_devs.c | 26 ++++++++++++++++++++++++-- include/linux/libnvdimm.h | 8 +++++++- 6 files changed, 46 insertions(+), 12 deletions(-)
drivers/acpi/nfit/core.c +2 -2
@@ -2434,7 +2434,7 @@ static void write_blk_ctl(struct nfit_blk *nfit_blk, unsigned int bw, offset =to_interleave_offset (offset, mmio);writeq (cmd, mmio->addr.base + offset); -nvdimm_flush (nfit_blk->nd_region); +nvdimm_flush (nfit_blk->nd_region,NULL );if (nfit_blk->dimm_flags &NFIT_BLK_DCR_LATCH )readq (mmio->addr.base + offset);
@@ -2483,7 +2483,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk, }if (rw) -nvdimm_flush (nfit_blk->nd_region); +nvdimm_flush (nfit_blk->nd_region,NULL ); rc =read_blk_stat (nfit_blk, lane) ? -EIO :0 ;return rc;
drivers/nvdimm/claim.c +4 -2
@@ -263,7 +263,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,struct nd_namespace_io *nsio =to_nd_namespace_io (&ndns->dev);unsigned int sz_align =ALIGN (size + (offset & (512 -1 )),512 );sector_t sector = offset >>9 ; -int rc =0 ; +int rc =0 , ret =0 ;if (unlikely (!size))return 0 ;
@@ -301,7 +301,9 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, }memcpy_flushcache (nsio->addr + offset, buf, size); -nvdimm_flush (to_nd_region (ndns->dev.parent)); + ret =nvdimm_flush (to_nd_region (ndns->dev.parent),NULL ); +if (ret) + rc = ret;return rc; }
drivers/nvdimm/nd.h +1 -0
@@ -159,6 +159,7 @@ struct nd_region {struct badblocks bb;struct nd_interleave_set *nd_set;struct nd_percpu_lane __percpu *lane; +int (*flush)(struct nd_region *nd_region,struct bio *bio);struct nd_mapping mapping[0 ]; };
drivers/nvdimm/pmem.c +8 -5
@@ -192,6 +192,7 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pmem, struct page *page,static blk_qc_t pmem_make_request (struct request_queue *q,struct bio *bio) { +int ret =0 ;blk_status_t rc =0 ;bool do_acct;unsigned long start;
@@ -201,7 +202,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)struct nd_region *nd_region =to_region (pmem);if (bio->bi_opf &REQ_PREFLUSH ) -nvdimm_flush (nd_region); + ret =nvdimm_flush (nd_region, bio); do_acct =nd_iostat_start (bio, &start);bio_for_each_segment (bvec, bio, iter) {
@@ -216,7 +217,10 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)nd_iostat_end (bio, start);if (bio->bi_opf &REQ_FUA ) -nvdimm_flush (nd_region); + ret =nvdimm_flush (nd_region, bio); + +if (ret) + bio->bi_status =errno_to_blk_status (ret);bio_endio (bio);return BLK_QC_T_NONE ;
@@ -469,7 +473,6 @@ static int pmem_attach_disk(struct device *dev, }dax_write_cache (dax_dev,nvdimm_has_cache (nd_region)); pmem->dax_dev = dax_dev; - gendev =disk_to_dev (disk); gendev->groups = pmem_attribute_groups;
@@ -527,14 +530,14 @@ static int nd_pmem_remove(struct device *dev)sysfs_put (pmem->bb_state); pmem->bb_state =NULL ; } -nvdimm_flush (to_nd_region (dev->parent)); +nvdimm_flush (to_nd_region (dev->parent),NULL );return 0 ; }static void nd_pmem_shutdown (struct device *dev) { -nvdimm_flush (to_nd_region (dev->parent)); +nvdimm_flush (to_nd_region (dev->parent),NULL ); }static void nd_pmem_notify (struct device *dev,enum nvdimm_event event)
drivers/nvdimm/region_devs.c +24 -2
@@ -295,7 +295,9 @@ static ssize_t deep_flush_store(struct device *dev, struct device_attribute *attreturn rc;if (!flush)return -EINVAL ; -nvdimm_flush (nd_region); + rc =nvdimm_flush (nd_region,NULL ); +if (rc) +return rc;return len; }
@@ -1085,6 +1087,11 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, dev->of_node = ndr_desc->of_node; nd_region->ndr_size =resource_size (ndr_desc->res); nd_region->ndr_start = ndr_desc->res->start; +if (ndr_desc->flush) + nd_region->flush = ndr_desc->flush; +else + nd_region->flush =NULL ; +nd_device_register (dev);return nd_region;
@@ -1125,11 +1132,24 @@ struct nd_region *nvdimm_volatile_region_create(struct nvdimm_bus *nvdimm_bus, }EXPORT_SYMBOL_GPL (nvdimm_volatile_region_create); +int nvdimm_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +if (!nd_region->flush) + rc =generic_nvdimm_flush (nd_region); +else { +if (nd_region->flush (nd_region, bio)) + rc = -EIO ; + } + +return rc; +}/** * nvdimm_flush - flush any posted write queues between the cpu and pmem media * @nd_region: blk or interleaved pmem region */ -void nvdimm_flush (struct nd_region *nd_region) +int generic_nvdimm_flush (struct nd_region *nd_region) {struct nd_region_data *ndrd =dev_get_drvdata (&nd_region->dev);int i, idx;
@@ -1153,6 +1173,8 @@ void nvdimm_flush(struct nd_region *nd_region)if (ndrd_get_flush_wpq (ndrd, i,0 ))writeq (1 ,ndrd_get_flush_wpq (ndrd, i, idx));wmb (); + +return 0 ; }EXPORT_SYMBOL_GPL (nvdimm_flush);
include/linux/libnvdimm.h +7 -1
@@ -65,6 +65,9 @@ enum {*/ ND_REGION_PERSIST_MEMCTRL =2 , +/* Platform provides asynchronous flush mechanism */ +ND_REGION_ASYNC =3 , +/* mark newly adjusted resources as requiring a label update */ DPA_RESOURCE_ADJUSTED = 1 << 0, };
@@ -121,6 +124,7 @@ struct nd_mapping_desc {int position; }; +struct nd_region ;struct nd_region_desc {struct resource *res;struct nd_mapping_desc *mapping;
@@ -133,6 +137,7 @@ struct nd_region_desc {int target_node;unsigned long flags;struct device_node *of_node; +int (*flush)(struct nd_region *nd_region,struct bio *bio); };struct device ;
@@ -260,7 +265,8 @@ unsigned long nd_blk_memremap_flags(struct nd_blk_region *ndbr);unsigned int nd_region_acquire_lane (struct nd_region *nd_region);void nd_region_release_lane (struct nd_region *nd_region,unsigned int lane);u64 nd_fletcher64 (void *addr,size_t len,bool le); -void nvdimm_flush (struct nd_region *nd_region); +int nvdimm_flush (struct nd_region *nd_region,struct bio *bio); +int generic_nvdimm_flush (struct nd_region *nd_region);int nvdimm_has_flush (struct nd_region *nd_region);int nvdimm_has_cache (struct nd_region *nd_region);int nvdimm_in_overwrite (struct nvdimm *nvdimm);
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
PATCH v8 2/6 virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaThis patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on nvdimm_bus. It also creates a nd_region object with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.h
drivers/nvdimm/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.o
drivers/nvdimm/nd_virtio.c new file +129 -0
129 lines not on this page · raw message
drivers/nvdimm/virtio_pmem.c new file +117 -0
117 lines not on this page · raw message
drivers/virtio/Kconfig +10 -0
@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIO
include/linux/virtio_pmem.h new file +60 -0
60 lines not on this page · raw message
include/uapi/linux/virtio_ids.h +1 -0
@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */
include/uapi/linux/virtio_pmem.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif
Signature · 1 line
2.20.1
PATCH v8 2/6 virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaThis patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on nvdimm_bus. It also creates a nd_region object with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.h
drivers/nvdimm/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.o
drivers/nvdimm/nd_virtio.c new file +129 -0
129 lines not on this page · raw message
drivers/nvdimm/virtio_pmem.c new file +117 -0
117 lines not on this page · raw message
drivers/virtio/Kconfig +10 -0
@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIO
include/linux/virtio_pmem.h new file +60 -0
60 lines not on this page · raw message
include/uapi/linux/virtio_ids.h +1 -0
@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */
include/uapi/linux/virtio_pmem.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 11 lines · Pankaj Gupta
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
Quoted 6 lines
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>
Quoted 400 lines
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +129
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req; + +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret; + } + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ +if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child); + }else { +if (virtio_pmem_flush (nd_region)) + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +117
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" ); +if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list); + +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region; + +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); + +if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent); +return 0 ; +out_nd: + err = -ENXIO ; +nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq: + vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" ); +return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); + +nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +10
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIOinclude/linux/virtio_pmem.h new file +60
-0@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* virtio_pmem.h: virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +**/ + +#ifndef _LINUX_VIRTIO_PMEM_H +#define _LINUX_VIRTIO_PMEM_H + +#include <linux/virtio_ids.h> +#include <linux/module.h> +#include <linux/virtio_config.h> +#include <uapi/linux/virtio_pmem.h> +#include <linux/libnvdimm.h> +#include <linux/spinlock.h> + +struct virtio_pmem_request { +/* Host return status corresponding to flush request */ +int ret; + +/* command name*/ +char name[16 ]; + +/* Wait queue to process deferred work after ack from host */ +wait_queue_head_t host_acked; +bool done; + +/* Wait queue to process deferred work after virt queue buffer avail */ +wait_queue_head_t wq_buf; +bool wq_buf_avail; +struct list_head list; +}; + +struct virtio_pmem { +struct virtio_device *vdev; + +/* Virtio pmem request queue */ +struct virtqueue *req_vq; + +/* nvdimm bus registers virtio pmem device */ +struct nvdimm_bus *nvdimm_bus; +struct nvdimm_bus_descriptor nd_desc; + +/* List to store deferred work if virtqueue is full */ +struct list_head req_list; + +/* Synchronize virtqueue data */ +spinlock_t pmem_lock; + +/* Memory region information */ +uint64_t start; +uint64_t size; +}; + +void host_ack (struct virtqueue *vq); +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio); +#endif include/uapi/linux/virtio_ids.h +1
-0@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */ include/uapi/linux/virtio_pmem.h new file +10
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif Signature · 1 line
2.20.1
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaQuoted 11 lines · Pankaj Gupta
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
Quoted 6 lines
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>
Quoted 400 lines
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +129
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req; + +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret; + } + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ +if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child); + }else { +if (virtio_pmem_flush (nd_region)) + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +117
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" ); +if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list); + +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region; + +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); + +if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent); +return 0 ; +out_nd: + err = -ENXIO ; +nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq: + vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" ); +return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); + +nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +10
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIOinclude/linux/virtio_pmem.h new file +60
-0@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* virtio_pmem.h: virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +**/ + +#ifndef _LINUX_VIRTIO_PMEM_H +#define _LINUX_VIRTIO_PMEM_H + +#include <linux/virtio_ids.h> +#include <linux/module.h> +#include <linux/virtio_config.h> +#include <uapi/linux/virtio_pmem.h> +#include <linux/libnvdimm.h> +#include <linux/spinlock.h> + +struct virtio_pmem_request { +/* Host return status corresponding to flush request */ +int ret; + +/* command name*/ +char name[16 ]; + +/* Wait queue to process deferred work after ack from host */ +wait_queue_head_t host_acked; +bool done; + +/* Wait queue to process deferred work after virt queue buffer avail */ +wait_queue_head_t wq_buf; +bool wq_buf_avail; +struct list_head list; +}; + +struct virtio_pmem { +struct virtio_device *vdev; + +/* Virtio pmem request queue */ +struct virtqueue *req_vq; + +/* nvdimm bus registers virtio pmem device */ +struct nvdimm_bus *nvdimm_bus; +struct nvdimm_bus_descriptor nd_desc; + +/* List to store deferred work if virtqueue is full */ +struct list_head req_list; + +/* Synchronize virtqueue data */ +spinlock_t pmem_lock; + +/* Memory region information */ +uint64_t start; +uint64_t size; +}; + +void host_ack (struct virtqueue *vq); +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio); +#endif include/uapi/linux/virtio_ids.h +1
-0@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */ include/uapi/linux/virtio_pmem.h new file +10
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif Signature · 1 line
2.20.1
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [Qemu-devel] [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 10 lines
Quoted 10 lines
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
Quoted 8 lines
Quoted 6 lines
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>
Thank you, Michael.
Best regards,
Pankaj
Quoted 405 lines
Quoted 403 lines
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +129
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req; + +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret; + } + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ +if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child); + }else { +if (virtio_pmem_flush (nd_region)) + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +117
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" ); +if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list); + +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region; + +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); + +if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent); +return 0 ; +out_nd: + err = -ENXIO ; +nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq: + vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" ); +return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); + +nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +10
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIOinclude/linux/virtio_pmem.h new file +60
-0@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* virtio_pmem.h: virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +**/ + +#ifndef _LINUX_VIRTIO_PMEM_H +#define _LINUX_VIRTIO_PMEM_H + +#include <linux/virtio_ids.h> +#include <linux/module.h> +#include <linux/virtio_config.h> +#include <uapi/linux/virtio_pmem.h> +#include <linux/libnvdimm.h> +#include <linux/spinlock.h> + +struct virtio_pmem_request { +/* Host return status corresponding to flush request */ +int ret; + +/* command name*/ +char name[16 ]; + +/* Wait queue to process deferred work after ack from host */ +wait_queue_head_t host_acked; +bool done; + +/* Wait queue to process deferred work after virt queue buffer avail */ +wait_queue_head_t wq_buf; +bool wq_buf_avail; +struct list_head list; +}; + +struct virtio_pmem { +struct virtio_device *vdev; + +/* Virtio pmem request queue */ +struct virtqueue *req_vq; + +/* nvdimm bus registers virtio pmem device */ +struct nvdimm_bus *nvdimm_bus; +struct nvdimm_bus_descriptor nd_desc; + +/* List to store deferred work if virtqueue is full */ +struct list_head req_list; + +/* Synchronize virtqueue data */ +spinlock_t pmem_lock; + +/* Memory region information */ +uint64_t start; +uint64_t size; +}; + +void host_ack (struct virtqueue *vq); +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio); +#endif include/uapi/linux/virtio_ids.h +1
-0@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */ include/uapi/linux/virtio_pmem.h new file +10
-1@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H + +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif --2.20.1
Re: [Qemu-devel] [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Michael S. TsirkinQuoted 10 lines
Quoted 10 lines
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.
Quoted 8 lines
Quoted 6 lines
This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>
Thank you, Michael.
Best regards,
Pankaj
Quoted 395 lines
Quoted 395 lines
--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +129
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req; + +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret; + } + +/* When host has read buffer, this completes via host_ack */ +wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ +if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child); + }else { +if (virtio_pmem_flush (nd_region)) + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +117
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" ); +if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list); + +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region; + +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); + +if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent); +return 0 ; +out_nd: + err = -ENXIO ; +nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq: + vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" ); +return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); + +nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +10
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range. + + If unsure, say M. + config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIOinclude/linux/virtio_pmem.h new file +60
-0@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* virtio_pmem.h: virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +**/ + +#ifndef _LINUX_VIRTIO_PMEM_H +#define _LINUX_VIRTIO_PMEM_H + +#include <linux/virtio_ids.h> +#include <linux/module.h> +#include <linux/virtio_config.h> +#include <uapi/linux/virtio_pmem.h> +#include <linux/libnvdimm.h> +#include <linux/spinlock.h> + +struct virtio_pmem_request { +/* Host return status corresponding to flush request */ +int ret; + +/* command name*/ +char name[16 ]; + +/* Wait queue to process deferred work after ack from host */ +wait_queue_head_t host_acked; +bool done; + +/* Wait queue to process deferred work after virt queue buffer avail */ +wait_queue_head_t wq_buf; +bool wq_buf_avail; +struct list_head list; +}; + +struct virtio_pmem { +struct virtio_device *vdev; + +/* Virtio pmem request queue */ +struct virtqueue *req_vq; + +/* nvdimm bus registers virtio pmem device */ +struct nvdimm_bus *nvdimm_bus; +struct nvdimm_bus_descriptor nd_desc; + +/* List to store deferred work if virtqueue is full */ +struct list_head req_list; + +/* Synchronize virtqueue data */ +spinlock_t pmem_lock; + +/* Memory region information */ +uint64_t start; +uint64_t size; +}; + +void host_ack (struct virtqueue *vq); +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio); +#endif include/uapi/linux/virtio_ids.h +1
-0@@ -43,5 +43,6 @@#define VIRTIO_ID_INPUT 18/* virtio input */ #define VIRTIO_ID_VSOCK 19/* virtio vsock transport */ #define VIRTIO_ID_CRYPTO 20/* virtio crypto */ +#define VIRTIO_ID_PMEM 27/* virtio pmem */ #endif /* _LINUX_VIRTIO_IDS_H */ include/uapi/linux/virtio_pmem.h new file +4
-0@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _UAPI_LINUX_VIRTIO_PMEM_H +#define _UAPI_LINUX_VIRTIO_PMEM_H
Quoted 10 lines
Quoted 8 lines
include/uapi/linux/virtio_pmem.h new file +6
-1+ +struct virtio_pmem_config { +__le64 start; +__le64 size; +}; +#endif --2.20.1
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaQuoted 57 lines · Pankaj Gupta
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +8
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/
drivers/nvdimm/nd_virtio.c line 18
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv;
Nit: use reverse Christmas tree layout :)
Quoted 17 lines
drivers/nvdimm/nd_virtio.c new file +17
-0+ +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack);
drivers/nvdimm/nd_virtio.c line 45
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+ +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req;
Nit: use reverse Christmas tree layout :)
Quoted 23 lines
drivers/nvdimm/nd_virtio.c new file +23
-0+ +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/
drivers/nvdimm/nd_virtio.c line 78
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */
"A host repsonse results in "host_ack" getting called" ... ?
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +4
-0+wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq);
drivers/nvdimm/nd_virtio.c line 92
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret;
Avoid the goto. Just move the following statements into an "else" case.
drivers/nvdimm/nd_virtio.c line 78
Quoted 3 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */
"A host repsonse results in "host_ack" getting called" ... ?
Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/
drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);
return 0;
Then, drop the "else" case and "int rc" and do directly
if (virtio_pmem_flush(nd_region))
return -EIO;
Quoted 27 lines
drivers/nvdimm/nd_virtio.c new file +9
-0+ }else { + + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +12
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = {
drivers/nvdimm/virtio_pmem.c line 22
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ { VIRTIO_ID_PMEM, VIRTIO_DEV_ANY_ID }, + { 0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" );
Nit: Wrong indentation of parameters.
drivers/nvdimm/virtio_pmem.c line 27
Quoted 5 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list);
I would initialize the locks in the virtio_pmem_probe() directly, earlier (directly after allocating vpmem).
drivers/nvdimm/virtio_pmem.c line 39
Quoted 12 lines
drivers/nvdimm/virtio_pmem.c new file +12
-0+ +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;
Nit: use reverse Christmas tree layout :)
Quoted 33 lines
drivers/nvdimm/virtio_pmem.c new file +33
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq;
drivers/nvdimm/virtio_pmem.c line 82
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +
I'd drop this empty line.
drivers/nvdimm/virtio_pmem.c line 85
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent);
Does it make sense to move some parts into separate functions for readability? E.g., virtio_pmem_init_nvdimm_bus()
drivers/nvdimm/virtio_pmem.c line 88
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+return 0 ; +out_nd: + err = -ENXIO ;
I'd always initialize "err" along with the goto statement for readability, especially because ...
drivers/nvdimm/virtio_pmem.c line 90
Quoted 2 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq:
... you don't initialize err in this case. Err is here 0 if I am not wrong.
drivers/nvdimm/virtio_pmem.c line 93
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+ vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" );
Should we try to give more meaning full messages? I can think of scenarios like "memory region is not properly aligned" or "out of memory".
drivers/nvdimm/virtio_pmem.c line 100
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c new file +7
-0+return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); +
Is the nd_region implicitly cleaned up?
You are not freeing "vdev->priv".
Quoted 22 lines
drivers/nvdimm/virtio_pmem.c new file +17
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +0
-0
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 51
Quoted 10 lines
drivers/virtio/Kconfig +7
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range.
"This driver provides access to virtio-pmem devices, storage devices that are mapped into the physical address space - similar to NVDIMMs - with a virtio-based flushing interface." ... ?
Quoted 3 lines
drivers/virtio/Kconfig +3
-0+ + If unsure, say M. +
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaQuoted 57 lines · Pankaj Gupta
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +8
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/
drivers/nvdimm/nd_virtio.c line 18
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */ +void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv;
Nit: use reverse Christmas tree layout :)
Quoted 17 lines
drivers/nvdimm/nd_virtio.c new file +17
-0+ +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack);
drivers/nvdimm/nd_virtio.c line 45
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+ +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{ +int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req;
Nit: use reverse Christmas tree layout :)
Quoted 23 lines
drivers/nvdimm/nd_virtio.c new file +23
-0+ +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/
drivers/nvdimm/nd_virtio.c line 78
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + +dev_err (&vdev->dev,"failed to send command to virtio pmem" \ +"device, no free slots in the virtqueue\n" ); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */
"A host repsonse results in "host_ack" getting called" ... ?
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +4
-0+wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq);
drivers/nvdimm/nd_virtio.c line 92
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret;
Avoid the goto. Just move the following statements into an "else" case.
drivers/nvdimm/nd_virtio.c line 78
Quoted 3 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */
"A host repsonse results in "host_ack" getting called" ... ?
Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/
drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);
return 0;
Then, drop the "else" case and "int rc" and do directly
if (virtio_pmem_flush(nd_region))
return -EIO;
Quoted 27 lines
drivers/nvdimm/nd_virtio.c new file +9
-0+ }else { + + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +12
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = {
drivers/nvdimm/virtio_pmem.c line 22
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ { VIRTIO_ID_PMEM, VIRTIO_DEV_ANY_ID }, + { 0 }, +}; + +/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" );
Nit: Wrong indentation of parameters.
drivers/nvdimm/virtio_pmem.c line 27
Quoted 5 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list);
I would initialize the locks in the virtio_pmem_probe() directly, earlier (directly after allocating vpmem).
drivers/nvdimm/virtio_pmem.c line 39
Quoted 12 lines
drivers/nvdimm/virtio_pmem.c new file +12
-0+ +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;
Nit: use reverse Christmas tree layout :)
Quoted 33 lines
drivers/nvdimm/virtio_pmem.c new file +33
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq;
drivers/nvdimm/virtio_pmem.c line 82
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +
I'd drop this empty line.
drivers/nvdimm/virtio_pmem.c line 85
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent);
Does it make sense to move some parts into separate functions for readability? E.g., virtio_pmem_init_nvdimm_bus()
drivers/nvdimm/virtio_pmem.c line 88
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+return 0 ; +out_nd: + err = -ENXIO ;
I'd always initialize "err" along with the goto statement for readability, especially because ...
drivers/nvdimm/virtio_pmem.c line 90
Quoted 2 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq:
... you don't initialize err in this case. Err is here 0 if I am not wrong.
drivers/nvdimm/virtio_pmem.c line 93
Quoted 3 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+ vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" );
Should we try to give more meaning full messages? I can think of scenarios like "memory region is not properly aligned" or "out of memory".
drivers/nvdimm/virtio_pmem.c line 100
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c new file +7
-0+return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); +
Is the nd_region implicitly cleaned up?
You are not freeing "vdev->priv".
Quoted 22 lines
drivers/nvdimm/virtio_pmem.c new file +17
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +0
-0
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 51
Quoted 10 lines
drivers/virtio/Kconfig +7
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range.
"This driver provides access to virtio-pmem devices, storage devices that are mapped into the physical address space - similar to NVDIMMs - with a virtio-based flushing interface." ... ?
Quoted 3 lines
drivers/virtio/Kconfig +3
-0+ + If unsure, say M. +
Signature · 7 lines
Thanks, David / dhildenb _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Hi David,
Thank you for the review.
Quoted 62 lines · Pankaj Gupta
Quoted 61 lines
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +12
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 18
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv;Nit: use reverse Christmas tree layout :)
o.k
Quoted 22 lines
Quoted 22 lines
drivers/nvdimm/nd_virtio.c new file +21
-0+ +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 45
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req;Nit: use reverse Christmas tree layout :)
o.k
Quoted 28 lines
Quoted 28 lines
drivers/nvdimm/nd_virtio.c new file +27
-0+ +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + + dev_err(&vdev->dev, "failed to send command to virtio pmem"\
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+ "device, no free slots in the virtqueue\n"); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?
o.k
Quoted 17 lines
Quoted 5 lines
drivers/nvdimm/nd_virtio.c new file +4
-0+wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq);drivers/nvdimm/nd_virtio.c line 92
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret;Avoid the goto. Just move the following statements into an "else" case.
o.k
Quoted 35 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Quoted 4 lines
Then, drop the "else" case and "int rc" and do directly
if (
virtio_pmem_flush(nd_region))return -EIO;
and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Quoted 32 lines
Quoted 32 lines
drivers/nvdimm/nd_virtio.c new file +9
-0+ }else { + + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +16
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; +
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 22
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" );Nit: Wrong indentation of parameters.
o.k
Quoted 9 lines
drivers/nvdimm/virtio_pmem.c line 27
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list);I would initialize the locks in the
virtio_pmem_probe()directly, earlier (directly after allocating vpmem).
Since the lock is to protect the vq so logically I put it in 'init_vq' which is eventually called by probe.
Quoted 15 lines
drivers/nvdimm/virtio_pmem.c line 39
Quoted 13 lines
drivers/nvdimm/virtio_pmem.c new file +12
-0+ +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 38 lines
Quoted 38 lines
drivers/nvdimm/virtio_pmem.c new file +37
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res;
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 82
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+ ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
hmm.
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 85
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent);Does it make sense to move some parts into separate functions for readability? E.g.,
virtio_pmem_init_nvdimm_bus()
I think this function only has initialization and don't have any complex logic.
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 88
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+return 0 ; +out_nd: + err = -ENXIO ;I'd always initialize "err" along with the goto statement for readability, especially because ...
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c line 90
Quoted 2 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq:... you don't initialize err in this case. Err is here 0 if I am not wrong.
Right. Changed.
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 93
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+ vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" );Should we try to give more meaning full messages? I can think of scenarios like "memory region is not properly aligned" or "out of memory".
o.k
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c line 100
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c new file +7
-0+return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); +Is the
nd_regionimplicitly cleaned up?
yes. it will be.
Quoted 2 lines
You are not freeing "
vdev->priv".
vdev->priv is vpmem which is allocated using devm API.
Quoted 26 lines
Quoted 26 lines
drivers/nvdimm/virtio_pmem.c new file +17
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +0
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y.
Quoted 11 lines
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 51
Quoted 7 lines
drivers/virtio/Kconfig +7
-0+config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range."This driver provides access to virtio-pmem devices, storage devices that are mapped into the physical address space - similar to NVDIMMs - with a virtio-based flushing interface." ... ?
looks better. Incorporated.
Thanks,
Pankaj
Quoted 12 lines
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 54
Quoted 4 lines
drivers/virtio/Kconfig +3
-0+ + If unsure, say M. +--
Thanks,
David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to David HildenbrandHi David,
Thank you for the review.
Quoted 62 lines · Pankaj Gupta
Quoted 61 lines
This patch adds virtio-pmem driver for KVM guest.
Guest reads the persistent memory range information from Qemu over VIRTIO and registers it on
nvdimm_bus. It also creates and_regionobject with the persistent memory range information so that existing 'nvdimm/pmem' driver can reserve this into system memory map. This way 'virtio-pmem' driver uses existing functionality of pmem driver to register persistent memory compatible for DAX capable filesystems.This also provides function to perform guest flush over VIRTIO from 'pmem' driver when userspace performs flush on DAX memory range.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Yuval Shaia <[email protected]>--- drivers/nvdimm/Makefile | 1 + drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++ drivers/nvdimm/virtio_pmem.c | 117 ++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++ include/linux/virtio_pmem.h | 60 ++++++++++++++ include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_pmem.h | 10 +++ 7 files changed, 328 insertions(+) create mode 100644 drivers/nvdimm/nd_virtio.c create mode 100644 drivers/nvdimm/virtio_pmem.c create mode 100644 include/linux/virtio_pmem.h create mode 100644 include/uapi/linux/virtio_pmem.hdrivers/nvdimm/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o nd_pmem-y := pmem.odrivers/nvdimm/nd_virtio.c new file +12
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and provides a virtio based flushing +* interface. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +/* The interrupt handler */
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 18
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+void host_ack (struct virtqueue *vq) +{ +unsigned int len; +unsigned long flags; +struct virtio_pmem_request *req, *req_buf; +struct virtio_pmem *vpmem = vq->vdev->priv;Nit: use reverse Christmas tree layout :)
o.k
Quoted 22 lines
Quoted 22 lines
drivers/nvdimm/nd_virtio.c new file +21
-0+ +spin_lock_irqsave (&vpmem->pmem_lock, flags); +while ((req =virtqueue_get_buf (vq, &len)) !=NULL ) { + req->done = true; +wake_up (&req->host_acked); + +if (!list_empty (&vpmem->req_list)) { + req_buf =list_first_entry (&vpmem->req_list, + struct virtio_pmem_request, list); + req_buf->wq_buf_avail = true; +wake_up (&req_buf->wq_buf); +list_del (&req_buf->list); + } + } +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); +} +EXPORT_SYMBOL_GPL (host_ack); + +/* The request submission function */ +int virtio_pmem_flush (struct nd_region *nd_region) +{
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 45
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+int err, err1; +unsigned long flags; +struct scatterlist *sgs[2 ], sg, ret; +struct virtio_device *vdev = nd_region->provider_data; +struct virtio_pmem *vpmem = vdev->priv; +struct virtio_pmem_request *req;Nit: use reverse Christmas tree layout :)
o.k
Quoted 28 lines
Quoted 28 lines
drivers/nvdimm/nd_virtio.c new file +27
-0+ +might_sleep (); + req =kmalloc (sizeof (*req),GFP_KERNEL ); +if (!req) +return -ENOMEM ; + + req->done = false; +strcpy (req->name,"FLUSH" ); +init_waitqueue_head (&req->host_acked); +init_waitqueue_head (&req->wq_buf); +INIT_LIST_HEAD (&req->list); +sg_init_one (&sg, req->name,strlen (req->name)); + sgs[0 ] = &sg; +sg_init_one (&ret, &req->ret,sizeof (req->ret)); + sgs[1 ] = &ret; + +spin_lock_irqsave (&vpmem->pmem_lock, flags); +/* +* If virtqueue_add_sgs returns -ENOSPC then req_vq virtual +* queue does not have free descriptor. We add the request +* to req_list and wait for host_ack to wake us up when free +* slots are available. +*/ +while ((err =virtqueue_add_sgs (vpmem->req_vq, sgs,1 ,1 , req, +GFP_ATOMIC )) == -ENOSPC ) { + + dev_err(&vdev->dev, "failed to send command to virtio pmem"\
Quoted 8 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +6
-0+ "device, no free slots in the virtqueue\n"); + req->wq_buf_avail = false; +list_add_tail (&req->list, &vpmem->req_list); +spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?
o.k
Quoted 17 lines
Quoted 5 lines
drivers/nvdimm/nd_virtio.c new file +4
-0+wait_event (req->wq_buf, req->wq_buf_avail); +spin_lock_irqsave (&vpmem->pmem_lock, flags); + } + err1 =virtqueue_kick (vpmem->req_vq);drivers/nvdimm/nd_virtio.c line 92
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+spin_unlock_irqrestore (&vpmem->pmem_lock, flags); + +/* +* virtqueue_add_sgs failed with error different than -ENOSPC, we can't +* do anything about that. +*/ +if (err || !err1) { +dev_info (&vdev->dev,"failed to send command to virtio pmem device\n" ); + err = -EIO ; + goto ret;Avoid the goto. Just move the following statements into an "else" case.
o.k
Quoted 35 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Quoted 4 lines
Then, drop the "else" case and "int rc" and do directly
if (
virtio_pmem_flush(nd_region))return -EIO;
and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Quoted 32 lines
Quoted 32 lines
drivers/nvdimm/nd_virtio.c new file +9
-0+ }else { + + rc = -EIO ; + } + +return rc; +}; +EXPORT_SYMBOL_GPL (async_pmem_flush); +MODULE_LICENSE ("GPL" );drivers/nvdimm/virtio_pmem.c new file +16
-0@@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* virtio_pmem.c: Virtio pmem Driver +* +* Discovers persistent memory range information +* from host and registers the virtual pmem device +* with libnvdimm core. +*/ +#include <linux/virtio_pmem.h> +#include "nd.h" + +static struct virtio_device_id id_table[] = { + {VIRTIO_ID_PMEM ,VIRTIO_DEV_ANY_ID }, + {0 }, +}; +
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 22
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+/* Initialize virt queue */ +static int init_vq (struct virtio_pmem *vpmem) +{ +/* single vq */ + vpmem->req_vq =virtio_find_single_vq (vpmem->vdev, + host_ack,"flush_queue" );Nit: Wrong indentation of parameters.
o.k
Quoted 9 lines
drivers/nvdimm/virtio_pmem.c line 27
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+if (IS_ERR (vpmem->req_vq)) +return PTR_ERR (vpmem->req_vq); + +spin_lock_init (&vpmem->pmem_lock); +INIT_LIST_HEAD (&vpmem->req_list);I would initialize the locks in the
virtio_pmem_probe()directly, earlier (directly after allocating vpmem).
Since the lock is to protect the vq so logically I put it in 'init_vq' which is eventually called by probe.
Quoted 15 lines
drivers/nvdimm/virtio_pmem.c line 39
Quoted 13 lines
drivers/nvdimm/virtio_pmem.c new file +12
-0+ +return 0 ; +}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 38 lines
Quoted 38 lines
drivers/nvdimm/virtio_pmem.c new file +37
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res;
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 82
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+ ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
hmm.
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 85
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+if (!nd_region) + goto out_nd; + nd_region->provider_data =dev_to_virtio (nd_region->dev.parent->parent);Does it make sense to move some parts into separate functions for readability? E.g.,
virtio_pmem_init_nvdimm_bus()
I think this function only has initialization and don't have any complex logic.
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 88
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+return 0 ; +out_nd: + err = -ENXIO ;I'd always initialize "err" along with the goto statement for readability, especially because ...
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c line 90
Quoted 2 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+nvdimm_bus_unregister (vpmem->nvdimm_bus); +out_vq:... you don't initialize err in this case. Err is here 0 if I am not wrong.
Right. Changed.
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 93
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +3
-0+ vdev->config->del_vqs (vdev); +out_err: +dev_err (&vdev->dev,"failed to register virtio pmem memory\n" );Should we try to give more meaning full messages? I can think of scenarios like "memory region is not properly aligned" or "out of memory".
o.k
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c line 100
Quoted 8 lines
drivers/nvdimm/virtio_pmem.c new file +7
-0+return err; +} + +static void virtio_pmem_remove (struct virtio_device *vdev) +{ +struct nvdimm_bus *nvdimm_bus =dev_get_drvdata (&vdev->dev); +Is the
nd_regionimplicitly cleaned up?
yes. it will be.
Quoted 2 lines
You are not freeing "
vdev->priv".
vdev->priv is vpmem which is allocated using devm API.
Quoted 26 lines
Quoted 26 lines
drivers/nvdimm/virtio_pmem.c new file +17
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} + +static struct virtio_driver virtio_pmem_driver = { + .driver.name =KBUILD_MODNAME , + .driver.owner =THIS_MODULE , + .id_table = id_table, + .probe = virtio_pmem_probe, + .remove = virtio_pmem_remove, +}; + +module_virtio_driver (virtio_pmem_driver); +MODULE_DEVICE_TABLE (virtio, id_table); +MODULE_DESCRIPTION ("Virtio pmem driver" ); +MODULE_LICENSE ("GPL" );drivers/virtio/Kconfig +0
-0@@ -42,6 +42,16 @@ config VIRTIO_PCI_LEGACY If unsure, say Y.
Quoted 11 lines
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 51
Quoted 7 lines
drivers/virtio/Kconfig +7
-0+config VIRTIO_PMEM + tristate "Support for virtio pmem driver" + depends on VIRTIO + depends on LIBNVDIMM + help + This driver provides support for virtio based flushing interface + for persistent memory range."This driver provides access to virtio-pmem devices, storage devices that are mapped into the physical address space - similar to NVDIMMs - with a virtio-based flushing interface." ... ?
looks better. Incorporated.
Thanks,
Pankaj
Quoted 8 lines
drivers/virtio/Kconfig config VIRTIO_PCI_LEGACY · line 54
Quoted 4 lines
drivers/virtio/Kconfig +3
-0+ + If unsure, say M. +--
Quoted 4 lines
Thanks,
David / dhildenb
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 37 lines
Quoted 37 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Then, drop the "else" case and "int rc" and do directly
Quoted 7 lines
Quoted 2 lines
if (
virtio_pmem_flush(nd_region))return -EIO;and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Makes this function more complicated than necessary. I agree when there are locks involved.
Quoted 66 lines
Quoted 16 lines
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+ +return 0 ;drivers/nvdimm/virtio_pmem.c line 39
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 38 lines
Quoted 38 lines
drivers/nvdimm/virtio_pmem.c new file +37
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res;Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 82
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+ ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
Quoted 2 lines
hmm.
The common pattern after allocating something, immediately check for it in the next line (like you do throughout this patch ;) )
...
Quoted 3 lines
Quoted 1 line
You are not freeing "
vdev->priv".
vdev->privis vpmem which is allocated using devm API.
I'm confused. Looking at drivers/virtio/virtio_balloon.c:
static void virtballoon_remove(struct virtio_device *vdev)
{
struct virtio_balloon *vb = vdev->priv;
...
kfree(vb);
}I think you should do the same here, vdev->priv is allocated in virtio_pmem_probe.
But maybe I am missing something important here :)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} +
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaQuoted 37 lines
Quoted 37 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 4 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Then, drop the "else" case and "int rc" and do directly
Quoted 7 lines
Quoted 2 lines
if (
virtio_pmem_flush(nd_region))return -EIO;and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Makes this function more complicated than necessary. I agree when there are locks involved.
Quoted 66 lines
Quoted 16 lines
Quoted 4 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+ +return 0 ;drivers/nvdimm/virtio_pmem.c line 39
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 38 lines
Quoted 38 lines
drivers/nvdimm/virtio_pmem.c new file +37
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq; + +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res;Quoted 8 lines
drivers/nvdimm/virtio_pmem.c line 82
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +6
-0+ ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
Quoted 2 lines
hmm.
The common pattern after allocating something, immediately check for it in the next line (like you do throughout this patch ;) )
...
Quoted 3 lines
Quoted 1 line
You are not freeing "
vdev->priv".
vdev->privis vpmem which is allocated using devm API.
I'm confused. Looking at drivers/virtio/virtio_balloon.c:
static void virtballoon_remove(struct virtio_device *vdev)
{
struct virtio_balloon *vb = vdev->priv;
...
kfree(vb);
}I think you should do the same here, vdev->priv is allocated in virtio_pmem_probe.
But maybe I am missing something important here :)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} +
Signature · 7 lines
Thanks, David / dhildenb _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 42 lines
Quoted 42 lines
Quoted 41 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Then, drop the "else" case and "int rc" and do directly
if (
virtio_pmem_flush(nd_region))return -EIO;
Quoted 7 lines
Quoted 4 lines
and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Makes this function more complicated than necessary. I agree when there are locks involved.
o.k. I will change as you suggest :)
Quoted 67 lines
Quoted 67 lines
Quoted 17 lines
Quoted 5 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+ +return 0 ;drivers/nvdimm/virtio_pmem.c line 39
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 46 lines
Quoted 34 lines
drivers/nvdimm/virtio_pmem.c new file +33
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq;drivers/nvdimm/virtio_pmem.c line 82
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
Quoted 5 lines
Quoted 2 lines
hmm.
The common pattern after allocating something, immediately check for it in the next line (like you do throughout this patch ;) )
Right. But rare times when I see space will beauty the code I tend to add it. Maybe I should not :)
Quoted 17 lines
...
Quoted 3 lines
Quoted 1 line
You are not freeing "
vdev->priv".
vdev->privis vpmem which is allocated using devm API.I'm confused. Looking at
drivers/virtio/virtio_balloon.c:static void
virtballoon_remove(struct virtio_device *vdev){ struct virtio_balloon *vb = vdev->priv; ... kfree(vb); }
Quoted 4 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.But maybe I am missing something important here :)
Because virtio_balloon use "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting the device memory when associated device is detached.
Thanks,
Pankaj
Quoted 14 lines
Quoted 7 lines
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 105
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} +--
Thanks,
David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to David HildenbrandQuoted 42 lines
Quoted 42 lines
Quoted 41 lines
drivers/nvdimm/nd_virtio.c line 78
Quoted 6 lines
drivers/nvdimm/nd_virtio.c new file +3
-0+ } + +/* When host has read buffer, this completes via host_ack */ "A host repsonse results in "
host_ack" getting called" ... ?Quoted 15 lines
drivers/nvdimm/nd_virtio.c new file +15
-0+wait_event (req->host_acked, req->done); + err = req->ret; +ret: +kfree (req); +return err; +}; + +/* The asynchronous flush callback function */ +int async_pmem_flush (struct nd_region *nd_region,struct bio *bio) +{ +int rc =0 ; + +/* Create child bio for asynchronous flush and chain with +* parent bio. Otherwise directly call nd_region flush. +*/ drivers/nvdimm/nd_virtio.c line 120
Quoted 10 lines
drivers/nvdimm/nd_virtio.c new file +10
-0+if (bio && bio->bi_iter.bi_sector !=-1 ) { +struct bio *child =bio_alloc (GFP_ATOMIC ,0 ); + +if (!child) +return -ENOMEM ; +bio_copy_dev (child, bio); + child->bi_opf =REQ_PREFLUSH ; + child->bi_iter.bi_sector =-1 ; +bio_chain (child, bio); +submit_bio (child);return 0;
Then, drop the "else" case and "int rc" and do directly
if (
virtio_pmem_flush(nd_region))return -EIO;
Quoted 7 lines
Quoted 4 lines
and another 'return 0' here :)
I don't like return from multiple places instead I prefer single exit point from function.
Makes this function more complicated than necessary. I agree when there are locks involved.
o.k. I will change as you suggest :)
Quoted 67 lines
Quoted 67 lines
Quoted 17 lines
Quoted 5 lines
drivers/nvdimm/virtio_pmem.c new file +2
-0+ +return 0 ;drivers/nvdimm/virtio_pmem.c line 39
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+}; + +static int virtio_pmem_probe (struct virtio_device *vdev) +{ +int err =0 ; +struct resource res; +struct virtio_pmem *vpmem; +struct nd_region_desc ndr_desc = {}; +int nid =dev_to_node (&vdev->dev); +struct nd_region *nd_region;Nit: use reverse Christmas tree layout :)
Done.
Quoted 46 lines
Quoted 34 lines
drivers/nvdimm/virtio_pmem.c new file +33
-0+ +if (!vdev->config->get) { +dev_err (&vdev->dev,"%s failure: config access disabled\n" , + __func__); +return -EINVAL ; + } + + vpmem =devm_kzalloc (&vdev->dev,sizeof (*vpmem),GFP_KERNEL ); +if (!vpmem) { + err = -ENOMEM ; + goto out_err; + } + + vpmem->vdev = vdev; + vdev->priv = vpmem; + err =init_vq (vpmem); +if (err) + goto out_err; + + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + start, &vpmem->start); + virtio_cread(vpmem->vdev, struct virtio_pmem_config, + size, &vpmem->size); + + res.start = vpmem->start; + res.end = vpmem->start + vpmem->size-1 ; + vpmem->nd_desc.provider_name ="virtio-pmem" ; + vpmem->nd_desc.module =THIS_MODULE ; + + vpmem->nvdimm_bus =nvdimm_bus_register (&vdev->dev, + &vpmem->nd_desc); +if (!vpmem->nvdimm_bus) + goto out_vq;drivers/nvdimm/virtio_pmem.c line 82
Quoted 10 lines
drivers/nvdimm/virtio_pmem.c new file +10
-0+ +dev_set_drvdata (&vdev->dev, vpmem->nvdimm_bus); + + ndr_desc.res = &res; + ndr_desc.numa_node = nid; + ndr_desc.flush = async_pmem_flush; +set_bit (ND_REGION_PAGEMAP , &ndr_desc.flags); +set_bit (ND_REGION_ASYNC , &ndr_desc.flags); + nd_region =nvdimm_pmem_region_create (vpmem->nvdimm_bus, &ndr_desc); +I'd drop this empty line.
Quoted 5 lines
Quoted 2 lines
hmm.
The common pattern after allocating something, immediately check for it in the next line (like you do throughout this patch ;) )
Right. But rare times when I see space will beauty the code I tend to add it. Maybe I should not :)
Quoted 17 lines
...
Quoted 3 lines
Quoted 1 line
You are not freeing "
vdev->priv".
vdev->privis vpmem which is allocated using devm API.I'm confused. Looking at
drivers/virtio/virtio_balloon.c:static void
virtballoon_remove(struct virtio_device *vdev){ struct virtio_balloon *vb = vdev->priv; ... kfree(vb); }
Quoted 4 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.But maybe I am missing something important here :)
Because virtio_balloon use "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting the device memory when associated device is detached.
Thanks,
Pankaj
Quoted 10 lines
Quoted 7 lines
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c line 105
Quoted 7 lines
drivers/nvdimm/virtio_pmem.c new file +5
-0+nvdimm_bus_unregister (nvdimm_bus); + vdev->config->del_vqs (vdev); + vdev->config->reset (vdev); +} +--
Quoted 4 lines
Thanks,
David / dhildenb
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 9 lines
Quoted 5 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.But maybe I am missing something important here :)
Because
virtio_balloonuse "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting the device memory when associated device is detached.
Hehe, thanks, that was the part that I was missing!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to Pankaj GuptaQuoted 9 lines
Quoted 5 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.But maybe I am missing something important here :)
Because
virtio_balloonuse "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting the device memory when associated device is detached.
Hehe, thanks, that was the part that I was missing!
Signature · 7 lines
Thanks, David / dhildenb _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
But maybe I am missing something important here :)
Because
virtio_balloonuse "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting
the device memory when associated device is detached.Hehe, thanks, that was the part that I was missing!
Thank you for the review.
Best regards,
Pankaj
Quoted 7 lines
--
Thanks,
David / dhildenb
Re: [PATCH v8 2/6] virtio-pmem: Add virtio pmem driver
In reply to David HildenbrandQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
I think you should do the same here,
vdev->privis allocated invirtio_pmem_probe.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
But maybe I am missing something important here :)
Because
virtio_balloonuse "kzalloc" for allocation and needs to be freed. But virtio pmem uses "devm_kzalloc" which takes care of automatically deleting
the device memory when associated device is detached.Hehe, thanks, that was the part that I was missing!
Thank you for the review.
Best regards,
Pankaj
Quoted 7 lines
--
Thanks,
David / dhildenb
PATCH v8 3/6 libnvdimm: add dax_dev sync flag
In reply to Pankaj GuptaThis patch adds 'DAXDEV_SYNC' flag which is set for nd_region doing synchronous flush. This later is used to disable MAP_SYNC functionality for ext4 & xfs filesystem for devices don't support synchronous flush.
--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)
drivers/dax/bus.c +1 -1
@@ -388,7 +388,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id,* No 'host' or dax_operations since there is no access to this * device outside of mmap of the resulting character device. */ - dax_dev =alloc_dax (dev_dax,NULL ,NULL ); + dax_dev =alloc_dax (dev_dax,NULL ,NULL ,DAXDEV_F_SYNC );if (!dax_dev) goto err;
drivers/dax/super.c +12 -1
@@ -186,6 +186,8 @@ enum dax_device_flags {DAXDEV_ALIVE ,/* gate whether dax_flush() calls the low level flush routine */ DAXDEV_WRITE_CACHE , +/* flag to check if device supports synchronous flush */ + DAXDEV_SYNC, };/**
@@ -354,6 +356,12 @@ bool dax_write_cache_enabled(struct dax_device *dax_dev) }EXPORT_SYMBOL_GPL (dax_write_cache_enabled); +bool dax_synchronous (struct dax_device *dax_dev) +{ +return test_bit (DAXDEV_SYNC , &dax_dev->flags); +} +EXPORT_SYMBOL_GPL (dax_synchronous); +bool dax_alive (struct dax_device *dax_dev) {lockdep_assert_held (&dax_srcu);
@@ -508,7 +516,7 @@ static void dax_add_host(struct dax_device *dax_dev, const char *host) }struct dax_device *alloc_dax (void *private,const char *__host, -const struct dax_operations *ops) +const struct dax_operations *ops,unsigned long flags) {struct dax_device *dax_dev;const char *host;
@@ -531,6 +539,9 @@ struct dax_device *alloc_dax(void *private, const char *__host,dax_add_host (dax_dev, host); dax_dev->ops = ops; dax_dev->private = private; +if (flags &DAXDEV_F_SYNC ) +set_bit (DAXDEV_SYNC , &dax_dev->flags); +return dax_dev; err_dev:
drivers/md/dm.c +2 -1
@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );if (!dax_dev) goto bad; }
drivers/nvdimm/pmem.c +4 -1
@@ -365,6 +365,7 @@ static int pmem_attach_disk(struct device *dev,struct gendisk *disk;void *addr;int rc; +unsigned long flags =0UL ; pmem =devm_kzalloc (dev,sizeof (*pmem),GFP_KERNEL );if (!pmem)
@@ -462,7 +463,9 @@ static int pmem_attach_disk(struct device *dev,nvdimm_badblocks_populate (nd_region, &pmem->bb, &bb_res); disk->bb = &pmem->bb; - dax_dev =alloc_dax (pmem, disk->disk_name, &pmem_dax_ops); +if (is_nvdimm_sync (nd_region)) + flags =DAXDEV_F_SYNC ; + dax_dev =alloc_dax (pmem, disk->disk_name, &pmem_dax_ops, flags);if (!dax_dev) {put_disk (disk);return -ENOMEM ;
drivers/nvdimm/region_devs.c +7 -0
@@ -1197,6 +1197,13 @@ int nvdimm_has_cache(struct nd_region *nd_region) }EXPORT_SYMBOL_GPL (nvdimm_has_cache); +bool is_nvdimm_sync (struct nd_region *nd_region) +{ +return is_nd_pmem (&nd_region->dev) && + !test_bit (ND_REGION_ASYNC , &nd_region->flags); +} +EXPORT_SYMBOL_GPL (is_nvdimm_sync); +struct conflict_context {struct nd_region *nd_region;resource_size_t start, size;
include/linux/dax.h +6 -2
@@ -7,6 +7,9 @@#include <linux/radix-tree.h> #include <asm/pgtable.h> +/* Flag for synchronous flush */ +#define DAXDEV_F_SYNC (1UL << 0) +typedef unsigned long dax_entry_t ;struct iomap_ops ;
@@ -32,18 +35,19 @@ extern struct attribute_group dax_attribute_group;#if IS_ENABLED (CONFIG_DAX )struct dax_device *dax_get_by_host (const char *host);struct dax_device *alloc_dax (void *private,const char *host, -const struct dax_operations *ops); +const struct dax_operations *ops,unsigned long flags);void put_dax (struct dax_device *dax_dev);void kill_dax (struct dax_device *dax_dev);void dax_write_cache (struct dax_device *dax_dev,bool wc);bool dax_write_cache_enabled (struct dax_device *dax_dev); +bool dax_synchronous (struct dax_device *dax_dev);#else static inline struct dax_device *dax_get_by_host (const char *host) {return NULL ; }static inline struct dax_device *alloc_dax (void *private,const char *host, -const struct dax_operations *ops) +const struct dax_operations *ops,unsigned long flags) {/* * Callers should check IS_ENABLED(CONFIG_DAX) to know if this
include/linux/libnvdimm.h +1 -0
@@ -264,6 +264,7 @@ void nvdimm_flush(struct nd_region *nd_region);int nvdimm_has_flush (struct nd_region *nd_region);int nvdimm_has_cache (struct nd_region *nd_region);int nvdimm_in_overwrite (struct nvdimm *nvdimm); +bool is_nvdimm_sync (struct nd_region *nd_region);static inline int nvdimm_ctl (struct nvdimm *nvdimm,unsigned int cmd,void *buf,unsigned int buf_len,int *cmd_rc)
Signature · 1 line
2.20.1
PATCH v8 3/6 libnvdimm: add dax_dev sync flag
In reply to Pankaj GuptaThis patch adds 'DAXDEV_SYNC' flag which is set for nd_region doing synchronous flush. This later is used to disable MAP_SYNC functionality for ext4 & xfs filesystem for devices don't support synchronous flush.
--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)
drivers/dax/bus.c +1 -1
@@ -388,7 +388,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id,* No 'host' or dax_operations since there is no access to this * device outside of mmap of the resulting character device. */ - dax_dev =alloc_dax (dev_dax,NULL ,NULL ); + dax_dev =alloc_dax (dev_dax,NULL ,NULL ,DAXDEV_F_SYNC );if (!dax_dev) goto err;
drivers/dax/super.c +12 -1
@@ -186,6 +186,8 @@ enum dax_device_flags {DAXDEV_ALIVE ,/* gate whether dax_flush() calls the low level flush routine */ DAXDEV_WRITE_CACHE , +/* flag to check if device supports synchronous flush */ + DAXDEV_SYNC, };/**
@@ -354,6 +356,12 @@ bool dax_write_cache_enabled(struct dax_device *dax_dev) }EXPORT_SYMBOL_GPL (dax_write_cache_enabled); +bool dax_synchronous (struct dax_device *dax_dev) +{ +return test_bit (DAXDEV_SYNC , &dax_dev->flags); +} +EXPORT_SYMBOL_GPL (dax_synchronous); +bool dax_alive (struct dax_device *dax_dev) {lockdep_assert_held (&dax_srcu);
@@ -508,7 +516,7 @@ static void dax_add_host(struct dax_device *dax_dev, const char *host) }struct dax_device *alloc_dax (void *private,const char *__host, -const struct dax_operations *ops) +const struct dax_operations *ops,unsigned long flags) {struct dax_device *dax_dev;const char *host;
@@ -531,6 +539,9 @@ struct dax_device *alloc_dax(void *private, const char *__host,dax_add_host (dax_dev, host); dax_dev->ops = ops; dax_dev->private = private; +if (flags &DAXDEV_F_SYNC ) +set_bit (DAXDEV_SYNC , &dax_dev->flags); +return dax_dev; err_dev:
drivers/md/dm.c +2 -1
@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );if (!dax_dev) goto bad; }
drivers/nvdimm/pmem.c +4 -1
@@ -365,6 +365,7 @@ static int pmem_attach_disk(struct device *dev,struct gendisk *disk;void *addr;int rc; +unsigned long flags =0UL ; pmem =devm_kzalloc (dev,sizeof (*pmem),GFP_KERNEL );if (!pmem)
@@ -462,7 +463,9 @@ static int pmem_attach_disk(struct device *dev,nvdimm_badblocks_populate (nd_region, &pmem->bb, &bb_res); disk->bb = &pmem->bb; - dax_dev =alloc_dax (pmem, disk->disk_name, &pmem_dax_ops); +if (is_nvdimm_sync (nd_region)) + flags =DAXDEV_F_SYNC ; + dax_dev =alloc_dax (pmem, disk->disk_name, &pmem_dax_ops, flags);if (!dax_dev) {put_disk (disk);return -ENOMEM ;
drivers/nvdimm/region_devs.c +7 -0
@@ -1197,6 +1197,13 @@ int nvdimm_has_cache(struct nd_region *nd_region) }EXPORT_SYMBOL_GPL (nvdimm_has_cache); +bool is_nvdimm_sync (struct nd_region *nd_region) +{ +return is_nd_pmem (&nd_region->dev) && + !test_bit (ND_REGION_ASYNC , &nd_region->flags); +} +EXPORT_SYMBOL_GPL (is_nvdimm_sync); +struct conflict_context {struct nd_region *nd_region;resource_size_t start, size;
include/linux/dax.h +6 -2
@@ -7,6 +7,9 @@#include <linux/radix-tree.h> #include <asm/pgtable.h> +/* Flag for synchronous flush */ +#define DAXDEV_F_SYNC (1UL << 0) +typedef unsigned long dax_entry_t ;struct iomap_ops ;
@@ -32,18 +35,19 @@ extern struct attribute_group dax_attribute_group;#if IS_ENABLED (CONFIG_DAX )struct dax_device *dax_get_by_host (const char *host);struct dax_device *alloc_dax (void *private,const char *host, -const struct dax_operations *ops); +const struct dax_operations *ops,unsigned long flags);void put_dax (struct dax_device *dax_dev);void kill_dax (struct dax_device *dax_dev);void dax_write_cache (struct dax_device *dax_dev,bool wc);bool dax_write_cache_enabled (struct dax_device *dax_dev); +bool dax_synchronous (struct dax_device *dax_dev);#else static inline struct dax_device *dax_get_by_host (const char *host) {return NULL ; }static inline struct dax_device *alloc_dax (void *private,const char *host, -const struct dax_operations *ops) +const struct dax_operations *ops,unsigned long flags) {/* * Callers should check IS_ENABLED(CONFIG_DAX) to know if this
include/linux/libnvdimm.h +1 -0
@@ -264,6 +264,7 @@ void nvdimm_flush(struct nd_region *nd_region);int nvdimm_has_flush (struct nd_region *nd_region);int nvdimm_has_cache (struct nd_region *nd_region);int nvdimm_in_overwrite (struct nvdimm *nvdimm); +bool is_nvdimm_sync (struct nd_region *nd_region);static inline int nvdimm_ctl (struct nvdimm *nvdimm,unsigned int cmd,void *buf,unsigned int buf_len,int *cmd_rc)
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 17 lines · Pankaj Gupta
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)
[..]
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 11 lines
drivers/md/dm.c +2
-1@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );
Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at dm_table_supports_dax() time after validating that all components support synchronous dax.
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 27 lines
Quoted 19 lines
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)[..]
Quoted 7 lines
drivers/md/dm.c +0
-0@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);
Quoted 11 lines
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 4 lines
drivers/md/dm.c +2
-1if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at
dm_table_supports_dax()time after validating that all components support synchronous dax.
o.k. Need to set 'DAXDEV_F_SYNC' flag after verifying all the target components support synchronous DAX.
Just a question, If device mapper configuration have composed of both virtio-pmem or pmem devices, we want to configure device mapper for async flush?
Thank you,
Pankaj
Quoted 1 line
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
In reply to Dan WilliamsQuoted 27 lines
Quoted 19 lines
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)[..]
Quoted 7 lines
drivers/md/dm.c +0
-0@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);
Quoted 11 lines
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 4 lines
drivers/md/dm.c +2
-1if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at
dm_table_supports_dax()time after validating that all components support synchronous dax.
o.k. Need to set 'DAXDEV_F_SYNC' flag after verifying all the target components support synchronous DAX.
Just a question, If device mapper configuration have composed of both virtio-pmem or pmem devices, we want to configure device mapper for async flush?
Thank you,
Pankaj
Quoted 1 line
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 40 lines · Pankaj Gupta
Quoted 28 lines
Quoted 20 lines
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)[..]
Quoted 7 lines
drivers/md/dm.c +0
-0@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);Quoted 11 lines
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 4 lines
drivers/md/dm.c +2
-1if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at
dm_table_supports_dax()time after validating that all components support synchronous dax.
Quoted 5 lines
o.k. Need to set '
DAXDEV_F_SYNC' flag after verifying all the target components support synchronous DAX.Just a question, If device mapper configuration have composed of both virtio-pmem or pmem devices, we want to configure device mapper for async flush?
If it's composed of both then, yes, it needs to be async flush at the device-mapper level. Otherwise MAP_SYNC will succeed and fail to trigger fsync on the host file when necessary for the virtio-pmem backed portion of the device-mapper device.
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
In reply to Pankaj GuptaQuoted 40 lines · Pankaj Gupta
Quoted 28 lines
Quoted 20 lines
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)[..]
Quoted 7 lines
drivers/md/dm.c +0
-0@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);Quoted 11 lines
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 4 lines
drivers/md/dm.c +2
-1if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at
dm_table_supports_dax()time after validating that all components support synchronous dax.
Quoted 5 lines
o.k. Need to set '
DAXDEV_F_SYNC' flag after verifying all the target components support synchronous DAX.Just a question, If device mapper configuration have composed of both virtio-pmem or pmem devices, we want to configure device mapper for async flush?
If it's composed of both then, yes, it needs to be async flush at the device-mapper level. Otherwise MAP_SYNC will succeed and fail to trigger fsync on the host file when necessary for the virtio-pmem backed portion of the device-mapper device.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [Qemu-devel] [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 44 lines
Quoted 44 lines
Quoted 26 lines
Quoted 18 lines
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)[..]
Quoted 7 lines
drivers/md/dm.c +0
-0@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);Quoted 14 lines
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1976
Quoted 7 lines
drivers/md/dm.c +2
-1if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at
dm_table_supports_dax()time after validating that all components support synchronous dax.o.k. Need to set '
DAXDEV_F_SYNC' flag after verifying all the target components support synchronous DAX.
Quoted 8 lines
Quoted 3 lines
Just a question, If device mapper configuration have composed of both virtio-pmem or pmem devices, we want to configure device mapper for async flush?
If it's composed of both then, yes, it needs to be async flush at the device-mapper level. Otherwise
MAP_SYNCwill succeed and fail to trigger fsync on the host file when necessary for the virtio-pmem backed portion of the device-mapper device.
o.k. Agree.
Thanks you,
Pankaj
Quoted 2 lines
Re: [Qemu-devel] [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Hi Dan,
While testing device mapper with DAX, I faced a bug with the commit:
commit ad428cdb525a97d15c0349fdc80f3d58befb50df
Author: Dan Williams <[email protected]> Date: Wed Feb 20 21:12:50 2019 -0800
When I reverted the condition to old code[1] it worked for me. I am thinking when we map two different devices (e.g with device mapper), will start & end pfn still point to same pgmap? Or there is something else which I am missing here.
Note: I tested only EXT4.
[1]
- if (pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX)
+ end_pgmap = get_dev_pagemap(pfn_t_to_pfn(end_pfn), NULL);
+ if (pgmap && pgmap == end_pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX
+ && pfn_t_to_page(pfn)->pgmap == pgmap
+ && pfn_t_to_page(end_pfn)->pgmap == pgmap
+ && pfn_t_to_pfn(pfn) == PHYS_PFN(__pa(kaddr))
+ && pfn_t_to_pfn(end_pfn) == PHYS_PFN(__pa(end_kaddr)))
dax_enabled = true;
put_dev_pagemap(pgmap);Thanks,
Pankaj
Re: [Qemu-devel] [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
In reply to Pankaj GuptaHi Dan,
While testing device mapper with DAX, I faced a bug with the commit:
commit ad428cdb525a97d15c0349fdc80f3d58befb50df
Author: Dan Williams <[email protected]> Date: Wed Feb 20 21:12:50 2019 -0800
When I reverted the condition to old code[1] it worked for me. I am thinking when we map two different devices (e.g with device mapper), will start & end pfn still point to same pgmap? Or there is something else which I am missing here.
Note: I tested only EXT4.
[1]
- if (pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX)
+ end_pgmap = get_dev_pagemap(pfn_t_to_pfn(end_pfn), NULL);
+ if (pgmap && pgmap == end_pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX
+ && pfn_t_to_page(pfn)->pgmap == pgmap
+ && pfn_t_to_page(end_pfn)->pgmap == pgmap
+ && pfn_t_to_pfn(pfn) == PHYS_PFN(__pa(kaddr))
+ && pfn_t_to_pfn(end_pfn) == PHYS_PFN(__pa(end_kaddr)))
dax_enabled = true;
put_dev_pagemap(pgmap);Thanks,
Pankaj
Re: [Qemu-devel] [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 19 lines · Pankaj Gupta
Hi Dan,
While testing device mapper with DAX, I faced a bug with the commit:
commit
ad428cdb525a97d15c0349fdc80f3d58befb50dfAuthor: Dan Williams <[email protected]> Date: Wed Feb 20 21:12:50 2019 -0800When I reverted the condition to old code[1] it worked for me. I am thinking when we map two different devices (e.g with device mapper), will start & end pfn still point to same pgmap? Or there is something else which I am missing here.
Note: I tested only EXT4.
[1]
Review
Quoted 7 lines
(quoted diff) +6
-1- if (pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX) + end_pgmap = get_dev_pagemap(pfn_t_to_pfn(end_pfn), NULL); + if (pgmap && pgmap == end_pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX + && pfn_t_to_page(pfn)->pgmap == pgmap + && pfn_t_to_page(end_pfn)->pgmap == pgmap + && pfn_t_to_pfn(pfn) == PHYS_PFN(__pa(kaddr)) + && pfn_t_to_pfn(end_pfn) == PHYS_PFN(__pa(end_kaddr)))
Ugh, yes, device-mapper continues to be an awkward fit for dax (or vice versa). We would either need a way to have a multi-level pfn to pagemap lookup for composite devices, or a way to discern that even though the pagemap is different that the result is still valid / not an indication that we have leaked into an unassociated address range. Perhaps a per-daxdev callback for ->dax_supported() so that device-mapper internals can be used for this validation.
We need to get that fixed up, but I don't see it as a blocker / pre-requisite for virtio-pmem.
Re: [Qemu-devel] [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
Quoted 32 lines
Quoted 28 lines
Hi Dan,
While testing device mapper with DAX, I faced a bug with the commit:
commit
ad428cdb525a97d15c0349fdc80f3d58befb50dfAuthor: Dan Williams <[email protected]> Date: Wed Feb 20 21:12:50 2019 -0800When I reverted the condition to old code[1] it worked for me. I am thinking when we map two different devices (e.g with device mapper), will
start & end pfn still point to same pgmap? Or there is something else which I am missing here.Note: I tested only EXT4.
[1]
(quoted diff) +2
-1- if (pgmap && pgmap->type == MEMORY_DEVICE_FS_DAX) + end_pgmap = get_dev_pagemap(pfn_t_to_pfn(end_pfn), NULL); + if (pgmap && pgmap == end_pgmap && pgmap->type ==
MEMORY_DEVICE_FS_DAX(quoted diff) +3
-0+ && pfn_t_to_page(pfn)->pgmap == pgmap + && pfn_t_to_page(end_pfn)->pgmap == pgmap + && pfn_t_to_pfn(pfn) ==Quoted 3 lines
PHYS_PFN(__pa(kaddr))
+ &&pfn_t_to_pfn(end_pfn)==
PHYS_PFN(__pa(end_kaddr)))
Quoted 7 lines
Ugh, yes, device-mapper continues to be an awkward fit for dax (or vice versa). We would either need a way to have a multi-level pfn to pagemap lookup for composite devices, or a way to discern that even though the pagemap is different that the result is still valid / not an indication that we have leaked into an unassociated address range. Perhaps a per-daxdev callback for ->dax_supported() so that device-mapper internals can be used for this validation.
Yes, Will look at it.
Quoted 3 lines
We need to get that fixed up, but I don't see it as a blocker / pre-requisite for virtio-pmem.
Agree. Will send virtio-pmem patch series.
Thank you,
Pankaj
Quoted 2 lines
Re: [PATCH v8 3/6] libnvdimm: add dax_dev sync flag
In reply to Pankaj GuptaQuoted 17 lines · Pankaj Gupta
This patch adds '
DAXDEV_SYNC' flag which is set fornd_regiondoing synchronous flush. This later is used to disableMAP_SYNCfunctionality for ext4 & xfs filesystem for devices don't support synchronous flush.Signed-off-by Pankaj Gupta <[email protected]>--- drivers/dax/bus.c | 2 +- drivers/dax/super.c | 13 ++++++++++++- drivers/md/dm.c | 3 ++- drivers/nvdimm/pmem.c | 5 ++++- drivers/nvdimm/region_devs.c | 7 +++++++ include/linux/dax.h | 8 ++++++-- include/linux/libnvdimm.h | 1 + 7 files changed, 33 insertions(+), 6 deletions(-)
[..]
drivers/md/dm.c static struct mapped_device *alloc_dev(int minor) · line 1973
Quoted 11 lines
drivers/md/dm.c +2
-1@@ -1969,7 +1969,8 @@ static struct mapped_device *alloc_dev(int minor)sprintf (md->disk->disk_name,"dm-%d" , minor);if (IS_ENABLED (CONFIG_DAX_DRIVER )) { - dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops); + dax_dev =alloc_dax (md, md->disk->disk_name, &dm_dax_ops, +DAXDEV_F_SYNC );
Apologies for not realizing this until now, but this is broken. Imaging a device-mapper configuration composed of both 'async' virtio-pmem and 'sync' pmem. The 'sync' flag needs to be unified across all members. I would change this argument to '0' and then arrange for it to be set at dm_table_supports_dax() time after validating that all components support synchronous dax.
PATCH v8 4/6 dax: check synchronous mapping is supported
In reply to Pankaj GuptaThis patch introduces 'daxdev_mapping_supported' helper which checks if 'MAP_SYNC' is supported with filesystem mapping. It also checks if corresponding dax_device is synchronous. Virtio pmem device is asynchronous and does not not support VM_SYNC.
--- include/linux/dax.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/linux/dax.h +17 -0
@@ -41,6 +41,18 @@ void kill_dax(struct dax_device *dax_dev);void dax_write_cache (struct dax_device *dax_dev,bool wc);bool dax_write_cache_enabled (struct dax_device *dax_dev);bool dax_synchronous (struct dax_device *dax_dev); +/* +* Check if given mapping is supported by the file / underlying device. +*/ +static inline bool daxdev_mapping_supported (struct vm_area_struct *vma, +struct dax_device *dax_dev) +{ +if (!(vma->vm_flags &VM_SYNC )) +return true; +if (!IS_DAX (file_inode (vma->vm_file))) +return false; +return dax_synchronous (dax_dev); +}#else static inline struct dax_device *dax_get_by_host (const char *host) {
@@ -68,6 +80,11 @@ static inline bool dax_write_cache_enabled(struct dax_device *dax_dev) {return false; } +static inline bool daxdev_mapping_supported (struct vm_area_struct *vma, +struct dax_device *dax_dev) +{ +return !(vma->vm_flags &VM_SYNC ); +}#endif struct writeback_control ;
Signature · 1 line
2.20.1
PATCH v8 4/6 dax: check synchronous mapping is supported
In reply to Pankaj GuptaThis patch introduces 'daxdev_mapping_supported' helper which checks if 'MAP_SYNC' is supported with filesystem mapping. It also checks if corresponding dax_device is synchronous. Virtio pmem device is asynchronous and does not not support VM_SYNC.
--- include/linux/dax.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/linux/dax.h +17 -0
@@ -41,6 +41,18 @@ void kill_dax(struct dax_device *dax_dev);void dax_write_cache (struct dax_device *dax_dev,bool wc);bool dax_write_cache_enabled (struct dax_device *dax_dev);bool dax_synchronous (struct dax_device *dax_dev); +/* +* Check if given mapping is supported by the file / underlying device. +*/ +static inline bool daxdev_mapping_supported (struct vm_area_struct *vma, +struct dax_device *dax_dev) +{ +if (!(vma->vm_flags &VM_SYNC )) +return true; +if (!IS_DAX (file_inode (vma->vm_file))) +return false; +return dax_synchronous (dax_dev); +}#else static inline struct dax_device *dax_get_by_host (const char *host) {
@@ -68,6 +80,11 @@ static inline bool dax_write_cache_enabled(struct dax_device *dax_dev) {return false; } +static inline bool daxdev_mapping_supported (struct vm_area_struct *vma, +struct dax_device *dax_dev) +{ +return !(vma->vm_flags &VM_SYNC ); +}#endif struct writeback_control ;
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
PATCH v8 5/6 ext4: disable map_sync for async flush
In reply to Pankaj GuptaDont support 'MAP_SYNC' with non-DAX files and DAX files with asynchronous dax_device. Virtio pmem provides asynchronous host page cache flush mechanism. We don't support 'MAP_SYNC' with virtio pmem and ext4.
--- fs/ext4/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ext4/file.c +6 -4
@@ -360,15 +360,17 @@ static const struct vm_operations_struct ext4_file_vm_ops = {static int ext4_file_mmap (struct file *file,struct vm_area_struct *vma) {struct inode *inode = file->f_mapping->host; +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb); +struct dax_device *dax_dev = sbi->s_daxdev; -if (unlikely (ext4_forced_shutdown (EXT4_SB (inode->i_sb)))) +if (unlikely (ext4_forced_shutdown (sbi)))return -EIO ;/* -* We don't support synchronous mappings for non-DAX files. At least -* until someone comes with a sensible use case. +* We don't support synchronous mappings for non-DAX files and +* for DAX files if underneath dax_device is not synchronous. */ -if (!IS_DAX (file_inode (file)) && (vma->vm_flags &VM_SYNC )) +if (!daxdev_mapping_supported (vma, dax_dev))return -EOPNOTSUPP ;file_accessed (file);
Signature · 1 line
2.20.1
PATCH v8 5/6 ext4: disable map_sync for async flush
In reply to Pankaj GuptaDont support 'MAP_SYNC' with non-DAX files and DAX files with asynchronous dax_device. Virtio pmem provides asynchronous host page cache flush mechanism. We don't support 'MAP_SYNC' with virtio pmem and ext4.
--- fs/ext4/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ext4/file.c +6 -4
@@ -360,15 +360,17 @@ static const struct vm_operations_struct ext4_file_vm_ops = {static int ext4_file_mmap (struct file *file,struct vm_area_struct *vma) {struct inode *inode = file->f_mapping->host; +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb); +struct dax_device *dax_dev = sbi->s_daxdev; -if (unlikely (ext4_forced_shutdown (EXT4_SB (inode->i_sb)))) +if (unlikely (ext4_forced_shutdown (sbi)))return -EIO ;/* -* We don't support synchronous mappings for non-DAX files. At least -* until someone comes with a sensible use case. +* We don't support synchronous mappings for non-DAX files and +* for DAX files if underneath dax_device is not synchronous. */ -if (!IS_DAX (file_inode (file)) && (vma->vm_flags &VM_SYNC )) +if (!daxdev_mapping_supported (vma, dax_dev))return -EOPNOTSUPP ;file_accessed (file);
Signature · 1 line
2.20.1
PATCH v8 6/6 xfs: disable map_sync for async flush
In reply to Pankaj GuptaDont support 'MAP_SYNC' with non-DAX files and DAX files with asynchronous dax_device. Virtio pmem provides asynchronous host page cache flush mechanism. We don't support 'MAP_SYNC' with virtio pmem and xfs.
--- fs/xfs/xfs_file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/xfs/xfs_file.c +6 -3
@@ -1203,11 +1203,14 @@ xfs_file_mmap(struct file *filp, struct vm_area_struct *vma) { + struct dax_device *dax_dev; + + dax_dev =xfs_find_daxdev_for_inode (file_inode (filp));/* -* We don't support synchronous mappings for non-DAX files. At least -* until someone comes with a sensible use case. +* We don't support synchronous mappings for non-DAX files and +* for DAX files if underneath dax_device is not synchronous. */ -if (!IS_DAX (file_inode (filp)) && (vma->vm_flags &VM_SYNC )) +if (!daxdev_mapping_supported (vma, dax_dev))return -EOPNOTSUPP ;file_accessed (filp);
Signature · 1 line
2.20.1
PATCH v8 6/6 xfs: disable map_sync for async flush
In reply to Pankaj GuptaDont support 'MAP_SYNC' with non-DAX files and DAX files with asynchronous dax_device. Virtio pmem provides asynchronous host page cache flush mechanism. We don't support 'MAP_SYNC' with virtio pmem and xfs.
--- fs/xfs/xfs_file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/xfs/xfs_file.c +6 -3
@@ -1203,11 +1203,14 @@ xfs_file_mmap(struct file *filp, struct vm_area_struct *vma) { + struct dax_device *dax_dev; + + dax_dev =xfs_find_daxdev_for_inode (file_inode (filp));/* -* We don't support synchronous mappings for non-DAX files. At least -* until someone comes with a sensible use case. +* We don't support synchronous mappings for non-DAX files and +* for DAX files if underneath dax_device is not synchronous. */ -if (!IS_DAX (file_inode (filp)) && (vma->vm_flags &VM_SYNC )) +if (!daxdev_mapping_supported (vma, dax_dev))return -EOPNOTSUPP ;file_accessed (filp);
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Michael S. Tsirkin
maintainerQuoted 3 lines · Pankaj Gupta
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side.
Thanks!
Hope to do this early next week.
Quoted 190 lines
We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.Changes done from v7 are only in
patch(2 & 3)and not affecting existing reviews. Request to please review.
----This patch series has implementation for "virtio pmem". "virtio pmem" is fake persistent memory(nvdimm) in guest which allows to bypass the guest page cache. This also implements a VIRTIO based asynchronous flush mechanism.
Sharing guest kernel driver in this patchset with the changes suggested in v4. Tested with Qemu side device emulation [6] for virtio-pmem. Documented the impact of possible page cache side channel attacks with suggested countermeasures.
Details of project idea for 'virtio pmem' flushing interface is shared [3] & [4].
Implementation is divided into two parts:
New virtio pmem guest driver and qemu code changes for new virtio pmem paravirtualized device.1. Guest virtio-pmem kernel driver
---------------------------------
- Reads persistent memory range from paravirt device and registers with 'nvdimm_bus'.
- 'nvdimm/pmem' driver uses this information to allocate persistent memory region and setup filesystem operations to the allocated memory.
- virtio pmem driver implements asynchronous flushing interface to flush from guest to host.2. Qemu virtio-pmem device
---------------------------------
- Creates virtio pmem device and exposes a memory range to KVM guest.
- At host side this is file backed memory which acts as persistent memory.
- Qemu side flush uses aio thread pool API's and virtio for asynchronous guest multi request handling.David Hildenbrand CCed also posted a modified version[7] of qemu virtio-pmem code based on updated Qemu memory device API.
Virtio-pmem security implications and countermeasures:
-----------------------------------------------------In previous posting of kernel driver, there was discussion [9] on possible implications of page cache side channel attacks with virtio pmem. After thorough analysis of details of known side channel attacks, below are the suggestions:
- Depends entirely on how host backing image file is mapped into guest address space.
- virtio-pmem device emulation, by default shared mapping is used to map host backing file. It is recommended to use separate backing file at host side for every guest. This will prevent any possibility of executing common code from multiple guests and any chance of inferring guest local data based based on execution time.
- If backing file is required to be shared among multiple guests it is recommended to don't support host page cache eviction commands from the guest driver. This will avoid any possibility of inferring guest local data or host data from another guest.
- Proposed device specification [8] for virtio-pmem device with details of possible security implications and suggested countermeasures for device emulation.
Virtio-pmem errors handling:
----------------------------------------
Checked behaviour of virtio-pmem for below types of errors Need suggestions on expected behaviour for handling these errors?- Hardware Errors: Uncorrectable recoverable Errors:
a] virtio-pmem:
- As per current logic if error page belongs to Qemu process, host MCE handler isolates(hwpoison) that page and send SIGBUS. Qemu SIGBUS handler injects exception to KVM guest.
- KVM guest then isolates the page and send SIGBUS to guest userspace process which has mapped the page.b] Existing implementation for ACPI pmem driver:
- Handles such errors with MCE notifier and creates a list of bad blocks. Read/direct access DAX operation return EIO if accessed memory page fall in bad block list.
- It also starts backgound scrubbing.
- Similar functionality can be reused in virtio-pmem with MCE notifier but without scrubbing(no ACPI/ARS)? Need inputs to confirm if this behaviour is ok or needs any change?Changes from PATCH v7: [1]
- Corrected pending request queue logic (patch 2) - Jakub Staroń
- Used unsigned long flags for passingDAXDEV_F_SYNC(patch 3) - Dan
- Fixed typo => vma 'flag' to 'vm_flag' (patch 4)
- Added rob in patch 6 & patch 2Changes from PATCH v6: [1]
- Corrected comment format in patch 5 & patch 6. [Dave]
- Changed variable declaration indentation in patch 6 [Darrick]
- Add Reviewed-by tag by 'Jan Kara' in patch 4 & patch 5Changes from PATCH v5: [2]
Changes suggested in by - [Cornelia, Yuval]
- Remove assignment chaining in virtio driver
- Better error message and remove not required free
- Checknd_regionbefore useChanges suggested by - [Jan Kara]
-dax_synchronous()for !CONFIG_DAX
- Correct 'daxdev_mapping_supported' comment and non-dax implementationChanges suggested by - [Dan Williams]
- Pass meaningful flag 'DAXDEV_F_SYNC' toalloc_dax
- Gatenvdimm_flushinstead of additional async parameter
- Move block chaining logic to flush callback than commonnvdimm_flush
- Use NULL flush callback for generic flush for better readability [Dan, Jan]- Use virtio device id 27 from 25(already used) - [MST]
Changes from PATCH v4:
- Factor outMAP_SYNCsupported functionality to a common helper [Dave, Darrick, Jan]
- Comment, indentation andvirtqueue_kickfailure handle - Yuval ShaiaChanges from PATCH v3:
- Use genericdax_synchronous()helper to check forDAXDEV_SYNCflag - [Dan, Darrick, Jan]
- Add 'is_nvdimm_async' function
- Document page cache side channel attacks implications & countermeasures - [Dave Chinner, Michael]Changes from PATCH v2:
- DisableMAP_SYNCfor ext4 & XFS filesystems - [Dan]
- Use name 'virtio pmem' in place of 'fake dax'Changes from PATCH v1:
- 0-day build test for build dependency on libnvdimmChanges suggested by - [Dan Williams]
- Split the driver into two parts virtio & pmem
- Move queuing of async block request to block layer
- Add "sync" parameter innvdimm_flushfunction
- Use indirect call fornvdimm_flush
- Don’t move declarations to common global header e.gnd.h
-nvdimm_flush()return 0 or-EIOif it fails
- Teachnsio_rw_bytes()that the flush can fail
- Renamenvdimm_flush()togeneric_nvdimm_flush()
- Use 'nd_region->provider_data' for long dereferencing
- Remove virtio_pmem_freeze/restore functions
- Remove BSD license text with SPDX license text- Add
might_sleep()invirtio_pmem_flush- [Luiz]
- Makespin_lock_irqsave()narrowPankaj Gupta (6):
libnvdimm:nd_regionflush callback support
virtio-pmem: Add virtio-pmem guest driver
libnvdimm: addnd_regionbuffereddax_devflag
dax: check synchronous mapping is supported
ext4: disablemap_syncfor virtio pmem
xfs: disablemap_syncfor virtio pmem[1] https://lkml.org/lkml/2019/4/26/36
[2] https://lkml.org/lkml/2019/4/23/1092
[3] https://www.spinics.net/lists/kvm/msg149761.html
[4] https://www.spinics.net/lists/kvm/msg153095.html
[5] https://lkml.org/lkml/2018/8/31/413
[6] https://marc.info/?l=linux-kernel&m=153572228719237&w=2
[7] https://marc.info/?l=qemu-devel&m=153555721901824&w=2
[8] https://lists.oasis-open.org/archives/virtio-dev/201903/msg00083.html
[9] https://lkml.org/lkml/2019/1/9/1191drivers/acpi/nfit/core.c | 4 - drivers/dax/bus.c | 2 drivers/dax/super.c | 13 +++ drivers/md/dm.c | 3 drivers/nvdimm/Makefile | 1 drivers/nvdimm/claim.c | 6 + drivers/nvdimm/nd.h | 1 drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/pmem.c | 18 +++-- drivers/nvdimm/region_devs.c | 33 +++++++++ drivers/nvdimm/virtio_pmem.c | 117 +++++++++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++
Quoted 8 lines
fs/ext4/file.c | 10 +-- fs/xfs/xfs_file.c | 9 +- include/linux/dax.h | 25 ++++++- include/linux/libnvdimm.h | 9 ++ include/linux/virtio_pmem.h | 60 ++++++++++++++++++ include/uapi/linux/virtio_ids.h | 1 include/uapi/linux/virtio_pmem.h | 10 +++ 19 files changed, 436 insertions(+), 25 deletions(-)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerQuoted 3 lines · Pankaj Gupta
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side.
Thanks!
Hope to do this early next week.
Quoted 190 lines
We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.Changes done from v7 are only in
patch(2 & 3)and not affecting existing reviews. Request to please review.
----This patch series has implementation for "virtio pmem". "virtio pmem" is fake persistent memory(nvdimm) in guest which allows to bypass the guest page cache. This also implements a VIRTIO based asynchronous flush mechanism.
Sharing guest kernel driver in this patchset with the changes suggested in v4. Tested with Qemu side device emulation [6] for virtio-pmem. Documented the impact of possible page cache side channel attacks with suggested countermeasures.
Details of project idea for 'virtio pmem' flushing interface is shared [3] & [4].
Implementation is divided into two parts:
New virtio pmem guest driver and qemu code changes for new virtio pmem paravirtualized device.1. Guest virtio-pmem kernel driver
---------------------------------
- Reads persistent memory range from paravirt device and registers with 'nvdimm_bus'.
- 'nvdimm/pmem' driver uses this information to allocate persistent memory region and setup filesystem operations to the allocated memory.
- virtio pmem driver implements asynchronous flushing interface to flush from guest to host.2. Qemu virtio-pmem device
---------------------------------
- Creates virtio pmem device and exposes a memory range to KVM guest.
- At host side this is file backed memory which acts as persistent memory.
- Qemu side flush uses aio thread pool API's and virtio for asynchronous guest multi request handling.David Hildenbrand CCed also posted a modified version[7] of qemu virtio-pmem code based on updated Qemu memory device API.
Virtio-pmem security implications and countermeasures:
-----------------------------------------------------In previous posting of kernel driver, there was discussion [9] on possible implications of page cache side channel attacks with virtio pmem. After thorough analysis of details of known side channel attacks, below are the suggestions:
- Depends entirely on how host backing image file is mapped into guest address space.
- virtio-pmem device emulation, by default shared mapping is used to map host backing file. It is recommended to use separate backing file at host side for every guest. This will prevent any possibility of executing common code from multiple guests and any chance of inferring guest local data based based on execution time.
- If backing file is required to be shared among multiple guests it is recommended to don't support host page cache eviction commands from the guest driver. This will avoid any possibility of inferring guest local data or host data from another guest.
- Proposed device specification [8] for virtio-pmem device with details of possible security implications and suggested countermeasures for device emulation.
Virtio-pmem errors handling:
----------------------------------------
Checked behaviour of virtio-pmem for below types of errors Need suggestions on expected behaviour for handling these errors?- Hardware Errors: Uncorrectable recoverable Errors:
a] virtio-pmem:
- As per current logic if error page belongs to Qemu process, host MCE handler isolates(hwpoison) that page and send SIGBUS. Qemu SIGBUS handler injects exception to KVM guest.
- KVM guest then isolates the page and send SIGBUS to guest userspace process which has mapped the page.b] Existing implementation for ACPI pmem driver:
- Handles such errors with MCE notifier and creates a list of bad blocks. Read/direct access DAX operation return EIO if accessed memory page fall in bad block list.
- It also starts backgound scrubbing.
- Similar functionality can be reused in virtio-pmem with MCE notifier but without scrubbing(no ACPI/ARS)? Need inputs to confirm if this behaviour is ok or needs any change?Changes from PATCH v7: [1]
- Corrected pending request queue logic (patch 2) - Jakub Staroń
- Used unsigned long flags for passingDAXDEV_F_SYNC(patch 3) - Dan
- Fixed typo => vma 'flag' to 'vm_flag' (patch 4)
- Added rob in patch 6 & patch 2Changes from PATCH v6: [1]
- Corrected comment format in patch 5 & patch 6. [Dave]
- Changed variable declaration indentation in patch 6 [Darrick]
- Add Reviewed-by tag by 'Jan Kara' in patch 4 & patch 5Changes from PATCH v5: [2]
Changes suggested in by - [Cornelia, Yuval]
- Remove assignment chaining in virtio driver
- Better error message and remove not required free
- Checknd_regionbefore useChanges suggested by - [Jan Kara]
-dax_synchronous()for !CONFIG_DAX
- Correct 'daxdev_mapping_supported' comment and non-dax implementationChanges suggested by - [Dan Williams]
- Pass meaningful flag 'DAXDEV_F_SYNC' toalloc_dax
- Gatenvdimm_flushinstead of additional async parameter
- Move block chaining logic to flush callback than commonnvdimm_flush
- Use NULL flush callback for generic flush for better readability [Dan, Jan]- Use virtio device id 27 from 25(already used) - [MST]
Changes from PATCH v4:
- Factor outMAP_SYNCsupported functionality to a common helper [Dave, Darrick, Jan]
- Comment, indentation andvirtqueue_kickfailure handle - Yuval ShaiaChanges from PATCH v3:
- Use genericdax_synchronous()helper to check forDAXDEV_SYNCflag - [Dan, Darrick, Jan]
- Add 'is_nvdimm_async' function
- Document page cache side channel attacks implications & countermeasures - [Dave Chinner, Michael]Changes from PATCH v2:
- DisableMAP_SYNCfor ext4 & XFS filesystems - [Dan]
- Use name 'virtio pmem' in place of 'fake dax'Changes from PATCH v1:
- 0-day build test for build dependency on libnvdimmChanges suggested by - [Dan Williams]
- Split the driver into two parts virtio & pmem
- Move queuing of async block request to block layer
- Add "sync" parameter innvdimm_flushfunction
- Use indirect call fornvdimm_flush
- Don’t move declarations to common global header e.gnd.h
-nvdimm_flush()return 0 or-EIOif it fails
- Teachnsio_rw_bytes()that the flush can fail
- Renamenvdimm_flush()togeneric_nvdimm_flush()
- Use 'nd_region->provider_data' for long dereferencing
- Remove virtio_pmem_freeze/restore functions
- Remove BSD license text with SPDX license text- Add
might_sleep()invirtio_pmem_flush- [Luiz]
- Makespin_lock_irqsave()narrowPankaj Gupta (6):
libnvdimm:nd_regionflush callback support
virtio-pmem: Add virtio-pmem guest driver
libnvdimm: addnd_regionbuffereddax_devflag
dax: check synchronous mapping is supported
ext4: disablemap_syncfor virtio pmem
xfs: disablemap_syncfor virtio pmem[1] https://lkml.org/lkml/2019/4/26/36
[2] https://lkml.org/lkml/2019/4/23/1092
[3] https://www.spinics.net/lists/kvm/msg149761.html
[4] https://www.spinics.net/lists/kvm/msg153095.html
[5] https://lkml.org/lkml/2018/8/31/413
[6] https://marc.info/?l=linux-kernel&m=153572228719237&w=2
[7] https://marc.info/?l=qemu-devel&m=153555721901824&w=2
[8] https://lists.oasis-open.org/archives/virtio-dev/201903/msg00083.html
[9] https://lkml.org/lkml/2019/1/9/1191drivers/acpi/nfit/core.c | 4 - drivers/dax/bus.c | 2 drivers/dax/super.c | 13 +++ drivers/md/dm.c | 3 drivers/nvdimm/Makefile | 1 drivers/nvdimm/claim.c | 6 + drivers/nvdimm/nd.h | 1 drivers/nvdimm/nd_virtio.c | 129 +++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/pmem.c | 18 +++-- drivers/nvdimm/region_devs.c | 33 +++++++++ drivers/nvdimm/virtio_pmem.c | 117 +++++++++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 10 +++
Quoted 8 lines
fs/ext4/file.c | 10 +-- fs/xfs/xfs_file.c | 9 +- include/linux/dax.h | 25 ++++++- include/linux/libnvdimm.h | 9 ++ include/linux/virtio_pmem.h | 60 ++++++++++++++++++ include/uapi/linux/virtio_ids.h | 1 include/uapi/linux/virtio_pmem.h | 10 +++ 19 files changed, 436 insertions(+), 25 deletions(-)
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 6 lines · Pankaj Gupta
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side. We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.
I was planning to merge these via the nvdimm tree, not ack them. Did you have another maintainer lined up to take these patches?
Quoted 6 lines · Pankaj Gupta
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side. We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.
I was planning to merge these via the nvdimm tree, not ack them. Did you have another maintainer lined up to take these patches?
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 10 lines
Quoted 7 lines
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side. We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.I was planning to merge these via the nvdimm tree, not ack them. Did you have another maintainer lined up to take these patches?
Sorry! for not being clear on this. I wanted to say same.
Proposed the patch series to be merged via nvdimm tree as kindly agreed by you. We only need an ack on virtio patch 2 from Micahel.
Thank you for all your help.
Best regards,
Pankaj Gupta
Quoted 1 line
Michael S. Tsirkin
maintainerQuoted 13 lines · Pankaj Gupta
Quoted 10 lines
Quoted 7 lines
Hi Michael & Dan,
Please review/ack the patch series from LIBNVDIMM & VIRTIO side. We have ack on ext4, xfs
patches(4, 5 & 6)patch 2. Still need your ack on nvdimmpatches(1 & 3)& virtio patch 2.I was planning to merge these via the nvdimm tree, not ack them. Did you have another maintainer lined up to take these patches?
Sorry! for not being clear on this. I wanted to say same.
Quoted 7 lines
Proposed the patch series to be merged via nvdimm tree as kindly agreed by you. We only need an ack on virtio patch 2 from Micahel.
Thank you for all your help.
Best regards,
Pankaj Gupta
Fine by me.
Quoted 1 line
Quoted 1 line