linux-nvdimm.lists.01.org archive mirror
 help / color / mirror / Atom feed
From: "ruansy.fnst@fujitsu.com" <ruansy.fnst@fujitsu.com>
To: "Mika Penttilä" <mika.penttila@nextfour.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-xfs@vger.kernel.org" <linux-xfs@vger.kernel.org>,
	"linux-nvdimm@lists.01.org" <linux-nvdimm@lists.01.org>,
	"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
Cc: "darrick.wong@oracle.com" <darrick.wong@oracle.com>,
	"willy@infradead.org" <willy@infradead.org>,
	"viro@zeniv.linux.org.uk" <viro@zeniv.linux.org.uk>,
	"david@fromorbit.com" <david@fromorbit.com>,
	"hch@lst.de" <hch@lst.de>, "rgoldwyn@suse.de" <rgoldwyn@suse.de>
Subject: RE: [PATCH v5 3/7] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero
Date: Thu, 13 May 2021 07:48:46 +0000	[thread overview]
Message-ID: <OSBPR01MB2920731784E0804AD7BB0DA8F4519@OSBPR01MB2920.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <4c944ccc-7708-5dbd-18c3-9ecb5c3a539f@nextfour.com>

> -----Original Message-----
> From: Mika Penttilä <mika.penttila@nextfour.com>
> Subject: Re: [PATCH v5 3/7] fsdax: Add dax_iomap_cow_copy() for
> dax_iomap_zero
> 
> Hi,
> 
> On 11.5.2021 6.09, Shiyang Ruan wrote:
> > Punch hole on a reflinked file needs dax_copy_edge() too.  Otherwise,
> > data in not aligned area will be not correct.  So, add the srcmap to
> > dax_iomap_zero() and replace memset() as dax_copy_edge().
> >
> > Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> > Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
> > ---
> >   fs/dax.c               | 25 +++++++++++++++----------
> >   fs/iomap/buffered-io.c |  2 +-
> >   include/linux/dax.h    |  3 ++-
> >   3 files changed, 18 insertions(+), 12 deletions(-)
> >
> > diff --git a/fs/dax.c b/fs/dax.c
> > index ef0e564e7904..ee9d28a79bfb 100644
> > --- a/fs/dax.c
> > +++ b/fs/dax.c
> > @@ -1186,7 +1186,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, struct iomap *iomap,
> > +		struct iomap *srcmap)
> >   {
> >   	sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
> >   	pgoff_t pgoff;
> > @@ -1208,19 +1209,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(offset, size, PAGE_SIZE, srcmap,
> > +						kaddr);
> 
> offset above is offset in page, think dax_iomap_cow_copy() expects absolute pos

You are right.  Should pass pos here.  Thanks for pointing out.


--
Thanks,
Ruan Shiyang.

> 
> > +			if (rc < 0)
> > +				goto out;
> > +		} else
> > +			memset(kaddr + offset, 0, size);
> >   		dax_flush(iomap->dax_dev, kaddr + offset, size);
> >   	}
> > +
> > +out:
> >   	dax_read_unlock(id);
> > -	return size;
> > +	return rc < 0 ? rc : size;
> >   }
> >
> >   static loff_t
> > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index
> > f2cd2034a87b..2734955ea67f 100644
> > --- a/fs/iomap/buffered-io.c
> > +++ b/fs/iomap/buffered-io.c
> > @@ -933,7 +933,7 @@ static loff_t iomap_zero_range_actor(struct inode
> *inode, loff_t pos,
> >   		s64 bytes;
> >
> >   		if (IS_DAX(inode))
> > -			bytes = dax_iomap_zero(pos, length, iomap);
> > +			bytes = dax_iomap_zero(pos, length, iomap, srcmap);
> >   		else
> >   			bytes = iomap_zero(inode, pos, length, iomap, srcmap);
> >   		if (bytes < 0)
> > diff --git a/include/linux/dax.h b/include/linux/dax.h index
> > b52f084aa643..3275e01ed33d 100644
> > --- a/include/linux/dax.h
> > +++ b/include/linux/dax.h
> > @@ -237,7 +237,8 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault
> *vmf,
> >   int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t
> index);
> >   int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
> >   				      pgoff_t index);
> > -s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap);
> > +s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap,
> > +		struct iomap *srcmap);
> >   static inline bool dax_mapping(struct address_space *mapping)
> >   {
> >   	return mapping->host && IS_DAX(mapping->host);

_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

  reply	other threads:[~2021-05-13  7:49 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-11  3:09 [PATCH v5 0/7] fsdax,xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-05-11  3:09 ` [PATCH v5 1/7] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2021-05-12  1:08   ` Darrick J. Wong
2021-05-13  7:57     ` ruansy.fnst
2021-05-13 15:02       ` Darrick J. Wong
2021-05-11  3:09 ` [PATCH v5 2/7] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-05-12  1:09   ` Darrick J. Wong
2021-05-11  3:09 ` [PATCH v5 3/7] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero Shiyang Ruan
2021-05-12  1:17   ` Darrick J. Wong
2021-05-12  1:37     ` ruansy.fnst
2021-05-12  2:27   ` Mika Penttilä
2021-05-13  7:48     ` ruansy.fnst [this message]
2021-05-11  3:09 ` [PATCH v5 4/7] iomap: Introduce iomap_apply2() for operations on two files Shiyang Ruan
2021-05-11  3:09 ` [PATCH v5 5/7] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-05-12  1:23   ` Darrick J. Wong
2021-05-14  8:35     ` ruansy.fnst
2021-05-14 16:03       ` Darrick J. Wong
2021-05-11  3:09 ` [PATCH v5 6/7] fs/xfs: Handle CoW for fsdax write() path Shiyang Ruan
2021-05-12  1:30   ` Darrick J. Wong
2021-05-11  3:09 ` [PATCH v5 7/7] fs/xfs: Add dax dedupe support Shiyang Ruan
2021-05-12  1:04   ` Darrick J. Wong
2021-05-12  1:26     ` ruansy.fnst
2021-05-11  3:57 ` [PATCH v5 0/7] fsdax,xfs: Add reflink&dedupe support for fsdax Darrick J. Wong
2021-05-11  5:53   ` ruansy.fnst

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=OSBPR01MB2920731784E0804AD7BB0DA8F4519@OSBPR01MB2920.jpnprd01.prod.outlook.com \
    --to=ruansy.fnst@fujitsu.com \
    --cc=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=mika.penttila@nextfour.com \
    --cc=rgoldwyn@suse.de \
    --cc=viro@zeniv.linux.org.uk \
    --cc=willy@infradead.org \
    --subject='RE: [PATCH v5 3/7] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero' \
    /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

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).