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:   Imran Khan <imran.f.khan@oracle.com>
To:     tj@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk
Cc:     linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [RESEND PATCH 2/5] kernfs: Change kernfs_rename_lock into a read-write lock.
Date:   Wed, 10 Aug 2022 21:10:14 +1000
Message-Id: <20220810111017.2267160-3-imran.f.khan@oracle.com>
In-Reply-To: <20220810111017.2267160-1-imran.f.khan@oracle.com>
References: <20220810111017.2267160-1-imran.f.khan@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?Lub3F2YIV0EKGBsQ5TjdXHZQL0fC+7aMem+K7vEE7UkdjO6oeILXM6Oq3bnf?=
 =?us-ascii?Q?iU1g05qAL6UWe6e/zBbdvN+RBpRXmRjnLJpO3L7Q7JRZFjX8EW9wFBU5kc5v?=
 =?us-ascii?Q?FFmIjblYW/nslwawMKronEkxdESr5+Ky/MsWTJteD+jIdlNo+GtG/8J2mHv3?=
 =?us-ascii?Q?PWoI5TrnE4UJBrwfp6ZJYv+OQ7XdZXPsiE8OPqhlzvAdCBFJYK8gPvO7qI/k?=
 =?us-ascii?Q?EcR4f9Cdugy8T7PN1C3FBB1jLpUeJaHJndPuarWD+kdLG2tlCT1RHTdiT3R3?=
 =?us-ascii?Q?XiKB7r4HuvRkxbZTUAYYal3/xpFtwy7GYdgX/jAcAn6txCs7NTGRps2OdncF?=
 =?us-ascii?Q?3w8wkCxuWn7GF4JSXoaav5Z6fVIiH0/lvSJalNB+KPgQX5WdFAlavNmcB2D7?=
 =?us-ascii?Q?4Dd5xzzlHXUUFaoDS9Tk15nYAPE1q4xK6XkF9vYnX8Tt8DIHzUYexaQNH7Ql?=
 =?us-ascii?Q?hz3Q9KQ1oLGaaxG2e3z66kLKNkj+NLM+c/Gv2ql5QLlTVcqqBtTfK+jZyLVs?=
 =?us-ascii?Q?EKfFOF06b8x1vhnnvYs5+wMwceF3W+kWcHWv9erFvMLM6vh/2l/q4di3nMVe?=
 =?us-ascii?Q?dvfATTcZ/kuyr7c+ehGkvqAM0aLJYaKM7kgGnr1PgAxKlE+doV+r0ZSfwcBQ?=
 =?us-ascii?Q?weJCM+Fx3uqLNklGVvXHZYSERS05UAWDOtBuf5TPDtbYvaI1CpcmFXVeLKle?=
 =?us-ascii?Q?fUY5K1iOmpLqgdwB8sZLVGZzpZ1Lxb3tYBuqr/TgQvmn9yGeRQu5oc8mXk0x?=
 =?us-ascii?Q?0FdG1JPxtTaFtxGBsnl3Z7rm6UP3okyHX31fVaSk+0ZrYasZnucvtn0nS2ZM?=
 =?us-ascii?Q?wFDioy6/Evb8x+kR4VgaWSBXjYUKEKP7YTtcmM/Bvc4+HCE2wy++DNbMHg+y?=
 =?us-ascii?Q?hJ8bqlqD+LiIogXBb4VGET5JdVwdWIUm0wXgTtEHWAC8W4kxcuNpblQVPIaT?=
 =?us-ascii?Q?lLt+EPL6wZrA4NVwQ6X785izSCAV/31RwQKnbKUUP7wRzUf1NovI1K7Elkql?=
 =?us-ascii?Q?i2ncI6halZJrsHkTTpsh8N4lv2UECrOt908GO1pNnF0erjn893fVaJcA24n4?=
 =?us-ascii?Q?+gIxizOd7rpJx3mr9IZU6nzYXHznFnGYMJ5PqTSsB70GINYF8eOeRUW2pjVl?=
 =?us-ascii?Q?Rt1LKkdnCjh+ics+6vEhERawxvqVlkIPHsTYPQ0bdVtf1vwCudtl0jZMkkAW?=
 =?us-ascii?Q?4Azh84760wDJqlMBKeza9aNYWNGVG7mBSbkr9o3+ApkMMcW5jenaW2+mirgU?=
 =?us-ascii?Q?hGEz02Hq/+Ran98pLBqlvilRkTu0mhl+vTbxI2mjQiIB+KPj6Tyn6wrSAY0G?=
 =?us-ascii?Q?4r6xn/mwj8yvEm8Nz4pKvGLEh8Tq1cAtuNtoghIuuqP/FyIcEZYW8O88Ex2X?=
 =?us-ascii?Q?Yr7c4nBXVmEnThjMcLniB8trR6zKkLQYUueozlxY68ig4Cj/wD3BDuilh164?=
 =?us-ascii?Q?+i8F54n8EQALsQdIuvZlUNXo804fSUyDF/VWNgQuYol1BIxrvgOjRmPrAzrV?=
 =?us-ascii?Q?BiO1mFUUrOQn5H4uH6YmgfPVeEoPrWlIea6guXTRrFTxTZuyF4/taFbT85RJ?=
 =?us-ascii?Q?x2A9sEu4B+Ke0unkzszHuBF9J+5IP40w6CfLqvjvMo9WOVK7RpEQsDCTrlIA?=
 =?us-ascii?Q?Uw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 755f95cc-c148-46bd-1f0b-08da7ac0f159
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2022 11:10:32.8899
 (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: fi7EScctoDLqXyjC9zbU4jgxGcepZVIM0ggYKjdue4KRClXxQWdn/WksSpkK6s3eDJ31AbYim2unGubXxaSvhA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3431
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-10_06,2022-08-10_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxscore=0
 adultscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208100034
X-Proofpoint-GUID: FqLJYN4rvNhPGRourCnCpbGao5laxq25
X-Proofpoint-ORIG-GUID: FqLJYN4rvNhPGRourCnCpbGao5laxq25
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_H2,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

kernfs_rename_lock protects a node's ->parent and thus kernfs topology.
Thus it can be used in cases that rely on a stable kernfs topology.
Change it to a read-write lock for better scalability.

Suggested by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
---
 fs/kernfs/dir.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 45e1882bd51f..d2a0b4acd073 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -17,7 +17,7 @@
 
 #include "kernfs-internal.h"
 
-static DEFINE_SPINLOCK(kernfs_rename_lock);	/* kn->parent and ->name */
+static DEFINE_RWLOCK(kernfs_rename_lock);	/* kn->parent and ->name */
 /*
  * Don't use rename_lock to piggy back on pr_cont_buf. We don't want to
  * call pr_cont() while holding rename_lock. Because sometimes pr_cont()
@@ -192,9 +192,9 @@ int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)
 	unsigned long flags;
 	int ret;
 
-	spin_lock_irqsave(&kernfs_rename_lock, flags);
+	read_lock_irqsave(&kernfs_rename_lock, flags);
 	ret = kernfs_name_locked(kn, buf, buflen);
-	spin_unlock_irqrestore(&kernfs_rename_lock, flags);
+	read_unlock_irqrestore(&kernfs_rename_lock, flags);
 	return ret;
 }
 
@@ -220,9 +220,9 @@ int kernfs_path_from_node(struct kernfs_node *to, struct kernfs_node *from,
 	unsigned long flags;
 	int ret;
 
-	spin_lock_irqsave(&kernfs_rename_lock, flags);
+	read_lock_irqsave(&kernfs_rename_lock, flags);
 	ret = kernfs_path_from_node_locked(to, from, buf, buflen);
-	spin_unlock_irqrestore(&kernfs_rename_lock, flags);
+	read_unlock_irqrestore(&kernfs_rename_lock, flags);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(kernfs_path_from_node);
@@ -288,10 +288,10 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
 	struct kernfs_node *parent;
 	unsigned long flags;
 
-	spin_lock_irqsave(&kernfs_rename_lock, flags);
+	read_lock_irqsave(&kernfs_rename_lock, flags);
 	parent = kn->parent;
 	kernfs_get(parent);
-	spin_unlock_irqrestore(&kernfs_rename_lock, flags);
+	read_unlock_irqrestore(&kernfs_rename_lock, flags);
 
 	return parent;
 }
@@ -1650,7 +1650,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,
 	kernfs_get(new_parent);
 
 	/* rename_lock protects ->parent and ->name accessors */
-	spin_lock_irq(&kernfs_rename_lock);
+	write_lock_irq(&kernfs_rename_lock);
 
 	old_parent = kn->parent;
 	kn->parent = new_parent;
@@ -1661,7 +1661,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,
 		kn->name = new_name;
 	}
 
-	spin_unlock_irq(&kernfs_rename_lock);
+	write_unlock_irq(&kernfs_rename_lock);
 
 	kn->hash = kernfs_name_hash(kn->name, kn->ns);
 	kernfs_link_sibling(kn);
-- 
2.30.2