From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: "Darrick J. Wong" <djwong@kernel.org>,
Christoph Hellwig <hch@lst.de>,
linux-xfs <linux-xfs@vger.kernel.org>,
david <david@fromorbit.com>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux NVDIMM <nvdimm@lists.linux.dev>,
Goldwyn Rodrigues <rgoldwyn@suse.de>,
Al Viro <viro@zeniv.linux.org.uk>,
Matthew Wilcox <willy@infradead.org>,
Ritesh Harjani <riteshh@linux.ibm.com>
Subject: Re: [PATCH v7 4/8] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero
Date: Fri, 27 Aug 2021 11:23:47 +0800 [thread overview]
Message-ID: <6ac5dda5-9681-6b6f-7a84-55215578f0c3@fujitsu.com> (raw)
In-Reply-To: <CAPcyv4gFDyXqu5NyrWQ9Y_JqjLmCb8pWQgPZVBYE=dOir2KdzA@mail.gmail.com>
On 2021/8/20 10:39, Dan Williams wrote:
> On Sun, Aug 15, 2021 at 11:04 PM Shiyang Ruan <ruansy.fnst@fujitsu.com> wrote:
>>
>> 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
>> srcmap to dax_iomap_zero() and replace memset() as dax_iomap_cow_copy().
>>
>> 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>
>> ---
>> fs/dax.c | 25 +++++++++++++++----------
>> fs/iomap/buffered-io.c | 4 ++--
>> include/linux/dax.h | 3 ++-
>> 3 files changed, 19 insertions(+), 13 deletions(-)
>>
>> diff --git a/fs/dax.c b/fs/dax.c
>> index e49ba68cc7e4..91ceb518f66a 100644
>> --- a/fs/dax.c
>> +++ b/fs/dax.c
>> @@ -1198,7 +1198,8 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf,
>> }
>> #endif /* CONFIG_FS_DAX_PMD */
>>
>> -s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap)
>> +s64 dax_iomap_zero(loff_t pos, u64 length, const struct iomap *iomap,
>> + const struct iomap *srcmap)
>> {
>> sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
>> pgoff_t pgoff;
>> @@ -1220,19 +1221,23 @@ s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap)
>>
>> if (page_aligned)
>> rc = dax_zero_page_range(iomap->dax_dev, pgoff, 1);
>> - else
>> + else {
>> rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
>> - if (rc < 0) {
>> - dax_read_unlock(id);
>> - return rc;
>> - }
>> -
>> - if (!page_aligned) {
>> - memset(kaddr + offset, 0, size);
>> + if (rc < 0)
>> + goto out;
>> + if (iomap->addr != srcmap->addr) {
>> + rc = dax_iomap_cow_copy(pos, size, PAGE_SIZE, srcmap,
>> + kaddr);
>
> Apologies, I'm confused, why is it ok to skip zeroing here?
>
That was a mistake. Will be fixed in next version.
--
Thanks,
Ruan.
next prev parent reply other threads:[~2021-08-27 3:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 6:03 [PATCH v7 0/8] fsdax,xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 1/8] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2021-08-18 21:01 ` Dan Williams
2021-08-16 6:03 ` [PATCH v7 2/8] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2021-08-19 22:35 ` Dan Williams
2021-08-16 6:03 ` [PATCH v7 3/8] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-08-19 22:54 ` Dan Williams
2021-08-23 12:57 ` Christoph Hellwig
2021-08-27 3:22 ` Shiyang Ruan
2021-08-27 5:00 ` Dan Williams
2021-08-27 5:26 ` Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 4/8] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero Shiyang Ruan
2021-08-20 2:39 ` Dan Williams
2021-08-27 3:23 ` Shiyang Ruan [this message]
2021-08-16 6:03 ` [PATCH v7 5/8] iomap: Introduce iomap_iter2 for two files Shiyang Ruan
2021-08-23 12:58 ` Christoph Hellwig
2021-08-16 6:03 ` [PATCH v7 6/8] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-08-23 13:16 ` Christoph Hellwig
2021-08-16 6:03 ` [PATCH v7 7/8] fsdax: Introduce dax_iomap_ops for end of reflink Shiyang Ruan
2021-08-20 3:01 ` Dan Williams
[not found] ` <c7e68dc8-5a43-f727-c262-58dcf244c711@fujitsu.com>
2021-08-20 15:18 ` Dan Williams
2021-08-23 13:02 ` Christoph Hellwig
2021-08-27 3:29 ` Shiyang Ruan
2021-08-27 5:04 ` Dan Williams
2021-08-27 5:27 ` Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 8/8] fs/xfs: Add dax dedupe support Shiyang Ruan
2021-08-20 3:08 ` Dan Williams
2021-08-27 3: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=6ac5dda5-9681-6b6f-7a84-55215578f0c3@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).