From: Ruan Shiyang <ruansy.fnst@cn.fujitsu.com>
To: <dsterba@suse.cz>, <linux-kernel@vger.kernel.org>,
<linux-xfs@vger.kernel.org>, <linux-nvdimm@lists.01.org>,
<linux-fsdevel@vger.kernel.org>, <darrick.wong@oracle.com>,
<dan.j.williams@intel.com>, <willy@infradead.org>, <jack@suse.cz>,
<viro@zeniv.linux.org.uk>, <linux-btrfs@vger.kernel.org>,
<ocfs2-devel@oss.oracle.com>, <david@fromorbit.com>, <hch@lst.de>,
<rgoldwyn@suse.de>, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: Re: [Ocfs2-devel] [PATCH 4/7] fsdax: Replace mmap entry in case of CoW
Date: Wed, 17 Feb 2021 11:06:55 +0800 [thread overview]
Message-ID: <4e9a79ed-aa99-c57b-6098-f55ef28cc535@cn.fujitsu.com> (raw)
In-Reply-To: <20210216131154.GN1993@twin.jikos.cz>
On 2021/2/16 下午9:11, David Sterba wrote:
> On Mon, Feb 08, 2021 at 01:09:21AM +0800, Shiyang Ruan wrote:
>> We replace the existing entry to the newly allocated one
>> in case of CoW. Also, we mark the entry as PAGECACHE_TAG_TOWRITE
>> so writeback marks this entry as writeprotected. This
>> helps us snapshots so new write pagefaults after snapshots
>> trigger a CoW.
>>
>> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
>> Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
>> ---
>> fs/dax.c | 31 +++++++++++++++++++++++--------
>> 1 file changed, 23 insertions(+), 8 deletions(-)
>>
>> diff --git a/fs/dax.c b/fs/dax.c
>> index b2195cbdf2dc..29698a3d2e37 100644
>> --- a/fs/dax.c
>> +++ b/fs/dax.c
>> @@ -722,6 +722,9 @@ static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_d
>> return 0;
>> }
>>
>> +#define DAX_IF_DIRTY (1ULL << 0)
>> +#define DAX_IF_COW (1ULL << 1)
>
> The constants are ULL, but I see other flags only 'unsigned long'
>
>> +
>> /*
>> * By this point grab_mapping_entry() has ensured that we have a locked entry
>> * of the appropriate size so we don't have to worry about downgrading PMDs to
>> @@ -731,14 +734,16 @@ static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_d
>> */
>> static void *dax_insert_entry(struct xa_state *xas,
>> struct address_space *mapping, struct vm_fault *vmf,
>> - void *entry, pfn_t pfn, unsigned long flags, bool dirty)
>> + void *entry, pfn_t pfn, unsigned long flags, bool insert_flags)
>
> insert_flags is bool
>
>> {
>> void *new_entry = dax_make_entry(pfn, flags);
>> + bool dirty = insert_flags & DAX_IF_DIRTY;
>
> "insert_flags & DAX_IF_DIRTY" is "bool & ULL", this can't be right
This is a mistake caused by rebasing my old version patchset. Thanks
for pointing out. I'll fix this in next version.
>
>> + bool cow = insert_flags & DAX_IF_COW;
>
> Same
>
>>
>> if (dirty)
>> __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
>>
>> - if (dax_is_zero_entry(entry) && !(flags & DAX_ZERO_PAGE)) {
>> + if (cow || (dax_is_zero_entry(entry) && !(flags & DAX_ZERO_PAGE))) {
>> unsigned long index = xas->xa_index;
>> /* we are replacing a zero page with block mapping */
>> if (dax_is_pmd_entry(entry))
>> @@ -750,7 +755,7 @@ static void *dax_insert_entry(struct xa_state *xas,
>>
>> xas_reset(xas);
>> xas_lock_irq(xas);
>> - if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry)) {
>> + if (cow || dax_is_zero_entry(entry) || dax_is_empty_entry(entry)) {
>> void *old;
>>
>> dax_disassociate_entry(entry, mapping, false);
>> @@ -774,6 +779,9 @@ static void *dax_insert_entry(struct xa_state *xas,
>> if (dirty)
>> xas_set_mark(xas, PAGECACHE_TAG_DIRTY);
>>
>> + if (cow)
>> + xas_set_mark(xas, PAGECACHE_TAG_TOWRITE);
>> +
>> xas_unlock_irq(xas);
>> return entry;
>> }
>> @@ -1319,6 +1327,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
>> void *entry;
>> pfn_t pfn;
>> void *kaddr;
>> + unsigned long insert_flags = 0;
>>
>> trace_dax_pte_fault(inode, vmf, ret);
>> /*
>> @@ -1444,8 +1453,10 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
>>
>> goto finish_iomap;
>> case IOMAP_UNWRITTEN:
>> - if (write && iomap.flags & IOMAP_F_SHARED)
>> + if (write && (iomap.flags & IOMAP_F_SHARED)) {
>> + insert_flags |= DAX_IF_COW;
>
> Here's an example of 'unsigned long = unsigned long long', though it'll
> work, it would be better to unify all the types.
Yes, I'll fix it.
--
Thanks,
Ruan Shiyang.
>
>> goto cow;
>> + }
>> fallthrough;
>> case IOMAP_HOLE:
>> if (!write) {
>> @@ -1555,6 +1566,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
>> int error;
>> pfn_t pfn;
>> void *kaddr;
>> + unsigned long insert_flags = 0;
>>
>> /*
>> * Check whether offset isn't beyond end of file now. Caller is
>> @@ -1670,14 +1682,17 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
>> result = vmf_insert_pfn_pmd(vmf, pfn, write);
>> break;
>> case IOMAP_UNWRITTEN:
>> - if (write && iomap.flags & IOMAP_F_SHARED)
>> + if (write && (iomap.flags & IOMAP_F_SHARED)) {
>> + insert_flags |= DAX_IF_COW;
>> goto cow;
>> + }
>> fallthrough;
>> case IOMAP_HOLE:
>> - if (WARN_ON_ONCE(write))
>> + if (!write) {
>> + result = dax_pmd_load_hole(&xas, vmf, &iomap, &entry);
>> break;
>> - result = dax_pmd_load_hole(&xas, vmf, &iomap, &entry);
>> - break;
>> + }
>> + fallthrough;
>> default:
>> WARN_ON_ONCE(1);
>> break;
>> --
>> 2.30.0
>>
>>
>
>
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
next prev parent reply other threads:[~2021-02-17 3:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 17:09 [Ocfs2-devel] [PATCH 0/7] fsdax, xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 1/7] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2021-02-08 15:11 ` Christoph Hellwig
2021-02-22 7:44 ` Xiaoguang Wang
2021-02-23 1:32 ` [Ocfs2-devel] 回复: " ruansy.fnst
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 2/7] fsdax: Introduce dax_copy_edges() for CoW Shiyang Ruan
2021-02-08 15:11 ` Christoph Hellwig
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 3/7] fsdax: Copy data before write Shiyang Ruan
2021-02-08 15:14 ` Christoph Hellwig
2021-02-09 1:53 ` Ruan Shiyang
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 4/7] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-02-08 15:16 ` Christoph Hellwig
2021-02-16 13:11 ` David Sterba
2021-02-17 3:06 ` Ruan Shiyang [this message]
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 5/7] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-02-08 15:19 ` Christoph Hellwig
2021-02-09 9:15 ` Ruan Shiyang
2021-02-09 9:34 ` Christoph Hellwig
2021-02-09 9:46 ` Ruan Shiyang
2021-02-10 13:19 ` Christoph Hellwig
2021-02-17 3:24 ` Ruan Shiyang
2021-02-18 16:20 ` Darrick J. Wong
2021-02-25 7:35 ` Christoph Hellwig
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 6/7] fs/xfs: Handle CoW for fsdax write() path Shiyang Ruan
2021-02-08 15:24 ` Christoph Hellwig
2021-02-07 17:09 ` [Ocfs2-devel] [PATCH 7/7] fs/xfs: Add dedupe support for fsdax Shiyang Ruan
2021-02-08 15:39 ` [Ocfs2-devel] [PATCH 0/7] fsdax, xfs: Add reflink&dedupe " Jan Kara
2021-02-09 1:50 ` Ruan Shiyang
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=4e9a79ed-aa99-c57b-6098-f55ef28cc535@cn.fujitsu.com \
--to=ruansy.fnst@cn.fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=dsterba@suse.cz \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--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=ocfs2-devel@oss.oracle.com \
--cc=rgoldwyn@suse.com \
--cc=rgoldwyn@suse.de \
--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).