From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=103.168.172.151 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794873700; b=wIUhofpV/CJ6nBYBQMKYdb/lZwkOqOJpA6DyuqgzzOrnnpEQjgB2LMxidGA0++BDiMYA nSjC0dhTQUEhBo2+EPzktxoFyNV0jtGoEV+zsAVLZ5ASzH7vSEEGmJ3lVyg+r62dlgNQ3 F3NhQO8CfQMO8wYPscOYv3gPZk7V3SXgVvW6TcXzdvTVCp+fZ5VLb6/2peA9n7wYmwfwq jEGsVaBhFkEUiReX+wRJYjpyrCfZah6zWPH5WLuHUEMMK+8zTS/ATTsXTsH+2oBkZ5EXo AUMYSjn8wfFmqpKJ/cIQteyla0Y3AKdhI6Ei/DrIul+bofb4cC4xIx5IQOSSZDLUsVQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794873700; h=DMARC-Filter:Received:Received:DKIM-Signature:DKIM-Signature: X-DKIM2-Info:DKIM2-Signature:X-DKIM2-Info:Message-Instance: X-ME-Sender:X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:Reply-To:MIME-Version:Content-Transfer-Encoding; bh=av34aLRQ9yOhBTYqBMp3EX9jisd3zEyC0HaxasON9CQ=; b=Qij95kIz5iGy9CjwFO+6aeyLdKTdlGqaB69DTDJfVaxFgwxMSzBPzdBT446Hg+AgDZPJ c3Vy0J/T7Lg4KlIpO4nPxjYpgbLYtHHwBEibFarwXT7eXbUNhSWdeJxBXa1m+S6rSzynw q2afJ2OC3nuS8XXVRkESxPg5mDiRFmSz9JH/bYRGVEbHkVdlwDAlTdUQvC196LhOUoYPU lrmT+F9rOz4KKOiMp7ih4FJ32/B0kJZJ5fFSsQUasHJ2CdYyDiVUDvFLSUwDXVdAKSjcX qqKuW3MrX14fHUQ3+C4hgOiUlyS6nOsAFDnQ1W5qhtNUupoLrR5RLVUNexJ/6gIsdCA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=ownmail.net; spf=pass smtp.mailfrom=ownmail.net; dkim=pass header.d=ownmail.net header.i=@ownmail.net header.a=rsa-sha256 header.s=fm3 header.b=i2j3P8Lg; dkim=pass header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=smZ0oewD; arc=none smtp.remote-ip=103.168.172.151 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FF0C606A323 for ; Tue, 17 Nov 2026 00:01:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0FF0C606A323 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ownmail.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ownmail.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=ownmail.net header.i=@ownmail.net header.a=rsa-sha256 header.s=fm3 header.b=i2j3P8Lg; dkim=pass (2048-bit key, unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=smZ0oewD Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id 29D01EC084C for ; Mon, 16 Nov 2026 19:01:39 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Mon, 16 Nov 2026 19:01:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ownmail.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:subject:subject:to:to; s=fm3; t=1794873699; x=1794960099; bh=av34aLRQ9yOhBTYqBMp3EX9jisd3zEyC0HaxasON9CQ=; b= i2j3P8Lgn+UodUf1HySuVNIHzv230xwkfMZiSkdxEwkVNqh1zJ8MOML0ssO/8qLn dqHSlQXy6ZdcJkusyLQ0BxJrde4eVIcgWUgOC9dttqzB4+sm+NeEq+oWE0czI0J8 hPfRO+QDYPP5rxIEH0oalIYtadwsu+uCYMLMcaJAcU1/VvEg+CUYNFbfoZzlzccc ECW0Bm+pFibPTN2EAJAoqBezIRismacpIeKtq1evVaE/CEJAQmEYnRjXvPoOfmoh dphMmhC4rLZULVEOxNhCeNO+NCaBPVbs87amdTU40Wt+a2DYoJX4WsFbtOuGsoBf k8KQOWULfqaUt0Eca6WfSQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1794873699; x=1794960099; bh=a v34aLRQ9yOhBTYqBMp3EX9jisd3zEyC0HaxasON9CQ=; b=smZ0oewDH8PkdBlqD Lih5Y9H2j4X3qYgfz+O37duIzlp8tRZUZOdMspXQAiElxt+rt9J051hzzS8R3sHd A9+pomVeoeK52y21PyINiPHTZJ5pk1tnGZLzcgFH/3AQpz1uLBq6bRWkHMwwkak5 kuxGapWpaaXoZTBoeK19OvIdG2KYwBBElA6NUNWWjzCPt4JRq6Ut4LRxwW+6vyFI PFCXVp4qN0CuFzUcnbW7+KEvbdAZVPCFKXwwKGq6sHIKQlwJ3Yl+FvQBcAefrOmd letcN6Nn4lpIPcujkiQ54kuerwyo5EKf5S27fAhohUXr6cNHXKtcGSCTIQQZDBJk HK4MA== X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=sign d=ownmail.net a=rsa-sha256; DKIM2-Signature: i=1; m=1; t=1794873699; d=ownmail.net; mf=PG5laWxiQG93bm1haWwubmV0Pg==; rt=PGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc+; s=fm3:rsa-sha256:xYEuoXBSQmiMV3u9FKo4Pk+983aAzBdlSF7WQzzicYgKgAQ Su6yh9vcFAWAAWTwQYzJufJLOh477lLkiHB3gkGIyhBMZKvdbloYAqwBJeH2kK4/ wluRRxycYdFDmT0g2LHrkYrIvgIXBXjRx2oCIOcDDg5AjLRc+dJPxE4ooHUhrJDc QHC7IS9dI1lywtLcvjFNFtLs9bUzC5Zd1XacsyNUPey5f/1hssSlzxXSUtLauiYc NpbYVJK37fmtwcvot/OL++k+Lurp2MKTvq6l7gX0tj0Lb0PRuWQ9xfgj5bwYYNXL tG1SDrokbBPBP9pfB4xCp6Zl2pEeSl794TEPgrg==; X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-09; repo=github.com/dkim2wg/interop; date=2026-11-03; sw=lmtpprox; action=mi-m=1; hc=12; hn=cc,content-transfer-encoding,date,feedback-id,from, in-reply-to,message-id,mime-version,references,reply-to,subject, to; Message-Instance: m=1; h=sha256:Z20dVrMxqOiASISKH1zfSrQItQDFZphjEOPmDTnUDRk=:X+HTCYJx70nUOlEnYJkjtFjje0AX7LpGBgWqVfYQghs=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEWLllwmZbCQ7cO93As6sGHtjiFdYj9k/VSqMvUwk1xfk9pKn/ZCX7mnpLkIaqMef K/82szmVYemJN/I0DCAIOCHeaPZ7/Xa2GnBqk902ewdx8hjF22LzMBgW8kwMwZuhDEqmG+ fRzfUtzcgzHNqdnt0hptgxxppIMFQUfVlAsIvg7fvTNv54Da321pj6NeCTNh6yP98D0Rix 0qUujhXor+6vA1uX99KaZah7Remd9bF8xjGXqzB2MsscQiqTyvs6dLxlge9fkMF8nj1I3u +RSOpU+TvlDvjmsK8NtReLJ34nN/1FLS6YOAknIb84eISWftGKSVwY1LnVjpVMr2cR7DCi W3CSaSFjmENxXg0y7ldo/iTIwMI2qIyuA9nXlgmWjFjPwK/UTJ0VwPcu5hIoA9QFdeWvxa je0YTxa8uUDVkM6OboIk02vGHPWWOMsf3kMUGg8Rfr2vo8a0fHeZFPFx6baFUx/wVmBwE0 GqjuwPypbzpcqYX5tilDfdHFLGHrCD2EMsfy5IOHTj0I15PqjbQ+mCC0hV5sxu3eRr1En7 5Oy8Lor+dNhpHXtJC7+5Gdm3fl+iXlm4xI9HP8ugP9ShDQVfmX1TyYMIznWG1S327a2eA/ WAPPLR8RrqT9KoOoTR68ceYOkAksn01W3nfN6CbaeSwUkpNwCTRTIJs8bTVA X-ME-Proxy: Feedback-ID: i9d664b8f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 16 Nov 2026 19:01:32 -0500 (EST) From: NeilBrown To: Alexander Viro , Christian Brauner Cc: Jan Harkes , coda@cs.cmu.edu, Jan Kara , Richard Weinberger , Anton Ivanov , Johannes Berg , Namjae Jeon , Hyunchul Lee , Carlos Maiolino , Jeff Layton , Amir Goldstein , linux-kernel@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-fsdevel@vger.kernel.org, linux-um@lists.infradead.org, ntfs@lists.linux.dev, linux-xfs@vger.kernel.org Subject: [PATCH v2 1/4] VFS/xfs/ntfs: drop parent lock across d_alloc_parallel() in d_add_ci() Date: Tue, 17 Nov 2026 10:54:58 +1100 Message-ID: <20261117000115.1433875-2-neilb@ownmail.net> X-Mailer: git-send-email 2.50.0.107.gf914562f5916.dirty In-Reply-To: <20261117000115.1433875-1-neilb@ownmail.net> References: <20261117000115.1433875-1-neilb@ownmail.net> Reply-To: NeilBrown X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: NeilBrown A proposed change will invert the lock ordering between d_alloc_parallel() and inode_lock() on the parent. When that happens it will not be safe to call d_alloc_parallel() while holding the parent lock - even shared. We don't need to keep the parent lock held when d_add_ci() is run - the VFS doesn't need it as dentry is exclusively held due to DCACHE_PAR_LOOKUP and the filesystem has finished its work. So drop and reclaim the lock (shared or exclusive as determined by LOOKUP_SHARED) to avoid future deadlock. Signed-off-by: NeilBrown --- Documentation/filesystems/porting.rst | 7 ++++++ fs/dcache.c | 32 +++++++++++++++++++++++---- fs/ntfs/namei.c | 2 +- fs/xfs/xfs_iops.c | 2 +- include/linux/dcache.h | 3 ++- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst index c38f5df755bb..4cab51e1bd6c 100644 --- a/Documentation/filesystems/porting.rst +++ b/Documentation/filesystems/porting.rst @@ -1422,3 +1422,10 @@ helpers take a const struct mnt_idmap *. mnt_idmap() and file_mnt_idmap() return one. The idmapping is immutable so nothing should have modified it anyway. References are taken and dropped via mnt_idmap_get() and mnt_idmap_put() as before, both accept a const pointer. + +--- + +**mandatory** + +d_add_ci() must now be passed the flags arguemnt that was given to ->lookup + diff --git a/fs/dcache.c b/fs/dcache.c index 720b32cb2e03..255ebdad303d 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2419,6 +2419,7 @@ EXPORT_SYMBOL(d_obtain_root); * @dentry: the negative dentry that was passed to the parent's lookup func * @inode: the inode case-insensitive lookup has found * @name: the case-exact name to be associated with the returned dentry + * @lookup_flags: flags passed to ->lookup * * This is to avoid filling the dcache with case-insensitive names to the * same inode, only the actual correct case is stored in the dcache for @@ -2431,9 +2432,10 @@ EXPORT_SYMBOL(d_obtain_root); * the exact case, and return the spliced entry. */ struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode, - struct qstr *name) + struct qstr *name, unsigned int lookup_flags) { struct dentry *found, *res; + bool must_relock = false; /* * First check if a dentry matching the name already exists, @@ -2445,24 +2447,46 @@ struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode, return found; } if (d_in_lookup(dentry)) { + /* + * We are holding parent lock and so don't want to wait + * for a d_in_lookup() dentry. We can safely drop the + * parent lock and reclaim it as we have exclusive + * access to dentry as it is d_in_lookup() (so + * ->d_parent is stable) and we are near the end + * ->lookup() and will shortly drop the lock anyway. + * We cannot retake the lock while the new dentry is in-lookup + */ + if (lookup_flags & LOOKUP_SHARED) + inode_unlock_shared(d_inode(dentry->d_parent)); + else + inode_unlock(d_inode(dentry->d_parent)); + must_relock = true; found = d_alloc_parallel(dentry->d_parent, name); if (IS_ERR(found) || !d_in_lookup(found)) { iput(inode); - return found; + goto out_relock; } } else { found = d_alloc(dentry->d_parent, name); if (!found) { iput(inode); return ERR_PTR(-ENOMEM); - } + } } res = d_splice_alias(inode, found); if (res) { d_lookup_done(found); dput(found); - return res; + found = res; } + if (!must_relock) + return found; +out_relock: + d_lookup_done(dentry); + if (lookup_flags & LOOKUP_SHARED) + inode_lock_shared(d_inode(dentry->d_parent)); + else + inode_lock_nested(d_inode(dentry->d_parent), I_MUTEX_PARENT); return found; } EXPORT_SYMBOL(d_add_ci); diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c index b46fe44b63b5..16ed6027fa13 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c @@ -332,7 +332,7 @@ static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent, } nls_name.hash = full_name_hash(dent, nls_name.name, nls_name.len); - dent = d_add_ci(dent, dent_inode, &nls_name); + dent = d_add_ci(dent, dent_inode, &nls_name, flags); kfree(nls_name.name); return dent; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index d307ec97fac8..ec08c882c6f7 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -368,7 +368,7 @@ xfs_vn_ci_lookup( /* else case-insensitive match... */ dname.name = ci_name.name; dname.len = ci_name.len; - dentry = d_add_ci(dentry, VFS_I(ip), &dname); + dentry = d_add_ci(dentry, VFS_I(ip), &dname, flags); kfree(ci_name.name); return dentry; } diff --git a/include/linux/dcache.h b/include/linux/dcache.h index aaa4ba7a1299..9dd91ba2fe33 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -267,7 +267,8 @@ struct dentry *d_duplicate(struct dentry *dentry); /* weird procfs mess; *NOT* exported */ extern struct dentry * d_splice_alias_ops(struct inode *, struct dentry *, const struct dentry_operations *); -extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *); +extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *, + unsigned int); extern bool d_same_name(const struct dentry *dentry, const struct dentry *parent, const struct qstr *name); extern struct dentry *d_find_any_alias(struct inode *inode); base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb -- 2.50.0.107.gf914562f5916.dirty