From patchwork Mon Jan 16 17:46:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9519273 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 C4A416020B for ; Mon, 16 Jan 2017 17:46:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B558128443 for ; Mon, 16 Jan 2017 17:46:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9F1C28491; Mon, 16 Jan 2017 17:46:38 +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 2B31128443 for ; Mon, 16 Jan 2017 17:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751127AbdAPRqg (ORCPT ); Mon, 16 Jan 2017 12:46:36 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33310 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751051AbdAPRqe (ORCPT ); Mon, 16 Jan 2017 12:46:34 -0500 Received: by mail-wm0-f68.google.com with SMTP id r144so32411607wme.0; Mon, 16 Jan 2017 09:46:34 -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=wkaqxIcIe5C8zQfRN+jkTbYD7HPl3fmNbATrok/4KUM=; b=aE01788CAdUIZcQZNGzvj+0/k/TuG5OXxhYDDxRi4NXru9FTmxPJA/n+3/hwCtQdk3 IICAaQdKZZRh3yZv/It6SUlVhVRhwG9IbD6W6KriGz24iIMc0B3Of2kWy+oxFmSZJvo2 RwIgJfZcKXYB4f1a8YvbzdCKZQY6Ecrr5UKuE7pu6Sz/oR3GIz3zvUfyrzEITe0w7Tkg dq94XQuokxsWeNJbMLW8ptREqeSHPjy8a4ngwBSHchfkX1fybSd0e4kK1fTZo4DKsOo+ oSH6cvJMBGl0WpBO6MlloqS1+j+UorYXauUDYDURKMW8uCDpNyzlvgI6J0s/o1IzVHDY b9TA== 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=wkaqxIcIe5C8zQfRN+jkTbYD7HPl3fmNbATrok/4KUM=; b=VuocBjLG9QJ9tgzS324lm0zwi39JQ/KBKCGkb0IAIekxTa6mYXHOFP+zMK9SOCFV7h ZjkSGOc4V9R2ln7tAOdsVCRDH3BRUu4PPIWn074fCt/RsSPumNo26DxToFX9bk0Z2Mrs sx7btpx4OiHgJgxRKeYINGbQZQd/bOgIGIbJRxtWVWJEPirnBObb7//PY7SiUo1fdBbG sl3BJShqRZuosyo/RomD+xsFVmwYYglTGblwM2nwRB3WTU1jn1blelKvPmsKimzn3o0e vMjUkfc9SXkrceKmH6QtZ/jfZjKI17GdM96MOEXp1hOVi5lLr8NszxDMbiBwrNqIGmGp 9DwQ== X-Gm-Message-State: AIkVDXJNy5jvbO6+i6W/JZptwXjX522zsixucOReJXpRPpKc9vfhvySrWcGr9XlnLjhfZA== X-Received: by 10.223.152.18 with SMTP id v18mr16211597wrb.78.1484588793264; Mon, 16 Jan 2017 09:46:33 -0800 (PST) Received: from amir-VirtualBox.Home (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id s20sm30379407wmb.9.2017.01.16.09.46.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jan 2017 09:46:32 -0800 (PST) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 5/6] ovl: introduce copy up waitqueue Date: Mon, 16 Jan 2017 19:46:04 +0200 Message-Id: <1484588765-9397-6-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484588765-9397-1-git-send-email-amir73il@gmail.com> References: <1484588765-9397-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 The overlay sb 'copyup_wq' and overlay inode 'copying' condition variable are about to replace the upper sb rename_lock, as finer grained synchronization objects for concurrent copy up. Suggested-by: Miklos Szeredi Signed-off-by: Amir Goldstein --- fs/overlayfs/overlayfs.h | 2 ++ fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/super.c | 1 + fs/overlayfs/util.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index d5984c4..c997dc8 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -178,6 +178,8 @@ void ovl_dentry_version_inc(struct dentry *dentry); u64 ovl_dentry_version_get(struct dentry *dentry); bool ovl_is_whiteout(struct dentry *dentry); struct file *ovl_path_open(struct path *path, int flags); +int ovl_copy_up_start(struct dentry *dentry); +void ovl_copy_up_end(struct dentry *dentry); /* namei.c */ int ovl_path_next(int idx, struct dentry *dentry, struct path *path); diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index 65f24000..59614fa 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -28,6 +28,7 @@ struct ovl_fs { /* creds of process who forced instantiation of super block */ const struct cred *creator_cred; bool tmpfile; + wait_queue_head_t copyup_wq; }; /* private information held for every overlayfs dentry */ @@ -39,6 +40,7 @@ struct ovl_entry { u64 version; const char *redirect; bool opaque; + bool copying; }; struct rcu_head rcu; }; diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index ff05065..6792bb7 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -708,6 +708,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) if (!ufs) goto out; + init_waitqueue_head(&ufs->copyup_wq); ufs->config.redirect_dir = ovl_redirect_dir_def; err = ovl_parse_opt((char *) data, &ufs->config); if (err) diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 952286f..01157d6 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -263,3 +263,33 @@ struct file *ovl_path_open(struct path *path, int flags) { return dentry_open(path, flags | O_NOATIME, current_cred()); } + +int ovl_copy_up_start(struct dentry *dentry) +{ + struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_entry *oe = dentry->d_fsdata; + int err; + + spin_lock(&ofs->copyup_wq.lock); + err = wait_event_interruptible_locked(ofs->copyup_wq, !oe->copying); + if (!err) { + if (oe->__upperdentry) + err = 1; /* Already copied up */ + else + oe->copying = true; + } + spin_unlock(&ofs->copyup_wq.lock); + + return err; +} + +void ovl_copy_up_end(struct dentry *dentry) +{ + struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_entry *oe = dentry->d_fsdata; + + spin_lock(&ofs->copyup_wq.lock); + oe->copying = false; + wake_up_locked(&ofs->copyup_wq); + spin_unlock(&ofs->copyup_wq.lock); +}