Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1041886pxf; Thu, 18 Mar 2021 19:04:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysZxRy5vIVNq9EkNVseeuxvCJG2t21lZfGttSHDrwtkfaUhGzYREk5J2umyMzB8rU3kiXZ X-Received: by 2002:a17:906:f88a:: with SMTP id lg10mr1778219ejb.39.1616119495988; Thu, 18 Mar 2021 19:04:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616119495; cv=none; d=google.com; s=arc-20160816; b=SWHH94Z8GgWS+vMPeYEwQFLonAMcpJQhSSVhgKBBChvFeV7MzSJ8MowAQOiPjbZlR8 X7x4sQaB/n63QY7jK3kor3n3wiZdXM5SUjG58933NtoVuJU1lvgnFTTyTse5WRejXYXP hoEBIzvWLKYNNCZapgHdSBGiTdTElJ50I4jg/Q4D1/GmQdJTaYyIjMVpcHRhsLpbZRcr uDK29gZMgGP4NG63Ao22vo4wR6F0iiwBzHeouA2k8r37DaBfJOZoNJkxDC94N7+uwXmT oiu9/jzjnrbzVQnsx4qpp0lsPR6DGmavD2Tx8xvW8WO2oDD0FKzesGNjulBIWo09TJRG P6Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-hdrordr; bh=xEwzj3NxWB1lWgYkiRlSEUllTGVe2VmoFiDrT0vGmbw=; b=y41Q1+XbWXL1XFDGCCy5jKBRKDEBeFgOS1Rg6bSgrO2XDChzxbpz6aTw/zl6FoU6Aw +UmmPjL6UVsaUFBbTwqc1lbhoHvvFk0H4cj0utcF2lU+kBfBEElf11fMF/55SRxTmPh2 SMJwY4msFvtzxGH6C7qxy+saVnNdWAJYJ5Ff5gYwRBLCyyE4C5hlo12b7To1ktEc8tBV Aw0L67BHcu8nF+BjoyUCzuG9EBzfE1n0sdPFJ1LNLqj3bevjswMcNExzhAeqs0XHDbKg 8RFmdIcF0RpJUoNR2H9z2pYpmOMi+I0vOEgmmT+ZI8S1EpuARSnTPZL0a/iH1ivco4IG rzyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hq38si2837495ejc.350.2021.03.18.19.04.33; Thu, 18 Mar 2021 19:04:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231425AbhCSByK (ORCPT + 99 others); Thu, 18 Mar 2021 21:54:10 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:41531 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233206AbhCSBxw (ORCPT ); Thu, 18 Mar 2021 21:53:52 -0400 IronPort-HdrOrdr: =?us-ascii?q?A9a23=3A9ZhpB6iJvsmtHmbHsKShAWs1jHBQXjoji2hD?= =?us-ascii?q?6mlwRA09T+WzkceykPMHkSLlkTp5YgBFpfmsGomlBUnd+5l8/JULMd6ZMTXOlW?= =?us-ascii?q?O0IOhZg7fK7DHtFib3/OwY9YoIScJDIfLqC1wSt6fHyS2ZN/pl/9Wd6qCvgo7l?= =?us-ascii?q?vhJQZCVncbtp4Qs8KivzKDwUeCB8CZA0FIWR66N8zlLORV0scs+5CnMZNtKzxe?= =?us-ascii?q?HjqZSOW347Li9iwAyPoBft07TiDiWfty10bxp/hZsk7kjJ+jaU2pme?= X-IronPort-AV: E=Sophos;i="5.81,259,1610380800"; d="scan'208";a="105876746" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 19 Mar 2021 09:53:50 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id 9903D4CEA871; Fri, 19 Mar 2021 09:53:44 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Mar 2021 09:53:44 +0800 Received: from irides.mr.mr.mr (10.167.225.141) by G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 19 Mar 2021 09:53:44 +0800 From: Shiyang Ruan To: , , , CC: , , , , , , , , , Subject: [PATCH v3 10/10] fs/xfs: Add dedupe support for fsdax Date: Fri, 19 Mar 2021 09:52:37 +0800 Message-ID: <20210319015237.993880-11-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210319015237.993880-1-ruansy.fnst@fujitsu.com> References: <20210319015237.993880-1-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-yoursite-MailScanner-ID: 9903D4CEA871.A1D44 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@fujitsu.com X-Spam-Status: No Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 1987d15eab61..82467d08e3ce 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -784,6 +784,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: + 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 b7352bc4c815..c11b11e59a83 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3651,8 +3651,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) @@ -3660,6 +3662,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); + return 0; } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index eca333f5f715..9ed7a2895602 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -431,6 +431,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 73c556c2ff76..e62b00c2a0c8 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 @@ -1303,8 +1304,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)) -- 2.30.1