From: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com> To: <linux-xfs@vger.kernel.org>, <linux-nvdimm@lists.01.org>, <darrick.wong@oracle.com>, <rgoldwyn@suse.de>, <hch@infradead.org>, <david@fromorbit.com> Cc: linux-kernel@vger.kernel.org, gujx@cn.fujitsu.com, qi.fuli@fujitsu.com, Goldwyn Rodrigues <rgoldwyn@suse.com> Subject: [RFC PATCH v2 5/7] dax: memcpy before zeroing range Date: Wed, 30 Oct 2019 12:13:56 +0800 [thread overview] Message-ID: <20191030041358.14450-6-ruansy.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20191030041358.14450-1-ruansy.fnst@cn.fujitsu.com> From: Goldwyn Rodrigues <rgoldwyn@suse.com> However, this needed more iomap fields, so it was easier to pass iomap and compute inside the function rather than passing a log of arguments. Note, there is subtle difference between iomap_sector and dax_iomap_sector(). Can we replace dax_iomap_sector with iomap_sector()? It would need pos & PAGE_MASK though or else bdev_dax_pgoff() return -EINVAL. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> --- fs/dax.c | 21 ++++++++++++++++----- fs/iomap/buffered-io.c | 8 ++++---- include/linux/dax.h | 12 ++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index a4f90f3faddb..eab6bb256205 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1117,11 +1117,16 @@ static int dax_copy_edges(loff_t pos, loff_t length, struct iomap *srcmap, 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_zero_page_range(struct iomap *iomap, struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size) { - if (dax_range_is_aligned(bdev, offset, size)) { + sector_t sector = dax_iomap_sector(iomap, pos & PAGE_MASK); + struct block_device *bdev = iomap->bdev; + struct dax_device *dax_dev = iomap->dax_dev; + int ret = 0; + + if (iomap == srcmap && + dax_range_is_aligned(bdev, offset, size)) { sector_t start_sector = sector + (offset >> 9); return blkdev_issue_zeroout(bdev, start_sector, @@ -1141,11 +1146,17 @@ int __dax_zero_page_range(struct block_device *bdev, dax_read_unlock(id); return rc; } + if (iomap != srcmap) { + ret = dax_copy_edges(pos, size, srcmap, kaddr, false); + if (ret) + goto out_unlock; + } memset(kaddr + offset, 0, size); dax_flush(dax_dev, kaddr + offset, size); +out_unlock: dax_read_unlock(id); } - return 0; + return ret; } EXPORT_SYMBOL_GPL(__dax_zero_page_range); diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index c62e807956b6..3fa79389e4d0 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -960,10 +960,9 @@ static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, } static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes, - struct iomap *iomap) + struct iomap *iomap, struct iomap *srcmap) { - return __dax_zero_page_range(iomap->bdev, iomap->dax_dev, - iomap_sector(iomap, pos & PAGE_MASK), offset, bytes); + return __dax_zero_page_range(iomap, srcmap, pos, offset, bytes); } static loff_t @@ -985,7 +984,8 @@ 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 = iomap_dax_zero(pos, offset, bytes, iomap, + srcmap); else status = iomap_zero(inode, pos, offset, bytes, iomap, srcmap); diff --git a/include/linux/dax.h b/include/linux/dax.h index 4533bfb99683..7adf3b9e1061 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -12,6 +12,7 @@ typedef unsigned long dax_entry_t; +struct iomap; struct iomap_ops; struct dax_device; struct dax_operations { @@ -226,13 +227,12 @@ int dax_file_range_compare(struct inode *src, loff_t srcoff, const struct iomap_ops *ops); #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); +int __dax_zero_page_range(struct iomap *iomap, struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size); #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) +static inline int __dax_zero_page_range(struct iomap *iomap, + struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size) { return -ENXIO; } -- 2.23.0 _______________________________________________ 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: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com> To: <linux-xfs@vger.kernel.org>, <linux-nvdimm@lists.01.org>, <darrick.wong@oracle.com>, <rgoldwyn@suse.de>, <hch@infradead.org>, <david@fromorbit.com> Cc: <linux-kernel@vger.kernel.org>, <gujx@cn.fujitsu.com>, <qi.fuli@fujitsu.com>, <caoj.fnst@cn.fujitsu.com>, <ruansy.fnst@cn.fujitsu.com>, Goldwyn Rodrigues <rgoldwyn@suse.com> Subject: [RFC PATCH v2 5/7] dax: memcpy before zeroing range Date: Wed, 30 Oct 2019 12:13:56 +0800 [thread overview] Message-ID: <20191030041358.14450-6-ruansy.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20191030041358.14450-1-ruansy.fnst@cn.fujitsu.com> From: Goldwyn Rodrigues <rgoldwyn@suse.com> However, this needed more iomap fields, so it was easier to pass iomap and compute inside the function rather than passing a log of arguments. Note, there is subtle difference between iomap_sector and dax_iomap_sector(). Can we replace dax_iomap_sector with iomap_sector()? It would need pos & PAGE_MASK though or else bdev_dax_pgoff() return -EINVAL. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> --- fs/dax.c | 21 ++++++++++++++++----- fs/iomap/buffered-io.c | 8 ++++---- include/linux/dax.h | 12 ++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index a4f90f3faddb..eab6bb256205 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1117,11 +1117,16 @@ static int dax_copy_edges(loff_t pos, loff_t length, struct iomap *srcmap, 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_zero_page_range(struct iomap *iomap, struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size) { - if (dax_range_is_aligned(bdev, offset, size)) { + sector_t sector = dax_iomap_sector(iomap, pos & PAGE_MASK); + struct block_device *bdev = iomap->bdev; + struct dax_device *dax_dev = iomap->dax_dev; + int ret = 0; + + if (iomap == srcmap && + dax_range_is_aligned(bdev, offset, size)) { sector_t start_sector = sector + (offset >> 9); return blkdev_issue_zeroout(bdev, start_sector, @@ -1141,11 +1146,17 @@ int __dax_zero_page_range(struct block_device *bdev, dax_read_unlock(id); return rc; } + if (iomap != srcmap) { + ret = dax_copy_edges(pos, size, srcmap, kaddr, false); + if (ret) + goto out_unlock; + } memset(kaddr + offset, 0, size); dax_flush(dax_dev, kaddr + offset, size); +out_unlock: dax_read_unlock(id); } - return 0; + return ret; } EXPORT_SYMBOL_GPL(__dax_zero_page_range); diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index c62e807956b6..3fa79389e4d0 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -960,10 +960,9 @@ static int iomap_zero(struct inode *inode, loff_t pos, unsigned offset, } static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes, - struct iomap *iomap) + struct iomap *iomap, struct iomap *srcmap) { - return __dax_zero_page_range(iomap->bdev, iomap->dax_dev, - iomap_sector(iomap, pos & PAGE_MASK), offset, bytes); + return __dax_zero_page_range(iomap, srcmap, pos, offset, bytes); } static loff_t @@ -985,7 +984,8 @@ 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 = iomap_dax_zero(pos, offset, bytes, iomap, + srcmap); else status = iomap_zero(inode, pos, offset, bytes, iomap, srcmap); diff --git a/include/linux/dax.h b/include/linux/dax.h index 4533bfb99683..7adf3b9e1061 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -12,6 +12,7 @@ typedef unsigned long dax_entry_t; +struct iomap; struct iomap_ops; struct dax_device; struct dax_operations { @@ -226,13 +227,12 @@ int dax_file_range_compare(struct inode *src, loff_t srcoff, const struct iomap_ops *ops); #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); +int __dax_zero_page_range(struct iomap *iomap, struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size); #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) +static inline int __dax_zero_page_range(struct iomap *iomap, + struct iomap *srcmap, loff_t pos, + unsigned int offset, unsigned int size) { return -ENXIO; } -- 2.23.0
next prev parent reply other threads:[~2019-10-30 4:14 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-30 4:13 [RFC PATCH v2 0/7] xfs: reflink & dedupe for fsdax (read/write path) Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 1/7] dax: Introduce dax_copy_edges() for COW Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 2/7] dax: copy data before write Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 3/7] dax: replace mmap entry in case of CoW Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 4/7] fs: dedup file range to use a compare function Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan [this message] 2019-10-30 4:13 ` [RFC PATCH v2 5/7] dax: memcpy before zeroing range Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 6/7] xfs: handle copy-on-write in fsdax write() path Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 4:13 ` [RFC PATCH v2 7/7] xfs: support dedupe for fsdax Shiyang Ruan 2019-10-30 4:13 ` Shiyang Ruan 2019-10-30 11:48 ` [RFC PATCH v2 0/7] xfs: reflink & dedupe for fsdax (read/write path) Goldwyn Rodrigues 2019-10-30 11:48 ` Goldwyn Rodrigues 2019-10-31 4:54 ` Shiyang Ruan 2019-10-31 4:54 ` Shiyang Ruan 2019-11-08 3:10 ` Shiyang Ruan 2019-11-08 3:10 ` Shiyang Ruan 2019-11-08 3:30 ` Dan Williams 2019-11-08 3:30 ` Dan Williams 2019-11-14 20:24 ` Dave Chinner 2019-11-14 20:24 ` Dave Chinner
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=20191030041358.14450-6-ruansy.fnst@cn.fujitsu.com \ --to=ruansy.fnst@cn.fujitsu.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=gujx@cn.fujitsu.com \ --cc=hch@infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linux-xfs@vger.kernel.org \ --cc=qi.fuli@fujitsu.com \ --cc=rgoldwyn@suse.com \ --cc=rgoldwyn@suse.de \ /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.