From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, dan.j.williams@intel.com, hch@infradead.org Cc: dm-devel@redhat.com Subject: [PATCH 4/5] dax,iomap: Start using dax native zero_page_range() Date: Mon, 3 Feb 2020 15:00:28 -0500 [thread overview] Message-ID: <20200203200029.4592-5-vgoyal@redhat.com> (raw) In-Reply-To: <20200203200029.4592-1-vgoyal@redhat.com> Get rid of calling block device interface for zeroing in iomap dax zeroing path and use dax native zeroing interface instead. Suggested-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 35631a4d0295..1b9ba6b59cdb 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1044,19 +1044,6 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, return ret; } -static bool dax_range_is_aligned(struct block_device *bdev, - unsigned int offset, unsigned int length) -{ - unsigned short sector_size = bdev_logical_block_size(bdev); - - if (!IS_ALIGNED(offset, sector_size)) - return false; - if (!IS_ALIGNED(length, sector_size)) - return false; - - return true; -} - int generic_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff, unsigned int offset, size_t len) { @@ -1076,31 +1063,17 @@ int __dax_zero_page_range(struct block_device *bdev, struct dax_device *dax_dev, sector_t sector, unsigned int offset, unsigned int size) { - if (dax_range_is_aligned(bdev, offset, size)) { - sector_t start_sector = sector + (offset >> 9); - - return blkdev_issue_zeroout(bdev, start_sector, - size >> 9, GFP_NOFS, 0); - } else { - pgoff_t pgoff; - long rc, id; - void *kaddr; + pgoff_t pgoff; + long rc, id; - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); - if (rc) - return rc; + rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + if (rc) + return rc; - id = dax_read_lock(); - rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL); - if (rc < 0) { - dax_read_unlock(id); - return rc; - } - memset(kaddr + offset, 0, size); - dax_flush(dax_dev, kaddr + offset, size); - dax_read_unlock(id); - } - return 0; + id = dax_read_lock(); + rc = dax_zero_page_range(dax_dev, pgoff, offset, size); + dax_read_unlock(id); + return rc; } EXPORT_SYMBOL_GPL(__dax_zero_page_range); -- 2.18.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, dan.j.williams@intel.com, hch@infradead.org Cc: vgoyal@redhat.com, vishal.l.verma@intel.com, dm-devel@redhat.com Subject: [PATCH 4/5] dax,iomap: Start using dax native zero_page_range() Date: Mon, 3 Feb 2020 15:00:28 -0500 [thread overview] Message-ID: <20200203200029.4592-5-vgoyal@redhat.com> (raw) In-Reply-To: <20200203200029.4592-1-vgoyal@redhat.com> Get rid of calling block device interface for zeroing in iomap dax zeroing path and use dax native zeroing interface instead. Suggested-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 35631a4d0295..1b9ba6b59cdb 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1044,19 +1044,6 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, return ret; } -static bool dax_range_is_aligned(struct block_device *bdev, - unsigned int offset, unsigned int length) -{ - unsigned short sector_size = bdev_logical_block_size(bdev); - - if (!IS_ALIGNED(offset, sector_size)) - return false; - if (!IS_ALIGNED(length, sector_size)) - return false; - - return true; -} - int generic_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff, unsigned int offset, size_t len) { @@ -1076,31 +1063,17 @@ int __dax_zero_page_range(struct block_device *bdev, struct dax_device *dax_dev, sector_t sector, unsigned int offset, unsigned int size) { - if (dax_range_is_aligned(bdev, offset, size)) { - sector_t start_sector = sector + (offset >> 9); - - return blkdev_issue_zeroout(bdev, start_sector, - size >> 9, GFP_NOFS, 0); - } else { - pgoff_t pgoff; - long rc, id; - void *kaddr; + pgoff_t pgoff; + long rc, id; - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); - if (rc) - return rc; + rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + if (rc) + return rc; - id = dax_read_lock(); - rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL); - if (rc < 0) { - dax_read_unlock(id); - return rc; - } - memset(kaddr + offset, 0, size); - dax_flush(dax_dev, kaddr + offset, size); - dax_read_unlock(id); - } - return 0; + id = dax_read_lock(); + rc = dax_zero_page_range(dax_dev, pgoff, offset, size); + dax_read_unlock(id); + return rc; } EXPORT_SYMBOL_GPL(__dax_zero_page_range); -- 2.18.1
next prev parent reply other threads:[~2020-02-03 20:01 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-03 20:00 [RFC PATCH 0/5][V2] dax,pmem: Provide a dax operation to zero range of memory Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal 2020-02-03 20:00 ` [PATCH 1/5] dax, pmem: Add a dax operation zero_page_range Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal 2020-02-05 18:30 ` Christoph Hellwig 2020-02-05 18:30 ` Christoph Hellwig 2020-02-05 20:02 ` Vivek Goyal 2020-02-05 20:02 ` Vivek Goyal 2020-02-06 0:40 ` Dan Williams 2020-02-06 0:40 ` Dan Williams 2020-02-06 7:41 ` Christoph Hellwig 2020-02-06 7:41 ` Christoph Hellwig 2020-02-07 16:57 ` Dan Williams 2020-02-07 16:57 ` Dan Williams 2020-02-07 17:01 ` Vivek Goyal 2020-02-07 17:01 ` Vivek Goyal 2020-02-07 17:06 ` Dan Williams 2020-02-07 17:06 ` Dan Williams 2020-02-06 14:34 ` Vivek Goyal 2020-02-06 14:34 ` Vivek Goyal 2020-02-07 16:58 ` Dan Williams 2020-02-07 16:58 ` Dan Williams 2020-02-03 20:00 ` [PATCH 2/5] s390,dax: Add dax zero_page_range operation to dcssblk driver Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal 2020-02-05 18:32 ` Christoph Hellwig 2020-02-05 18:32 ` Christoph Hellwig 2020-02-05 20:04 ` Vivek Goyal 2020-02-05 20:04 ` Vivek Goyal 2020-02-03 20:00 ` [PATCH 3/5] dm,dax: Add dax zero_page_range operation Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal 2020-02-05 18:33 ` Christoph Hellwig 2020-02-05 18:33 ` Christoph Hellwig 2020-02-07 16:34 ` Vivek Goyal 2020-02-07 16:34 ` Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal [this message] 2020-02-03 20:00 ` [PATCH 4/5] dax,iomap: Start using dax native zero_page_range() Vivek Goyal 2020-02-05 18:33 ` Christoph Hellwig 2020-02-05 18:33 ` Christoph Hellwig 2020-02-05 20:10 ` Vivek Goyal 2020-02-05 20:10 ` Vivek Goyal 2020-02-07 15:31 ` Vivek Goyal 2020-02-07 15:31 ` Vivek Goyal 2020-02-03 20:00 ` [PATCH 5/5] dax,iomap: Add helper dax_iomap_zero() to zero a range Vivek Goyal 2020-02-03 20:00 ` Vivek Goyal 2020-02-04 5:17 ` kbuild test robot 2020-02-04 5:17 ` [PATCH 5/5] dax, iomap: " kbuild test robot 2020-02-04 5:17 ` [PATCH 5/5] dax,iomap: " kbuild test robot 2020-02-04 5:17 ` kbuild test robot 2020-02-05 18:36 ` Christoph Hellwig 2020-02-05 18:36 ` Christoph Hellwig 2020-02-05 20:15 ` Vivek Goyal 2020-02-05 20:15 ` Vivek Goyal
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=20200203200029.4592-5-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --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.