From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, hch@infradead.org, dan.j.williams@intel.com Cc: dm-devel@redhat.com, Christoph Hellwig <hch@lst.de> Subject: [PATCH v5 8/8] dax,iomap: Add helper dax_iomap_zero() to zero a range Date: Tue, 18 Feb 2020 16:48:41 -0500 [thread overview] Message-ID: <20200218214841.10076-9-vgoyal@redhat.com> (raw) In-Reply-To: <20200218214841.10076-1-vgoyal@redhat.com> Add a helper dax_ioamp_zero() to zero a range. This patch basically merges __dax_zero_page_range() and iomap_dax_zero(). Suggested-by: Christoph Hellwig <hch@infradead.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 12 ++++++------ fs/iomap/buffered-io.c | 9 +-------- include/linux/dax.h | 17 +++-------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index f8ae0a9984fa..4be581009db5 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1038,23 +1038,23 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, return ret; } -int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int size) +int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size, + struct iomap *iomap) { pgoff_t pgoff; long rc, id; + sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff); if (rc) return rc; id = dax_read_lock(); - rc = dax_zero_page_range(dax_dev, (pgoff << PAGE_SHIFT) + offset, size); + rc = dax_zero_page_range(iomap->dax_dev, (pgoff << PAGE_SHIFT) + offset, + size); dax_read_unlock(id); return rc; } -EXPORT_SYMBOL_GPL(__dax_zero_page_range); static loff_t dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7c84c4c027c4..6f750da545e5 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -974,13 +974,6 @@ static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, return iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); } -static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes, - struct iomap *iomap) -{ - return __dax_zero_page_range(iomap->bdev, iomap->dax_dev, - iomap_sector(iomap, pos & PAGE_MASK), offset, bytes); -} - static loff_t iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count, void *data, struct iomap *iomap, struct iomap *srcmap) @@ -1000,7 +993,7 @@ iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count, bytes = min_t(loff_t, PAGE_SIZE - offset, count); if (IS_DAX(inode)) - status = iomap_dax_zero(pos, offset, bytes, iomap); + status = dax_iomap_zero(pos, offset, bytes, iomap); else status = iomap_zero(inode, pos, offset, bytes, iomap, srcmap); diff --git a/include/linux/dax.h b/include/linux/dax.h index 93a663c26d6a..7b681acfc522 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -13,6 +13,7 @@ typedef unsigned long dax_entry_t; struct iomap_ops; +struct iomap; struct dax_device; struct dax_operations { /* @@ -213,20 +214,8 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); int dax_invalidate_mapping_entry_sync(struct address_space *mapping, pgoff_t index); - -#ifdef CONFIG_FS_DAX -int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int length); -#else -static inline int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int length) -{ - return -ENXIO; -} -#endif - +int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size, + struct iomap *iomap); static inline bool dax_mapping(struct address_space *mapping) { return mapping->host && IS_DAX(mapping->host); -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, hch@infradead.org, dan.j.williams@intel.com Cc: dm-devel@redhat.com, vishal.l.verma@intel.com, vgoyal@redhat.com, Christoph Hellwig <hch@lst.de> Subject: [PATCH v5 8/8] dax,iomap: Add helper dax_iomap_zero() to zero a range Date: Tue, 18 Feb 2020 16:48:41 -0500 [thread overview] Message-ID: <20200218214841.10076-9-vgoyal@redhat.com> (raw) In-Reply-To: <20200218214841.10076-1-vgoyal@redhat.com> Add a helper dax_ioamp_zero() to zero a range. This patch basically merges __dax_zero_page_range() and iomap_dax_zero(). Suggested-by: Christoph Hellwig <hch@infradead.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 12 ++++++------ fs/iomap/buffered-io.c | 9 +-------- include/linux/dax.h | 17 +++-------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index f8ae0a9984fa..4be581009db5 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1038,23 +1038,23 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, return ret; } -int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int size) +int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size, + struct iomap *iomap) { pgoff_t pgoff; long rc, id; + sector_t sector = iomap_sector(iomap, pos & PAGE_MASK); - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff); if (rc) return rc; id = dax_read_lock(); - rc = dax_zero_page_range(dax_dev, (pgoff << PAGE_SHIFT) + offset, size); + rc = dax_zero_page_range(iomap->dax_dev, (pgoff << PAGE_SHIFT) + offset, + size); dax_read_unlock(id); return rc; } -EXPORT_SYMBOL_GPL(__dax_zero_page_range); static loff_t dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7c84c4c027c4..6f750da545e5 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -974,13 +974,6 @@ static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, return iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); } -static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes, - struct iomap *iomap) -{ - return __dax_zero_page_range(iomap->bdev, iomap->dax_dev, - iomap_sector(iomap, pos & PAGE_MASK), offset, bytes); -} - static loff_t iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count, void *data, struct iomap *iomap, struct iomap *srcmap) @@ -1000,7 +993,7 @@ iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count, bytes = min_t(loff_t, PAGE_SIZE - offset, count); if (IS_DAX(inode)) - status = iomap_dax_zero(pos, offset, bytes, iomap); + status = dax_iomap_zero(pos, offset, bytes, iomap); else status = iomap_zero(inode, pos, offset, bytes, iomap, srcmap); diff --git a/include/linux/dax.h b/include/linux/dax.h index 93a663c26d6a..7b681acfc522 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -13,6 +13,7 @@ typedef unsigned long dax_entry_t; struct iomap_ops; +struct iomap; struct dax_device; struct dax_operations { /* @@ -213,20 +214,8 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); int dax_invalidate_mapping_entry_sync(struct address_space *mapping, pgoff_t index); - -#ifdef CONFIG_FS_DAX -int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int length); -#else -static inline int __dax_zero_page_range(struct block_device *bdev, - struct dax_device *dax_dev, sector_t sector, - unsigned int offset, unsigned int length) -{ - return -ENXIO; -} -#endif - +int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size, + struct iomap *iomap); static inline bool dax_mapping(struct address_space *mapping) { return mapping->host && IS_DAX(mapping->host); -- 2.20.1
next prev parent reply other threads:[~2020-02-18 21:49 UTC|newest] Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-18 21:48 [PATCH v5 0/8] dax/pmem: Provide a dax operation to zero range of memory Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-18 21:48 ` [PATCH v5 1/8] pmem: Add functions for reading/writing page to/from pmem Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-18 21:48 ` [PATCH v5 2/8] drivers/pmem: Allow pmem_clear_poison() to accept arbitrary offset and len Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-20 16:17 ` Christoph Hellwig 2020-02-20 16:17 ` Christoph Hellwig 2020-02-20 21:35 ` Jeff Moyer 2020-02-20 21:35 ` Jeff Moyer 2020-02-20 21:57 ` Vivek Goyal 2020-02-20 21:57 ` Vivek Goyal 2020-02-21 18:32 ` Jeff Moyer 2020-02-21 18:32 ` Jeff Moyer 2020-02-21 20:17 ` Vivek Goyal 2020-02-21 20:17 ` Vivek Goyal 2020-02-21 21:00 ` Dan Williams 2020-02-21 21:00 ` Dan Williams 2020-02-21 21:24 ` Vivek Goyal 2020-02-21 21:24 ` Vivek Goyal 2020-02-21 21:30 ` Dan Williams 2020-02-21 21:30 ` Dan Williams 2020-02-21 21:33 ` Jeff Moyer 2020-02-21 21:33 ` Jeff Moyer 2020-02-23 23:03 ` Dave Chinner 2020-02-23 23:03 ` Dave Chinner 2020-02-24 0:40 ` Dan Williams 2020-02-24 0:40 ` Dan Williams 2020-02-24 13:50 ` Jeff Moyer 2020-02-24 13:50 ` Jeff Moyer 2020-02-24 20:48 ` Dan Williams 2020-02-24 20:48 ` Dan Williams 2020-02-24 21:53 ` Jeff Moyer 2020-02-24 21:53 ` Jeff Moyer 2020-02-25 0:26 ` Dan Williams 2020-02-25 0:26 ` Dan Williams 2020-02-25 20:32 ` Jeff Moyer 2020-02-25 20:32 ` Jeff Moyer 2020-02-25 21:52 ` Dan Williams 2020-02-25 21:52 ` Dan Williams 2020-02-25 23:26 ` Jane Chu 2020-02-25 23:26 ` Jane Chu 2020-02-24 15:38 ` Vivek Goyal 2020-02-24 15:38 ` Vivek Goyal 2020-02-27 3:02 ` Dave Chinner 2020-02-27 3:02 ` Dave Chinner 2020-02-27 4:19 ` Dan Williams 2020-02-27 4:19 ` Dan Williams 2020-02-28 1:30 ` Dave Chinner 2020-02-28 1:30 ` Dave Chinner 2020-02-28 3:28 ` Dan Williams 2020-02-28 3:28 ` Dan Williams 2020-02-28 14:05 ` Christoph Hellwig 2020-02-28 14:05 ` Christoph Hellwig 2020-02-28 16:26 ` Dan Williams 2020-02-28 16:26 ` Dan Williams 2020-02-24 20:13 ` Vivek Goyal 2020-02-24 20:13 ` Vivek Goyal 2020-02-24 20:52 ` Dan Williams 2020-02-24 20:52 ` Dan Williams 2020-02-24 21:15 ` Vivek Goyal 2020-02-24 21:15 ` Vivek Goyal 2020-02-24 21:32 ` Dan Williams 2020-02-24 21:32 ` Dan Williams 2020-02-25 13:36 ` Vivek Goyal 2020-02-25 13:36 ` Vivek Goyal 2020-02-25 16:25 ` Dan Williams 2020-02-25 16:25 ` Dan Williams 2020-02-25 20:08 ` Vivek Goyal 2020-02-25 20:08 ` Vivek Goyal 2020-02-25 22:49 ` Dan Williams 2020-02-25 22:49 ` Dan Williams 2020-02-26 13:51 ` Vivek Goyal 2020-02-26 13:51 ` Vivek Goyal 2020-02-26 16:57 ` Vivek Goyal 2020-02-26 16:57 ` Vivek Goyal 2020-02-27 3:11 ` Dave Chinner 2020-02-27 3:11 ` Dave Chinner 2020-02-27 15:25 ` Vivek Goyal 2020-02-27 15:25 ` Vivek Goyal 2020-02-28 1:50 ` Dave Chinner 2020-02-28 1:50 ` Dave Chinner 2020-02-18 21:48 ` [PATCH v5 3/8] pmem: Enable pmem_do_write() to deal with arbitrary ranges Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-20 16:17 ` Christoph Hellwig 2020-02-20 16:17 ` Christoph Hellwig 2020-02-18 21:48 ` [PATCH v5 4/8] dax, pmem: Add a dax operation zero_page_range Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-03-31 19:38 ` Dan Williams 2020-03-31 19:38 ` Dan Williams 2020-04-01 13:15 ` Vivek Goyal 2020-04-01 13:15 ` Vivek Goyal 2020-04-01 16:14 ` Vivek Goyal 2020-04-01 16:14 ` Vivek Goyal 2020-02-18 21:48 ` [PATCH v5 5/8] s390,dcssblk,dax: Add dax zero_page_range operation to dcssblk driver Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-18 21:48 ` [PATCH v5 6/8] dm,dax: Add dax zero_page_range operation Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-18 21:48 ` [PATCH v5 7/8] dax,iomap: Start using dax native zero_page_range() Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal 2020-02-18 21:48 ` Vivek Goyal [this message] 2020-02-18 21:48 ` [PATCH v5 8/8] dax,iomap: Add helper dax_iomap_zero() to zero a range Vivek Goyal 2020-04-25 11:31 ` [PATCH v5 8/8] dax, iomap: " neolift9
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200218214841.10076-9-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --cc=hch@lst.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.