From patchwork Mon Mar 16 04:43:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 6015121 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 53FEE9F318 for ; Mon, 16 Mar 2015 04:45:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BD3F203DA for ; Mon, 16 Mar 2015 04:45:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83A0A202F8 for ; Mon, 16 Mar 2015 04:45:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbbCPEos (ORCPT ); Mon, 16 Mar 2015 00:44:48 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56213 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752932AbbCPEor (ORCPT ); Mon, 16 Mar 2015 00:44:47 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C0274ABA2; Mon, 16 Mar 2015 04:44:45 +0000 (UTC) From: NeilBrown To: Al Viro Date: Mon, 16 Mar 2015 15:43:20 +1100 Subject: [PATCH 06/13] VFS/namei: new flag to support RCU symlinks: LOOKUP_LINK_RCU. Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <20150316044320.23648.45500.stgit@notabene.brown> In-Reply-To: <20150316043602.23648.52734.stgit@notabene.brown> References: <20150316043602.23648.52734.stgit@notabene.brown> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we support ->follow_link in RCU-walk we will not want to take a reference to the 'struct path *link' passed to follow_link, and correspondingly will not want to drop that reference. As link_path_walk will complete_walk() in the case of an error, and as complete_walk() will clear LOOKUP_RCU, we cannot test LOOKUP_RCU to determine if the path should be 'put'. So introduce a new flag: LOOKUP_LINK_RCU. This is set on entry to follow_link() if appropriate and put_link() will only call path_put() if it is clear. Also, unlazy_walk() will fail if LOOKUP_LINK_RCU is set. This is because there is no way for unlazy_walk to get references on all the "struct path *link"s that are protected by that flag. Signed-off-by: NeilBrown --- fs/namei.c | 18 +++++++++++++----- include/linux/namei.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/namei.c b/fs/namei.c index 8cb89a0d30ba..e0f889192f59 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -550,6 +550,9 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry) struct dentry *parent = nd->path.dentry; BUG_ON(!(nd->flags & LOOKUP_RCU)); + if (nd->flags & LOOKUP_LINK_RCU) + /* Cannot unlazy in the middle of following a symlink */ + return -ECHILD; /* * After legitimizing the bastards, terminate_walk() @@ -766,7 +769,8 @@ static inline void put_link(struct nameidata *nd, struct path *link, void *cooki struct inode *inode = link->dentry->d_inode; if (inode->i_op->put_link) inode->i_op->put_link(link->dentry, cookie); - path_put(link); + if (!(nd->flags & LOOKUP_LINK_RCU)) + path_put(link); } int sysctl_protected_symlinks __read_mostly = 0; @@ -892,9 +896,10 @@ follow_link(struct path *link, struct nameidata *nd, void **p) int error; char *s; - BUG_ON(nd->flags & LOOKUP_RCU); - - if (link->mnt == nd->path.mnt) + nd->flags &= ~LOOKUP_LINK_RCU; + if (nd->flags & LOOKUP_RCU) + nd->flags |= LOOKUP_LINK_RCU; + else if (link->mnt == nd->path.mnt) mntget(link->mnt); error = -ELOOP; @@ -944,7 +949,8 @@ follow_link(struct path *link, struct nameidata *nd, void **p) out_put_nd_path: *p = NULL; terminate_walk(nd); - path_put(link); + if (!(nd->flags & LOOKUP_LINK_RCU)) + path_put(link); return error; } @@ -1667,6 +1673,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) current->nameidata->link_count--; nd->depth--; + if (!nd->depth) + nd->flags &= ~LOOKUP_LINK_RCU; return res; } diff --git a/include/linux/namei.h b/include/linux/namei.h index 368eb3d721b8..05b6b9c18801 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -31,6 +31,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; #define LOOKUP_PARENT 0x0010 #define LOOKUP_REVAL 0x0020 #define LOOKUP_RCU 0x0040 +#define LOOKUP_LINK_RCU 0x0080 /* * Intent data