From patchwork Mon Jan 16 11:58:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9518549 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 7358D6020B for ; Mon, 16 Jan 2017 11:58:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 576FA283F4 for ; Mon, 16 Jan 2017 11:58:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C3AC28438; Mon, 16 Jan 2017 11:58:37 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 3D872283F4 for ; Mon, 16 Jan 2017 11:58:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751051AbdAPL6e (ORCPT ); Mon, 16 Jan 2017 06:58:34 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33194 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751047AbdAPL6e (ORCPT ); Mon, 16 Jan 2017 06:58:34 -0500 Received: by mail-wm0-f67.google.com with SMTP id r144so30287082wme.0; Mon, 16 Jan 2017 03:58:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8vMqox6b4LbwOpb4EBBjPHKTsjsV4QQ4E60ibVikGio=; b=DYXIKPWZm6MiJGJixTcjDz2l7upMOc6D2y0NQ5h5lwR+qvRIoLHcmJ1/VoQ11ajeyP sd2aPVwZO4HpV0n+uNoW4HF0VIwXeNILM0FBIg4qAmnkBRGfdQNLdyuaxK1rUO/iiP1y rCsPOaMkRygdcwIHrtczFBDsoKhr3R7brx+K55Jt7pT1ggSmf2dkYn+B5z1qvaOFP+Pc 116SWQdkfFn419G73M2V7yqI00DI2JSqe+crwPH+AUsc5DbJysIDz7JEcBtVIx7DbU1J ARReWTLTWPe18O1BdlRTA5Fn11fhw71xBHXuWvPPnWUVs0AYcGEMHcPdVLM2Qnr4cpr5 9Iww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8vMqox6b4LbwOpb4EBBjPHKTsjsV4QQ4E60ibVikGio=; b=FHNaNb10/3UmdqU1CuPIdrCX5wnnDDkWsvenHAmUEbFmugzXBiiWOrdml327zPkrPE st/jWcyb060USsjrXr4mnQ83cE5dnhITu+haI1qWdUrw0h0/nJYv4NdR9xe6o1j2g0AL YlOCSC/n7gIk+nN7Je2eZ1Uzs08waAuBJYDKDrS8wmuo9g7YUgS9jA6TFM4Gz6excf4Q laiXm1gnNiidV1sdvo/blhj4vFdb6WoQZXwyjfQiT/rsHoYxKw5Mf6Zs1Jz3J4hdcHTu 2YhfqRwCJ3kN/YibCu0fWNRFD2sEWAR0PJ1nj4Lt4M4japVBL5msS1Y51tyxtcC9W/jR aKNw== X-Gm-Message-State: AIkVDXIlCblgv0JhPnnGPKW5tsYidBP6v+WA9UF16bSIg9cIvz6eSU6UC0TqLWS4pDSCmA== X-Received: by 10.28.185.193 with SMTP id j184mr12951283wmf.86.1484567912484; Mon, 16 Jan 2017 03:58:32 -0800 (PST) Received: from amir-VirtualBox.ctera.local (bzq-82-81-193-202.cablep.bezeqint.net. [82.81.193.202]) by smtp.gmail.com with ESMTPSA id d199sm29563905wmd.0.2017.01.16.03.58.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jan 2017 03:58:31 -0800 (PST) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 6/6] ovl: concurrent copy up of regular files Date: Mon, 16 Jan 2017 13:58:13 +0200 Message-Id: <1484567893-22987-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484488652-611-7-git-send-email-amir73il@gmail.com> References: <1484488652-611-7-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 Now that copy up of regular file is done using O_TMPFILE, we don't need to hold rename_lock throughout copy up. Use the copy up waitqueue to synchronize concurrent copy up of the same file. Different regular files can be copied up concurrently. The upper dir inode_lock is taken instead of rename_lock, because it is needed for lookup and later for linking the temp file, but it is released while copying up data. Suggested-by: Al Viro Signed-off-by: Amir Goldstein --- fs/overlayfs/copy_up.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index d3b6c15..0d1cb96 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -291,7 +291,14 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir, BUG_ON(upperpath.dentry != NULL); upperpath.dentry = temp; + if (tmpfile) + inode_unlock(udir); + err = ovl_copy_up_data(lowerpath, &upperpath, stat->size); + + if (tmpfile) + inode_lock_nested(udir, I_MUTEX_PARENT); + if (err) goto out_cleanup; } @@ -371,15 +378,28 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry, return PTR_ERR(link); } - err = -EIO; - if (lock_rename(workdir, upperdir) != NULL) { - pr_err("overlayfs: failed to lock workdir+upperdir\n"); - goto out_unlock; - } - if (ovl_dentry_upper(dentry)) { - /* Raced with another copy-up? Nothing to do, then... */ - err = 0; - goto out_unlock; + if (tmpfile) { + err = ovl_copy_up_start(dentry); + /* err < 0: interrupted, err > 0: raced with another copy-up */ + if (unlikely(err)) { + pr_debug("ovl_copy_up_start(%pd2) = %i\n", dentry, err); + if (err > 0) + err = 0; + goto out_done; + } + /* Lock upper dir for lookup, link tmpfile, set_timestamps */ + inode_lock_nested(upperdir->d_inode, I_MUTEX_PARENT); + } else { + err = -EIO; + if (lock_rename(workdir, upperdir) != NULL) { + pr_err("overlayfs: failed to lock workdir+upperdir\n"); + goto out_unlock; + } + if (ovl_dentry_upper(dentry)) { + /* Raced with another copy-up? Nothing to do */ + err = 0; + goto out_unlock; + } } err = ovl_copy_up_locked(workdir, upperdir, dentry, lowerpath, @@ -389,7 +409,13 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry, ovl_set_timestamps(upperdir, &pstat); } out_unlock: - unlock_rename(workdir, upperdir); + if (tmpfile) + inode_unlock(upperdir->d_inode); + else + unlock_rename(workdir, upperdir); + if (tmpfile) + ovl_copy_up_end(dentry); +out_done: do_delayed_call(&done); return err;