From patchwork Sun Oct 21 16:16:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10651121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FBD014E2 for ; Sun, 21 Oct 2018 16:16:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BD74287BE for ; Sun, 21 Oct 2018 16:16:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10283287C6; Sun, 21 Oct 2018 16:16:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C921287BE for ; Sun, 21 Oct 2018 16:16:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 610A46B0273; Sun, 21 Oct 2018 12:16:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5BD526B0274; Sun, 21 Oct 2018 12:16:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 487126B0275; Sun, 21 Oct 2018 12:16:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by kanga.kvack.org (Postfix) with ESMTP id 1BE586B0273 for ; Sun, 21 Oct 2018 12:16:56 -0400 (EDT) Received: by mail-yb1-f200.google.com with SMTP id f8-v6so22946064ybn.22 for ; Sun, 21 Oct 2018 09:16:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:from:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=pC8nJW77l6kqdRNb3rj5XcaGF3voO6grLSxCXMDgfF0=; b=oQfydjCrWbE3NY65gHf9s4JZB2Gfl54MBJ0hX43KhSRNeEPrvz+CVsFZ2bgQkCLbY1 tD6nkAZMSmlwIbGJTlF4Q9UepGnBVJH0QfkzTwfrWvGKDZ+gvIkMEK5506aSG03xTH0S N91ojF2puuFP/0oAeU/A+Dpa1xCvSCkUKzM7hBR2rSL1DrUKLAE4MNxyHZh11IFWqrDt V4LEP3tAFZyZjJy7bcEm1b6WBREFME96QBCo4t+5rR6kMB4wmEBmVrylnQhcBJT40UIo HF9UbMOJCi3HdltIUk88ep6wSFgHnNUpCLTUU1i+kHcOLTtAO/VMs/S4lQjSCIQyZmtI ywuw== X-Gm-Message-State: ABuFfogAwLaipacq2etB5FBAx2f6N+0yi86YDxsRcyZCvgTR4bjx2Ljp /v20hRrBn4Bx350rw4R9YcnHnrGKZc1tPGZxwcKZXLS3md02P1uv7XdMkcHewtf6iDqdUraxvWg 5FmlOkLgi3Vw3E9eeOti31pqUBxeT1YSdX1I/k8CNs6tLontFOequO7/+mixEbwqXwg== X-Received: by 2002:a25:e713:: with SMTP id e19-v6mr12660908ybh.449.1540138615873; Sun, 21 Oct 2018 09:16:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV62+9lodqBNRaRrPlOxfFoF4Pw5//P+24QwO3X06X+wHFbCz+zXG9yIO5EgVQIxEpxoJZYBh X-Received: by 2002:a25:e713:: with SMTP id e19-v6mr12660871ybh.449.1540138615155; Sun, 21 Oct 2018 09:16:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540138615; cv=none; d=google.com; s=arc-20160816; b=aeRIA5dvwmmBcQ9EIayMdxJfgc/CkK+iWnkg8Wg8I6/x4lYPG1SU++/bN92h1h4yVb rTaFSQNBLKGFa4ZFeVr+zTj5iJ8dv1fuGNH93ihiIaFYuYU2A+vhnVnGp/G8sXRDpSH0 5B8aYSyYzzlKq0j7KQ4Uxyn7B8P0djM+UVHS523whwgIzP8Ic0F0fk1edXtG/Vo4MEis LHelzySaT2FOXfDUbc3Ck+8MQEqVEOF10x7aXnWo8vyV/1qCJ+K6/5NJUq01lAV6srv+ 3Vcpof/ivB0wHd9UHencm3OGKL2ukwH9VDZjDwH5hNTL5tqMxzVZYYTaLtHa70ZuTkxf hpUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject:dkim-signature; bh=pC8nJW77l6kqdRNb3rj5XcaGF3voO6grLSxCXMDgfF0=; b=v4yECuDl95/ZjHSJvraTrdXnRfry6h9zOqas7rBIy4W9uLz+K/U1E+NbNlpznME70L Hl+BRIyvkKvOO9pKeAhswHS4a/ACGepoXWViw6Z/HSnEGGKMnpcAWUnUrv44Aj88ri7n CMRLekGb8GkMPTyA990BYN8deoZAclhjdX0y1CdliR/78zrG3htiFPUTK616DG3nBrzu 8BrMS2PixTmEjN7uti2ki1+olLs0roCEF7xbINdIlLH/seWORK3w/UE+dPadrMKFW9oO bURBAnaxNgxeqr9oKJC9K3gO89djSQmqbJCnygACxfiZgzIG7nzZHTYGRi2vweiHbsXg ydWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=N5YLm8oA; spf=pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from aserp2120.oracle.com (aserp2120.oracle.com. [141.146.126.78]) by mx.google.com with ESMTPS id h63-v6si13991032ywh.193.2018.10.21.09.16.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Oct 2018 09:16:55 -0700 (PDT) Received-SPF: pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) client-ip=141.146.126.78; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=N5YLm8oA; spf=pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9LGF4D4155377; Sun, 21 Oct 2018 16:16:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=pC8nJW77l6kqdRNb3rj5XcaGF3voO6grLSxCXMDgfF0=; b=N5YLm8oAdXTZUxPUhI2dgJs4g8oK1tP34saHlI7ZcL6zBFzTUrs9szXJIertH4aNlA8P 2nmvGtFEHHZQ11I8F1VwNccpBMAYITG++vHBT+Gy62K8Y01QNJX4xEF8cAgJVhtp1/g0 OIbMJLlrys3owlVvcUYBJ9EvBGJYb+YsBRcVwJ/y+BgvuCUHCcdHURmiUtO9uuG8Xugn LrMgzitbsHUazyytJjMuoLFgoMMIeyQOAo24WiEPs6b9t16nY4vKhGaQIHIqsTij2S2c lTLZacJgG5vVDU8Yx1RPT5imPriW2ZtFaWPGB0Vk7iFxycFaQ7USfgbqlDMhXyT+C5Kk jg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2n7vapjyrb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 Oct 2018 16:16:52 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9LGGpBq026699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 Oct 2018 16:16:51 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9LGGo0A019171; Sun, 21 Oct 2018 16:16:51 GMT Received: from localhost (/10.159.225.70) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 21 Oct 2018 09:16:50 -0700 Subject: [PATCH 15/28] vfs: plumb remap flags through the vfs dedupe functions From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, Amir Goldstein , linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Sun, 21 Oct 2018 09:16:49 -0700 Message-ID: <154013860893.29026.11185987776641893367.stgit@magnolia> In-Reply-To: <154013850285.29026.16168387526580596209.stgit@magnolia> References: <154013850285.29026.16168387526580596209.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9053 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=522 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810210151 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Plumb a remap_flags argument through the vfs_dedupe_file_range_one functions so that dedupe can take advantage of it. Signed-off-by: Darrick J. Wong Reviewed-by: Amir Goldstein --- fs/overlayfs/file.c | 3 ++- fs/read_write.c | 9 ++++++--- include/linux/fs.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c index 0393815c8971..84dd957efa24 100644 --- a/fs/overlayfs/file.c +++ b/fs/overlayfs/file.c @@ -467,7 +467,8 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, case OVL_DEDUPE: ret = vfs_dedupe_file_range_one(real_in.file, pos_in, - real_out.file, pos_out, len); + real_out.file, pos_out, len, + flags); break; } revert_creds(old_cred); diff --git a/fs/read_write.c b/fs/read_write.c index 0d1ac1b9bc22..ea30666013b0 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -2010,10 +2010,12 @@ EXPORT_SYMBOL(vfs_dedupe_file_range_compare); loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, struct file *dst_file, loff_t dst_pos, - loff_t len) + loff_t len, unsigned int remap_flags) { loff_t ret; + WARN_ON_ONCE(remap_flags & ~(REMAP_FILE_DEDUP)); + ret = mnt_want_write_file(dst_file); if (ret) return ret; @@ -2044,7 +2046,7 @@ loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, } ret = dst_file->f_op->remap_file_range(src_file, src_pos, dst_file, - dst_pos, len, REMAP_FILE_DEDUP); + dst_pos, len, remap_flags | REMAP_FILE_DEDUP); out_drop_write: mnt_drop_write_file(dst_file); @@ -2112,7 +2114,8 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same) } deduped = vfs_dedupe_file_range_one(file, off, dst_file, - info->dest_offset, len); + info->dest_offset, len, + 0); if (deduped == -EBADE) info->status = FILE_DEDUPE_RANGE_DIFFERS; else if (deduped < 0) diff --git a/include/linux/fs.h b/include/linux/fs.h index 1c5e55d2a67d..544ab5083b48 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1859,7 +1859,7 @@ extern int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same); extern loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, struct file *dst_file, loff_t dst_pos, - loff_t len); + loff_t len, unsigned int remap_flags); struct super_operations {