From patchwork Wed Sep 14 12:43:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9331333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79E156077A for ; Wed, 14 Sep 2016 12:44:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B57F29DC3 for ; Wed, 14 Sep 2016 12:44:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 604CA29DC5; Wed, 14 Sep 2016 12:44:10 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1DFB29DC3 for ; Wed, 14 Sep 2016 12:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761932AbcINMoI (ORCPT ); Wed, 14 Sep 2016 08:44:08 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32779 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761915AbcINMoA (ORCPT ); Wed, 14 Sep 2016 08:44:00 -0400 Received: by mail-wm0-f67.google.com with SMTP id b187so2395311wme.0; Wed, 14 Sep 2016 05:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YCVUWXT/FrgN3Im/NifBFeT6pFz2G4m5H95gXEcm+9w=; b=uGvhuQZqaMPlGp//EXyplauVvFyHJM89lB0O8sGeOjgnlncfoq9d+Cp9T8F8s6vrf/ rp0u6Fc8Ig+mhMy1RpO9Cf030mdj1kjbkxgGvs4lhEiKlPOULjRsd28QeoL1/QRkrN79 GabMY+FBEQp2JCdrkEqhqxZlaCaU4FGg5tc2pPBoqwSaUv/RYGtaajMR+eutqAO6dqhQ mUoc51QMe5y7QZewoXTOShI8Oj+IT1NgXeKOX2QS9AFd8RttUgTMA0/dIDvnj0I5Ee0X RcdI5m3oy+C5vpz5q5o0y4D3lzfx2XiSwT24W38phGb3Zhsnz9/I+D+5lHotyJ+C5jFC +tgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YCVUWXT/FrgN3Im/NifBFeT6pFz2G4m5H95gXEcm+9w=; b=lle+72Bgcj9Ylb7jpcNNZ381xolKObJXULj6sCc+GG5sVUVPRFPCwq66GNYF71nyFo Y5qqbs4hqHZ1nMWMDCfvw3xzY3sZG9dAUFw3DPns6xn2zy/qyQn3ojX7+sX0ca+3A29q ZDHTX54m0qyeCn+miTZk6fGPff+V3O3af0caVS4AKCUcgI41BezO8qJEMCa5IxMiPEyb wkLg2iSpUW62mIK8nICLRWNKcAGefmRmjRDTXbST0Yy+b1+Nwx7WZY5PU10zDU/tmD82 Gs30Z+x8K5e5adSchC/jmcF0DLypze9tPEKmnZNCtfKrMo8kLKjsdJYMJEaKkRHn+TQ1 Nq/w== X-Gm-Message-State: AE9vXwO27n/wtt+cxiVQ9NzUApXoNpqdnE2/1pM0dt2v5/0HBBTBzyho2osuiwTrl21I9A== X-Received: by 10.194.8.226 with SMTP id u2mr2824898wja.153.1473857038236; Wed, 14 Sep 2016 05:43:58 -0700 (PDT) Received: from localhost.localdomain (bzq-82-81-193-202.cablep.bezeqint.net. [82.81.193.202]) by smtp.gmail.com with ESMTPSA id m133sm10629574wmg.0.2016.09.14.05.43.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Sep 2016 05:43:57 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi , Dave Chinner , linux-unionfs@vger.kernel.org Cc: Christoph Hellwig , linux-xfs@vger.kernel.org, "Darrick J . Wong" , linux-fsdevel@vger.kernel.org Subject: [PATCH v3 4/4] ovl: use vfs_copy_file_range() to copy up file data Date: Wed, 14 Sep 2016 15:43:14 +0300 Message-Id: <1473856994-27463-5-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473856994-27463-1-git-send-email-amir73il@gmail.com> References: <1473856994-27463-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use vfs_copy_file_range() helper instead of calling do_splice_direct() when copying up file data. When copying up within the same fs, which supports copy_file_range(), fs implementation can be more efficient then do_splice_direct(). vfs_copy_file_range() helper falls back to do_splice_direct() if it cannot use the file system's copy_file_range() implementation. A previous change added a vfs_clone_file_range() call before the data copy loop, so this change is only effective for filesystems that support copy_file_range() and *do not* support clone_file_range(). At the moment, there are no such filesystems in the kernel that can be used as overlayfs upper, so I tested this change by disabling the vfs_clone_file_range() call. Tested correct behavior when lower and upper are on: 1. same ext4 (copy) 2. same xfs + reflink patches + mkfs.xfs (copy) 3. same xfs + reflink patches + mkfs.xfs -m reflink=1 (reflink) 4. different xfs + reflink patches + mkfs.xfs -m reflink=1 (copy) For comparison, on my laptop, xfstest overlay/001 (copy up of large sparse files) takes less than 1 second in the xfs reflink setup vs. 25 seconds on the rest of the setups. Signed-off-by: Amir Goldstein --- fs/overlayfs/copy_up.c | 10 +++++----- fs/read_write.c | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index ba039f8..a6d6bac 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -146,7 +146,6 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) /* Can't clone, so now we try to copy the data */ error = 0; - /* FIXME: copy up sparse files efficiently */ while (len) { size_t this_len = OVL_COPY_UP_CHUNK_SIZE; long bytes; @@ -159,15 +158,16 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) break; } - bytes = do_splice_direct(old_file, &old_pos, - new_file, &new_pos, - this_len, SPLICE_F_MOVE); + bytes = vfs_copy_file_range(old_file, old_pos, + new_file, new_pos, + this_len, 0); if (bytes <= 0) { error = bytes; break; } - WARN_ON(old_pos != new_pos); + old_pos += bytes; + new_pos += bytes; len -= bytes; } out: diff --git a/fs/read_write.c b/fs/read_write.c index 6975fe8..dfc083a 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1515,6 +1515,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, file_out->f_op->copy_file_range) ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out, len, flags); + /* FIXME: copy sparse file range efficiently */ if (ret == -EOPNOTSUPP) ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);