Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Stephen Brennan <stephen.s.brennan@oracle.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Matthew Wilcox <willy@infradead.org>,
        James Bottomley <James.Bottomley@HansenPartnership.com>,
        Gao Xiang <hsiangkao@linux.alibaba.com>,
        Dave Chinner <david@fromorbit.com>,
        Roman Gushchin <roman.gushchin@linux.dev>,
        Colin Walters <walters@verbum.org>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 1/2] fs/dcache: make cond_resched in __dentry_kill optional
Date:   Thu, 31 Mar 2022 12:08:26 -0700
Message-Id: <20220331190827.48241-2-stephen.s.brennan@oracle.com>
In-Reply-To: <20220331190827.48241-1-stephen.s.brennan@oracle.com>
References: <20220331190827.48241-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?2EzjXiQlHgmoS6NBOmtNJdWhWzCVfJHYnTaDyQ9Zukb3rgLoGfiS8AIkLyhA?=
 =?us-ascii?Q?ZP+NKcWGXvvz7WH0V2FxUcKBXZcAVwimxiKtHhz7myY68wpEwc5AEfM7Gpel?=
 =?us-ascii?Q?Lwzf6pV0SwqayzX+D+0IBGPyipNEj5qa2mqvbvj9jIt8mjLhrHKn24ybYdah?=
 =?us-ascii?Q?U1JuLYOeY3D+A2HThK1mwcomp9CU+QOv/4tTbGxCShwxc2hZkegmol9on/Ge?=
 =?us-ascii?Q?lMmVkc8CGLBZM56mZTqJVTZkG10ZojeoCqf7LPsIIPIeL8xlCoHvOno88NF3?=
 =?us-ascii?Q?gNG01mYvBtoghX58wpOajz6SUPsePcleXspltAc7Vtda/1rb7X78FPKyogHa?=
 =?us-ascii?Q?+VSZjCUDchWrr4GwWHZOO7q+wDzNhvSMnmn1F4I2HDFV+oZ0tWLc7uggcs81?=
 =?us-ascii?Q?sCA4tGxapFcuuksQmlzO5RgV49GtOGqp39z2HXi9xsatXl2/cH1OauFR5kKP?=
 =?us-ascii?Q?RDRbrfUs4VuzppUmmyR7DgVsqz5A4aJzEgP1tsre8SqdT94YQqLngsDe4+pX?=
 =?us-ascii?Q?wvF+QXo/9xMqkyD9tN2j+EBa8g6QwJ50PT8eyXeUfHN6jtoXP5aI4bDkFfb3?=
 =?us-ascii?Q?OX11MAg3cDoM31EFeNjiXXj/Glg1MkEUth8YwF2COzsKX+GKtchxlZZtS8Gc?=
 =?us-ascii?Q?1yHnLgLnm4xBKT/MWMpC9Zd1X7csGul8AOKjTTWoEo4GQBo+i2FEft9jQa8l?=
 =?us-ascii?Q?4vHCGdyc7f1p7LammWwKpCL8c3CoAcCuCD/OSmJwS+Z4XnbMA/1Q8/xhWqOC?=
 =?us-ascii?Q?QHE8KskrxNw0PtT8Gv3TKpWddwtZYEptuxMj9QMRZN7aHUzcbm9DLuTbBuVa?=
 =?us-ascii?Q?13tBp0LnrKGsPzciz+dEJkYxiI35V3df/aYF2XptS1vfLXnsOYU7hVBPjK4O?=
 =?us-ascii?Q?O5hb5sHJC70QVWDi74W06Xu962kUq0/GQLEdH3WhWW4ImxG8hD+d8Z5SwIrh?=
 =?us-ascii?Q?h3fQNq0yBAvmZ67l//sKTYMpBAeM2+JYo2Z6NYv+nhQHruMIynQTE/uqRIjA?=
 =?us-ascii?Q?7E8kFzKMoPqqBkzmi893h0QZiEFE7teAvtHFKjgwn7featGT8fN01QfNEH0w?=
 =?us-ascii?Q?hKPvulZC+hJX/uTlgXT6Lv5wHqok1KmMXBIEGqik00oOz34Uts2np3TVXz72?=
 =?us-ascii?Q?gp7H45j1erUE80OH0848CFU8SrnwPuRLJ/KKw9cJK7b9htLOjLm/POvX6KKk?=
 =?us-ascii?Q?AY5LQaKbuhcwh75rBZh94gEstYkwxsMLqr3pFvqmOwbZZnOz9y35OipH64HD?=
 =?us-ascii?Q?HNet83gSpWr5wOi4lAwRLtj21NvFSc/v8HEGABYhPv9Tx1huoI6DeMGAHvB/?=
 =?us-ascii?Q?PT6wMw+Byyn6Cxq3CZkbIvsA3hSrjNL7pUUmMnkDh//kZ1syl4DocOMVuKwK?=
 =?us-ascii?Q?dY6STPwXxlAgMmlGlxThrvUcx+BZLSjpY2OW7Sx+ZV+JaQhZMjwPkrWd5XX2?=
 =?us-ascii?Q?IixpkB9SZobSiGBZvhTgMzLrCnrEiG2Ifhp1MZEHGB338z2qTL2LSooHb4R3?=
 =?us-ascii?Q?qm8q2ib6vps71JdEXuPEJmHoKFqRzsVbH/Z80Oi44DhffchUReBSSM7bYzSh?=
 =?us-ascii?Q?X9b/OBHpqImd22LAdM6fx2KcTFb/603WKmGrnyHQPJePcvHgZvQ3Iyl65j3d?=
 =?us-ascii?Q?3NkyzcGMtxaAxcw4DfxnWx3F6imqQ4v6syF29OgRecjt5BaToSwSnxrOeX0E?=
 =?us-ascii?Q?us4lkqbSbT7xmkuwYxP0pt5loFlpVQ12dvX9c9sDsEHkaWoB4Hk7C7BZQw2j?=
 =?us-ascii?Q?+PAW2p3fqyKZx2NzLVqBnhKmvgMyPYY=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a997d9fe-ddd3-4d9d-dfd1-08da1349d957
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 19:08:32.8332
 (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: g9bd6sMIoOcVEPEEe0xDRRB37FEvIGqZyOFQEJqR2PRUJfe+E43SMWrjF1GBrdddjJwviNBg6DLVLSpYmY9Jjp6N1kIgbfAKIAh3ILPoL6U=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR10MB2529
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.850
 definitions=2022-03-31_06:2022-03-30,2022-03-31 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0
 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 bulkscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2203310101
X-Proofpoint-GUID: 8tdz1qk_txRsRJC_kzKDbkC1IrReA91I
X-Proofpoint-ORIG-GUID: 8tdz1qk_txRsRJC_kzKDbkC1IrReA91I
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham 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

Some callers of __dentry_kill may be killing single dentries, where a
cond_resched is not strictly necessary (and may result in undesirable
sleeps). Add a check_resched flag so the caller may request that we
do not call cond_resched().

Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 fs/dcache.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index 93f4f5ee07bf..b1480433ddc5 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -575,7 +575,7 @@ static inline void dentry_unlist(struct dentry *dentry, struct dentry *parent)
 	}
 }
 
-static void __dentry_kill(struct dentry *dentry)
+static void __dentry_kill(struct dentry *dentry, bool check_resched)
 {
 	struct dentry *parent = NULL;
 	bool can_free = true;
@@ -619,7 +619,8 @@ static void __dentry_kill(struct dentry *dentry)
 	spin_unlock(&dentry->d_lock);
 	if (likely(can_free))
 		dentry_free(dentry);
-	cond_resched();
+	if (check_resched)
+		cond_resched();
 }
 
 static struct dentry *__lock_parent(struct dentry *dentry)
@@ -730,7 +731,7 @@ static struct dentry *dentry_kill(struct dentry *dentry)
 			goto slow_positive;
 		}
 	}
-	__dentry_kill(dentry);
+	__dentry_kill(dentry, true);
 	return parent;
 
 slow_positive:
@@ -742,7 +743,7 @@ static struct dentry *dentry_kill(struct dentry *dentry)
 	if (unlikely(dentry->d_lockref.count != 1)) {
 		dentry->d_lockref.count--;
 	} else if (likely(!retain_dentry(dentry))) {
-		__dentry_kill(dentry);
+		__dentry_kill(dentry, true);
 		return parent;
 	}
 	/* we are keeping it, after all */
@@ -1109,7 +1110,7 @@ void d_prune_aliases(struct inode *inode)
 		if (!dentry->d_lockref.count) {
 			struct dentry *parent = lock_parent(dentry);
 			if (likely(!dentry->d_lockref.count)) {
-				__dentry_kill(dentry);
+				__dentry_kill(dentry, true);
 				dput(parent);
 				goto restart;
 			}
@@ -1198,7 +1199,7 @@ void shrink_dentry_list(struct list_head *list)
 		parent = dentry->d_parent;
 		if (parent != dentry)
 			__dput_to_list(parent, list);
-		__dentry_kill(dentry);
+		__dentry_kill(dentry, true);
 	}
 }
 
@@ -1645,7 +1646,7 @@ void shrink_dcache_parent(struct dentry *parent)
 				parent = data.victim->d_parent;
 				if (parent != data.victim)
 					__dput_to_list(parent, &data.dispose);
-				__dentry_kill(data.victim);
+				__dentry_kill(data.victim, true);
 			}
 		}
 		if (!list_empty(&data.dispose))
-- 
2.30.2