From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <dan.j.williams@intel.com>, <djwong@kernel.org>, <hch@lst.de>,
<linux-xfs@vger.kernel.org>
Cc: <ruansy.fnst@fujitsu.com>, <david@fromorbit.com>,
<linux-fsdevel@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<nvdimm@lists.linux.dev>, <rgoldwyn@suse.de>,
<viro@zeniv.linux.org.uk>, <willy@infradead.org>,
Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [PATCH v10 5/8] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero
Date: Tue, 28 Sep 2021 14:23:08 +0800 [thread overview]
Message-ID: <20210928062311.4012070-6-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20210928062311.4012070-1-ruansy.fnst@fujitsu.com>
Punch hole on a reflinked file needs dax_iomap_cow_copy() too.
Otherwise, data in not aligned area will be not correct. So, add the
CoW operation for not aligned case in dax_iomap_zero().
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
fs/dax.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index debe459680f2..5379de8ad0c7 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1212,6 +1212,7 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,
s64 dax_iomap_zero(const struct iomap_iter *iter, loff_t pos, u64 length)
{
const struct iomap *iomap = &iter->iomap;
+ const struct iomap *srcmap = &iter->srcmap;
sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
pgoff_t pgoff;
long rc, id;
@@ -1230,21 +1231,27 @@ s64 dax_iomap_zero(const struct iomap_iter *iter, loff_t pos, u64 length)
id = dax_read_lock();
- if (page_aligned)
+ if (page_aligned) {
rc = dax_zero_page_range(iomap->dax_dev, pgoff, 1);
- else
- rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
- if (rc < 0) {
- dax_read_unlock(id);
- return rc;
+ goto out;
}
- if (!page_aligned) {
- memset(kaddr + offset, 0, size);
+ rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
+ if (rc < 0)
+ goto out;
+ memset(kaddr + offset, 0, size);
+ if (srcmap->addr != IOMAP_HOLE && srcmap->addr != iomap->addr) {
+ rc = dax_iomap_cow_copy(pos, size, PAGE_SIZE, srcmap,
+ kaddr);
+ if (rc < 0)
+ goto out;
+ dax_flush(iomap->dax_dev, kaddr, PAGE_SIZE);
+ } else
dax_flush(iomap->dax_dev, kaddr + offset, size);
- }
+
+out:
dax_read_unlock(id);
- return size;
+ return rc < 0 ? rc : size;
}
static loff_t dax_iomap_iter(const struct iomap_iter *iomi,
--
2.33.0
next prev parent reply other threads:[~2021-09-28 6:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 6:23 [PATCH v10 0/8] fsdax,xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-09-28 6:23 ` [PATCH v10 1/8] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2021-09-28 6:23 ` [PATCH v10 2/8] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2021-09-28 6:23 ` [PATCH v10 3/8] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-09-28 6:23 ` [PATCH v10 4/8] fsdax: Convert dax_iomap_zero to iter model Shiyang Ruan
2021-09-28 6:23 ` Shiyang Ruan [this message]
2021-09-28 6:23 ` [PATCH v10 6/8] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-09-28 6:23 ` [PATCH v10 7/8] xfs: support CoW in fsdax mode Shiyang Ruan
2021-10-14 17:06 ` Darrick J. Wong
2021-10-14 17:50 ` Dan Williams
2021-10-18 4:36 ` Christoph Hellwig
2021-09-28 6:23 ` [PATCH v10 8/8] xfs: Add dax dedupe support Shiyang Ruan
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=20210928062311.4012070-6-ruansy.fnst@fujitsu.com \
--to=ruansy.fnst@fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=rgoldwyn@suse.de \
--cc=riteshh@linux.ibm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).