From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE0CEC43461 for ; Thu, 8 Apr 2021 13:25:18 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E546861107 for ; Thu, 8 Apr 2021 13:25:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E546861107 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=damenly.su Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 68120100EB35A; Thu, 8 Apr 2021 06:25:17 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=195.216.236.81; helo=eu-shark1.inbox.eu; envelope-from=l@damenly.su; receiver= Received: from eu-shark1.inbox.eu (eu-shark1.inbox.eu [195.216.236.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2ADC7100ED49C for ; Thu, 8 Apr 2021 06:25:14 -0700 (PDT) Received: from eu-shark1.inbox.eu (localhost [127.0.0.1]) by eu-shark1-out.inbox.eu (Postfix) with ESMTP id F11186C01C6B; Thu, 8 Apr 2021 16:25:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=inbox.eu; s=20140211; t=1617888312; bh=O2I5sRbsIGV6O7BRd81yBLGFZqvG4P4JnLPd6Ijeamg=; h=References:From:To:Cc:Subject:Date:In-reply-to; b=WkugiplNaH4XCk6aVA2NznlBO0dCN+YN9BvN6Gu6tVb82IwiLGdY52NbzbrWikL7Z nCn0ilSVtp6zVFqvcs6Hpt8z2FH1YBq0Fi9rCyXinFjhMesdZt48iFUC7pZlU+qFmu /88sp16IKcOmTz+87ZCDc01atwu64Y7Q2CCLpEBc= Received: from localhost (localhost [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id E1F6B6C01C68; Thu, 8 Apr 2021 16:25:11 +0300 (EEST) Received: from eu-shark1.inbox.eu ([127.0.0.1]) by localhost (eu-shark1.inbox.eu [127.0.0.1]) (spamfilter, port 35) with ESMTP id cWmb_CTFk_k9; Thu, 8 Apr 2021 16:25:11 +0300 (EEST) Received: from mail.inbox.eu (eu-pop1 [127.0.0.1]) by eu-shark1-in.inbox.eu (Postfix) with ESMTP id 571956C019FD; Thu, 8 Apr 2021 16:25:11 +0300 (EEST) Received: from nas (unknown [45.87.95.33]) (Authenticated sender: l@damenly.su) by mail.inbox.eu (Postfix) with ESMTPA id 4E5D91BE2271; Thu, 8 Apr 2021 16:25:02 +0300 (EEST) References: <20210408120432.1063608-1-ruansy.fnst@fujitsu.com> <20210408120432.1063608-8-ruansy.fnst@fujitsu.com> User-agent: mu4e 1.5.8; emacs 27.2 From: Su Yue To: Shiyang Ruan Subject: Re: [PATCH v4 7/7] fs/xfs: Add dedupe support for fsdax Date: Thu, 08 Apr 2021 21:12:00 +0800 Message-ID: In-reply-to: <20210408120432.1063608-8-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 X-Virus-Scanned: OK X-ESPOL: 6N1mlY5SaUCpygHhXxmqCAcxrytLVO7k/+GmqX1UmH7kOSmad00TUxOr7h97Nxyk Message-ID-Hash: QGUORFW2X6R5KTA6W6CO2UYMIBBO5ZAJ X-Message-ID-Hash: QGUORFW2X6R5KTA6W6CO2UYMIBBO5ZAJ X-MailFrom: l@damenly.su X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org, darrick.wong@oracle.com, willy@infradead.org, jack@suse.cz, viro@zeniv.linux.org.uk, linux-btrfs@vger.kernel.org, david@fromorbit.com, hch@lst.de, rgoldwyn@suse.de X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: 7bit Content-Type: text/plain; format="flowed"; charset="us-ascii" On Thu 08 Apr 2021 at 20:04, Shiyang Ruan wrote: > Add xfs_break_two_dax_layouts() to break layout for tow dax > files. Then > call compare range function only when files are both DAX or not. > > Signed-off-by: Shiyang Ruan > Not family with xfs code but reading code make my sleep better :) See bellow. > --- > fs/xfs/xfs_file.c | 20 ++++++++++++++++++++ > fs/xfs/xfs_inode.c | 8 +++++++- > fs/xfs/xfs_inode.h | 1 + > fs/xfs/xfs_reflink.c | 5 +++-- > 4 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 5795d5d6f869..1fd457167c12 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -842,6 +842,26 @@ xfs_break_dax_layouts( > 0, 0, xfs_wait_dax_page(inode)); > } > > +int > +xfs_break_two_dax_layouts( > + struct inode *src, > + struct inode *dest) > +{ > + int error; > + bool retry = false; > + > +retry: > 'retry = false;' ? since xfs_break_dax_layouts() won't set retry to false if there is no busy page in inode->i_mapping. Dead loop will happen if retry is true once. > + error = xfs_break_dax_layouts(src, &retry); > + if (error || retry) > + goto retry; > + > + error = xfs_break_dax_layouts(dest, &retry); > + if (error || retry) > + goto retry; > + > + return error; > +} > + > int > xfs_break_layouts( > struct inode *inode, > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index f93370bd7b1e..c01786917eef 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -3713,8 +3713,10 @@ xfs_ilock2_io_mmap( > struct xfs_inode *ip2) > { > int ret; > + struct inode *inode1 = VFS_I(ip1); > + struct inode *inode2 = VFS_I(ip2); > > - ret = xfs_iolock_two_inodes_and_break_layout(VFS_I(ip1), > VFS_I(ip2)); > + ret = xfs_iolock_two_inodes_and_break_layout(inode1, inode2); > if (ret) > return ret; > if (ip1 == ip2) > @@ -3722,6 +3724,10 @@ xfs_ilock2_io_mmap( > else > xfs_lock_two_inodes(ip1, XFS_MMAPLOCK_EXCL, > ip2, XFS_MMAPLOCK_EXCL); > + > + if (IS_DAX(inode1) && IS_DAX(inode2)) > + ret = xfs_break_two_dax_layouts(inode1, inode2); > + ret is ignored here. -- Su > return 0; > } > > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h > index 88ee4c3930ae..5ef21924dddc 100644 > --- a/fs/xfs/xfs_inode.h > +++ b/fs/xfs/xfs_inode.h > @@ -435,6 +435,7 @@ enum xfs_prealloc_flags { > > int xfs_update_prealloc_flags(struct xfs_inode *ip, > enum xfs_prealloc_flags flags); > +int xfs_break_two_dax_layouts(struct inode *inode1, struct > inode *inode2); > int xfs_break_layouts(struct inode *inode, uint *iolock, > enum layout_break_reason reason); > > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index a4cd6e8a7aa0..4426bcc8a985 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -29,6 +29,7 @@ > #include "xfs_iomap.h" > #include "xfs_sb.h" > #include "xfs_ag_resv.h" > +#include > > /* > * Copy on Write of Shared Blocks > @@ -1324,8 +1325,8 @@ xfs_reflink_remap_prep( > if (XFS_IS_REALTIME_INODE(src) || XFS_IS_REALTIME_INODE(dest)) > goto out_unlock; > > - /* Don't share DAX file data for now. */ > - if (IS_DAX(inode_in) || IS_DAX(inode_out)) > + /* Don't share DAX file data with non-DAX file. */ > + if (IS_DAX(inode_in) != IS_DAX(inode_out)) > goto out_unlock; > > if (!IS_DAX(inode_in)) _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org