All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <linux-kernel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,
	<nvdimm@lists.linux.dev>, <linux-mm@kvack.org>,
	<linux-fsdevel@vger.kernel.org>
Cc: <djwong@kernel.org>, <dan.j.williams@intel.com>,
	<david@fromorbit.com>, <hch@infradead.org>, <jane.chu@oracle.com>,
	<rgoldwyn@suse.de>, <viro@zeniv.linux.org.uk>,
	<willy@infradead.org>, <naoya.horiguchi@nec.com>,
	<linmiaohe@huawei.com>, Ritesh Harjani <riteshh@linux.ibm.com>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH v11 04/07] fsdax: Add dax_iomap_cow_copy() for dax zero
Date: Sun, 8 May 2022 22:36:17 +0800	[thread overview]
Message-ID: <20220508143620.1775214-12-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20220508143620.1775214-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_memzero().

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>

==
This patch changed a lot when rebasing to next-20220504 branch.  Though it
has been tested by myself, I think it needs a re-review.
==
---
 fs/dax.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/fs/dax.c b/fs/dax.c
index 78e26204697b..b3aa863e9fec 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1220,17 +1220,27 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,
 }
 #endif /* CONFIG_FS_DAX_PMD */
 
-static int dax_memzero(struct dax_device *dax_dev, pgoff_t pgoff,
-		unsigned int offset, size_t size)
+static int dax_memzero(struct iomap_iter *iter, loff_t pos, size_t size)
 {
+	const struct iomap *iomap = &iter->iomap;
+	const struct iomap *srcmap = iomap_iter_srcmap(iter);
+	unsigned offset = offset_in_page(pos);
+	pgoff_t pgoff = dax_iomap_pgoff(iomap, pos);
 	void *kaddr;
 	long ret;
 
-	ret = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL);
-	if (ret > 0) {
-		memset(kaddr + offset, 0, size);
-		dax_flush(dax_dev, kaddr + offset, size);
-	}
+	ret = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
+	if (ret < 0)
+		return ret;
+	memset(kaddr + offset, 0, size);
+	if (srcmap->addr != iomap->addr) {
+		ret = dax_iomap_cow_copy(pos, size, PAGE_SIZE, srcmap,
+					 kaddr);
+		if (ret < 0)
+			return ret;
+		dax_flush(iomap->dax_dev, kaddr, PAGE_SIZE);
+	} else
+		dax_flush(iomap->dax_dev, kaddr + offset, size);
 	return ret;
 }
 
@@ -1257,7 +1267,7 @@ static s64 dax_zero_iter(struct iomap_iter *iter, bool *did_zero)
 		if (IS_ALIGNED(pos, PAGE_SIZE) && size == PAGE_SIZE)
 			rc = dax_zero_page_range(iomap->dax_dev, pgoff, 1);
 		else
-			rc = dax_memzero(iomap->dax_dev, pgoff, offset, size);
+			rc = dax_memzero(iter, pos, size);
 		dax_read_unlock(id);
 
 		if (rc < 0)
-- 
2.35.1




  parent reply	other threads:[~2022-05-08 14:37 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-08 14:36 [PATCHSETS] v14 fsdax-rmap + v11 fsdax-reflink Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 01/07] dax: Introduce holder for dax_device Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 02/07] mm: factor helpers for memory_failure_dev_pagemap Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 03/07] pagemap,pmem: Introduce ->memory_failure() Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 04/07] fsdax: Introduce dax_lock_mapping_entry() Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 05/07] mm: Introduce mf_dax_kill_procs() for fsdax case Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 06/07] xfs: Implement ->notify_failure() for XFS Shiyang Ruan
2022-05-08 14:36 ` [PATCH v14 07/07] fsdax: set a CoW flag when associate reflink mappings Shiyang Ruan
2022-05-08 14:36 ` [PATCH v11 01/07] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2022-05-08 14:36 ` [PATCH v11 02/07] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2022-05-08 14:36 ` [PATCH v11 03/07] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2022-05-08 14:36 ` Shiyang Ruan [this message]
2022-05-08 14:36 ` [PATCH v11 05/07] fsdax: Dedup file range to use a compare function Shiyang Ruan
2022-05-08 14:36 ` [PATCH v11 06/07] xfs: support CoW in fsdax mode Shiyang Ruan
2022-05-10  5:45   ` Christoph Hellwig
2022-05-10 10:06     ` Shiyang Ruan
2022-05-11  2:25   ` [PATCH v11.1 " Shiyang Ruan
2022-05-08 14:36 ` [PATCH v11 07/07] xfs: Add dax dedupe support Shiyang Ruan
2022-05-10  9:32 ` [PATCHSETS] v14 fsdax-rmap + v11 fsdax-reflink Christoph Hellwig
2022-05-11  0:03 ` Darrick J. Wong
2022-05-11  1:48   ` Dave Chinner
2022-05-11  1:55     ` Dan Williams
2022-05-11  2:19       ` Dave Chinner
2022-05-11  2:28       ` Andrew Morton
2022-05-11  2:43         ` Darrick J. Wong
2022-05-11  5:24           ` Andrew Morton
2022-05-11  6:21             ` Dave Chinner
2022-05-11 15:19             ` Darrick J. Wong
2022-05-11 15:46               ` Dan Williams
2022-05-12 12:27                 ` Shiyang Ruan
2022-06-02  9:42                   ` Shiyang Ruan
2022-06-02 17:18                     ` Darrick J. Wong
2022-06-02 17:47                       ` Andrew Morton
2022-05-11  4:20         ` Dan Williams
2022-05-11  4:34           ` Darrick J. Wong
2022-06-02 18:56 ` Andrew Morton
2022-06-03  1:07   ` Shiyang Ruan
2022-06-03  1:36     ` 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=20220508143620.1775214-12-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@infradead.org \
    --cc=hch@lst.de \
    --cc=jane.chu@oracle.com \
    --cc=linmiaohe@huawei.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=naoya.horiguchi@nec.com \
    --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 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.