Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>
Cc:     Stephen Brennan <stephen.s.brennan@oracle.com>,
        linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org,
        Arnd Bergmann <arnd@arndb.de>,
        Amir Goldstein <amir73il@gmail.com>
Subject: [PATCH v2 4/4] dcache: stop walking siblings if remaining dentries all negative
Date:   Wed,  9 Feb 2022 15:14:06 -0800
Message-Id: <20220209231406.187668-5-stephen.s.brennan@oracle.com>
In-Reply-To: <20220209231406.187668-1-stephen.s.brennan@oracle.com>
References: <20220209231406.187668-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nO6rmJCpwVgiNVBJc6HkOKarNnUJ2w43PuCQIbIAaLB3rsQ42qW7xzxqly0g?=
 =?us-ascii?Q?aCL4TRNrfT9w1I1VlopJwpvlprGrZdjSR/F6ZifMsGu+TM8Q2u1g+sa3XR57?=
 =?us-ascii?Q?k3KqgEdOgBS32i/h9XsCVAfd0ntnk/J2jTWG7W+YuhrQQzUCADvJiUu5DGfN?=
 =?us-ascii?Q?JruacZ5ajsgM++Zrm9ld/8S/XIqvkpOWfKFDw0U412wryVbfT/NRc9twofPe?=
 =?us-ascii?Q?ta2XDPGYGs3IDsvWAw1s2YMrYxiAFm3KWCoDjceocKIAYS+gmsVrfEQycxHJ?=
 =?us-ascii?Q?EjTsAuyzu5q9ZobYALXaA9LoE+5/1VeFj8g9SGQAVaSxVBhZ52cqMWl/KBYO?=
 =?us-ascii?Q?uTx5A9/Q0uMt2pjZ2PLxQtTGQjJ9LwdrNdTjGSdIGNjgmatr5REtc6wUA67I?=
 =?us-ascii?Q?FrIhuVw2pWq3a05x3xQ9pNK7vWldxt1UWWg6GKrvwXHAfdEZoXmXHLM9tG9M?=
 =?us-ascii?Q?QcnT/WcgOg0czchcvbgV8XEmxAuw3B0aFfs2spptHV9vuWR8VIxZwWynl0Tc?=
 =?us-ascii?Q?d3twJCwLK23hunJUF18Sw2Lb4qcGpPuTqCUSlbPt7QEdpcYa+SngH+wFfoYq?=
 =?us-ascii?Q?xjD27/loeFaqzHKAJPkCXfBZUs/dg+q5tjjS5jIYF9Fq7YhaBp0oTu8ZTNN1?=
 =?us-ascii?Q?YGVDHqZIIIVkwWNqIk8SkpJbE7OoPQgNqndaxXxG3NPY1f5hOU/t6LxfLnHk?=
 =?us-ascii?Q?8bS992575vXdLH9k6NIYvm/EILn2uooWLKiJ7T3dYRLias8oa4UyjES6e06D?=
 =?us-ascii?Q?oefu1ZTEb8vo19W/EqJZ0pdY5D89F1dqfyvW4KpHAwWVYi2xnKka+ao49ZLD?=
 =?us-ascii?Q?eEPdK+ss8cf3aVvUHMdU3f3O6dySlhNEe/SKtsPwsmWn6b+NhlkRybWC82Vj?=
 =?us-ascii?Q?pzLEBQ0E1Hb4Msfw3F/J6gEsIiOcon64eLN09JkH3Nasw1Y3DKIN+SsH9Uw0?=
 =?us-ascii?Q?XFwekEsrWXeaO4c8tedDNi/lXYUPJzprt3/KtjR/5nzccy9tGk82yjtx0Dwa?=
 =?us-ascii?Q?0zdNKiBnRcW6uv5/WpFT9xzDpXroRoyP7JWVuwCOM2L3tM6a7INQV/rhburO?=
 =?us-ascii?Q?Fg6T7UlsLiyXAjVSvMMnyJ6y+LkexTcG70LJ09djukQ4EiAjOVg7g5VbvNqa?=
 =?us-ascii?Q?nQ6MjagenqqN5M5xnu/vP2XYaLmBSygSyZ9t1PlElJqdXLfK2CK0Xm2t/Uyt?=
 =?us-ascii?Q?sNrqRbXu9F9xmqMJurYoY09nHXdrquqzdYV4LDwqZH5SFgJL4TZDUZmVKtC6?=
 =?us-ascii?Q?sjlFCOMsZY5lqaucZ6xnqbbi4BIAP9wqo/m8ijmG2lMbZscOAJr1EIjlHBQy?=
 =?us-ascii?Q?H0wi9qb4pOjjfAt5/xjolM+fQ2a3bTFmj6raatGYyiZgx+m8oJBRjusWI14G?=
 =?us-ascii?Q?QaOVeP5G5AuIGfIy0ykzhlYV3y7b5Ek+BmKU+Lg0wbDlDH4jYpMuG/FCZmON?=
 =?us-ascii?Q?PfWt3UQcOsdo/fEJVbDrIMIFP6E7YqqlOK/N6IL1X57puS/Ef0EeFf71g69d?=
 =?us-ascii?Q?w+8OQ7f9TmMzpOsnnqRXZVbc7EBluMvJkSljZaq5WBRahEydD7cKuIDEePKA?=
 =?us-ascii?Q?IEDrfXuTJ8Gfu28212Ik/gclTihzr0RZjSs99AT4Adsj3rzVYlpKdS/IDVvR?=
 =?us-ascii?Q?wE6sGvk0ABnHqusaoNxzNATk9jglKHe9NZxrUDLra1r6PMpP8BNPTGYJDiO9?=
 =?us-ascii?Q?deTj8g=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0a31cfea-42a2-4e54-95ff-08d9ec21e610
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 23:14:18.8964
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6S0zAcyCq3CYjRMRUQ7NO6ncJe5QnVil3EO75o2MsWbEMG4N4chiNKmJx/nIoI6ydAnb2OnVNKueQPMbtX0bT/RNoQQKnHYnPDa/enZGzTQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4884
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10253 signatures=673431
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0
 malwarescore=0 suspectscore=0 phishscore=0 adultscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202090121
X-Proofpoint-GUID: zibqtQpcc6YnNWemx6tb3GRAy9FmN7rv
X-Proofpoint-ORIG-GUID: zibqtQpcc6YnNWemx6tb3GRAy9FmN7rv
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

Most walkers are interested only in positive dentries.

Changes in simple_* libfs helpers are mostly cosmetic: it shouldn't cache
negative dentries unless uses d_delete other than always_delete_dentry().

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Gautham Ananthakrishna <gautham.ananthakrishna@oracle.com>
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 fs/dcache.c | 9 +++++++++
 fs/libfs.c  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/fs/dcache.c b/fs/dcache.c
index 8809643a4d5b..e98079ed86be 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1530,6 +1530,8 @@ static enum d_walk_ret path_check_mount(void *data, struct dentry *dentry)
 	struct check_mount *info = data;
 	struct path path = { .mnt = info->mnt, .dentry = dentry };
 
+	if (d_is_tail_negative(dentry))
+		return D_WALK_SKIP_SIBLINGS;
 	if (likely(!d_mountpoint(dentry)))
 		return D_WALK_CONTINUE;
 	if (__path_is_mountpoint(&path)) {
@@ -1776,6 +1778,10 @@ void shrink_dcache_for_umount(struct super_block *sb)
 static enum d_walk_ret find_submount(void *_data, struct dentry *dentry)
 {
 	struct dentry **victim = _data;
+
+	if (d_is_tail_negative(dentry))
+		return D_WALK_SKIP_SIBLINGS;
+
 	if (d_mountpoint(dentry)) {
 		__dget_dlock(dentry);
 		*victim = dentry;
@@ -3256,6 +3262,9 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
 {
 	struct dentry *root = data;
 	if (dentry != root) {
+		if (d_is_tail_negative(dentry))
+			return D_WALK_SKIP_SIBLINGS;
+
 		if (d_unhashed(dentry) || !dentry->d_inode)
 			return D_WALK_SKIP;
 
diff --git a/fs/libfs.c b/fs/libfs.c
index ba7438ab9371..13cb44cf158e 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -411,6 +411,9 @@ int simple_empty(struct dentry *dentry)
 
 	spin_lock(&dentry->d_lock);
 	list_for_each_entry(child, &dentry->d_subdirs, d_child) {
+		if (d_is_tail_negative(child))
+			break;
+
 		spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED);
 		if (simple_positive(child)) {
 			spin_unlock(&child->d_lock);
-- 
2.30.2