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, viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org,
        ebiederm@xmission.com
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH v8 07/10] kernfs: Change kernfs_rename_lock into a read-write lock.
Date:   Sun, 10 Apr 2022 12:37:16 +1000
Message-Id: <20220410023719.1752460-8-imran.f.khan@oracle.com>
In-Reply-To: <20220410023719.1752460-1-imran.f.khan@oracle.com>
References: <20220410023719.1752460-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?sQ7Jl2wmVRUVKb2G/gx/449cGvqKNV/q7b5npICieQxhQGWzAxO7WBiPU9rB?=
 =?us-ascii?Q?NEfa0LMMxDosC42dRVBWj6kRkEhv8TG4ur+q4Y36oGEStG3mp8t2i9CXKW7g?=
 =?us-ascii?Q?iVfXzhP+Oh6qGp3UjTtrOlgM0tgXs3CSqrw69fdSD4y6Ms0T+4+aN668mFUQ?=
 =?us-ascii?Q?NqGNb6BQRA0n0Bs2RaabTSRVpCJ7isPAPPzfjlYa0HjE6lmmK5reyjhb++AI?=
 =?us-ascii?Q?lWobtrpIlpxCNjq7HoNjTviLDgYX2WSPns9FD1fl8vwsAFsGbRMfTe2WhFY7?=
 =?us-ascii?Q?R492qpkFCBmNbGoRu3WNyvya5eyz4qkDZL/j8VjazrNw8KTK6AaqZ5F3NdV0?=
 =?us-ascii?Q?CS8QCH/sx9TNz0fk5hdlSZeVWpu5+cuX8zdJswGwGKLucymImXrv2zxwptAC?=
 =?us-ascii?Q?v+vpTJqQ1jsxJtSMmfApfJe2rMn8I4mhOTw8Me9UXzIrWKo168Bl8yqUCzjL?=
 =?us-ascii?Q?TgXP2hPdwYBbVCxQF+pU+73uNVybwToxsbC8nGS07Ezv9y0L6kyYlz0mnDHw?=
 =?us-ascii?Q?aaVcQLHTmX+cikauas3ZyZ/DupCogvSeXaqWg3pv6BbPAduYvJ1siAVnYBen?=
 =?us-ascii?Q?6NeGlXL4ztuMx9T+bC5GvkimUAcDbbbXoqeXdTJ++0Z5CQ1Rm8PhOQcYx7zd?=
 =?us-ascii?Q?cuHk4qCX/dGcIG5TWQYZJAZput87GCPUve2K2plbHisT9pKKl4Di8bZgoJDH?=
 =?us-ascii?Q?pjIr6lFeIl9WzUk6yjTB3Zj7B3LGML/a0D12yiRcAJghnk6hivzIqLPwKALi?=
 =?us-ascii?Q?tRsuSabZA1b1N34tJryPRYrhgsAGb33IXD1seCr/Xdghdsc05X4vO9cAhfNo?=
 =?us-ascii?Q?dW5c6TUxHrbkNoYEjCs/289zhYEomkJCUEg6LkID/I1WrOeIX/oFKfvjwuXs?=
 =?us-ascii?Q?rhv1Zw62Zo2IQduvwti8DzikUDxC4UzZNI5eKSOfU8gx+nNN0pxz+jBNyZTg?=
 =?us-ascii?Q?mu8RCg43FwAhrvwQCavxAckXyjAk2GUSw4G2y/kpYDXoxdzqyqrS9ZAKUJ76?=
 =?us-ascii?Q?b+Ycw8u97TbN/qb4fBwSAT4npTo0G6jktWLLFCB+dpsqQk2VOAoqlcqAHr+Y?=
 =?us-ascii?Q?oeUU5eD1Sv1PiexmHL4P7pyPo0Gb+VZmlM4jNhW1VBXOJZ5vBxDMvs21xwFz?=
 =?us-ascii?Q?ux+hjl9q+8h3cxKqnxcp0Stf6s7AvJ1qcGeGI+1FpQg75/pq75QtQIz0w/Oz?=
 =?us-ascii?Q?1lzp6Kjxcpy/Dlkex6nBeoW+X2h3zd/BglEL4NifchDuEdGPFLKA1zpwjTC6?=
 =?us-ascii?Q?nQU+395kMqbjy4sbUOXtP5DrysRvYTAn1sAhbSvLl7IejMEyRlxR+Gkr5fv0?=
 =?us-ascii?Q?ACsZfcJYHilnMzFPoojy60QvOj24tJ7Ay150E7yR9mAXlLy/xlteOQkgBVcq?=
 =?us-ascii?Q?jT7w6yjLffxq9kyPwtZAeFxc4LbYNj3VvvrHSoF+HRS5S7V6yttwRR/W2N1d?=
 =?us-ascii?Q?RCEIU8SYw0nQtoTSpsfcpQJCfgQIrl9WcWkxyozlcG+CUyDgLzB/qvBRMcFf?=
 =?us-ascii?Q?i+QA7eaLYLxaAxudlFpFxSXOTe4ujARkvMhUJpzUtQdqYDLe826uNNTyfGDS?=
 =?us-ascii?Q?UmwPA6MGV048Zt1kqq0+TElHbhLdjgzY6+FZh5XECQygWTEe0gl6TObC3Hbn?=
 =?us-ascii?Q?tgO7uWiZT5h8Pe68txmrkQwfqJ8Sk/zZhBC0QZnnGfiKubTH0KpTT4Fq2zAJ?=
 =?us-ascii?Q?ZgdZ9lF3Cmj3ddTKCb4qQX994bUKf3AYkNbTGtFIWp1tDA42ckVYlCH8L2fK?=
 =?us-ascii?Q?09zNa2TZ+s0jP0hGKa93C1HYIju4d0s=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 008d125e-a24c-4cd3-3173-08da1a9b18bf
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2022 02:37:46.5033
 (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: EAdMZKuwHV64e4pjwYNKB654e3rTbeHFNbjZxlhceufC3F6GWw6RezlbXMWgy09oI5wmdhDjcprTjaaH0Zaecw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1238
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.858
 definitions=2022-04-09_25:2022-04-08,2022-04-09 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 adultscore=0
 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204100014
X-Proofpoint-ORIG-GUID: bdOGdnNfZvs_eG_uuecm9uXmU3pkXxgo
X-Proofpoint-GUID: bdOGdnNfZvs_eG_uuecm9uXmU3pkXxgo
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

kernfs_rename_lock protects a node's ->parent and ->name and its current users
can be easily divided into readers or writers of ->parent and ->name.
kernfs_rename_lock also protects a static buffer (kernfs_pr_cont_buf) which
is used to hold read attributes (name, path etc.) of a kernfs_node and we
can maintain this functionality by accessing this buffer under write_lock.
So change kernfs_rename_lock into 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 | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 17b438498c0b..8e8c8b2c350d 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 */
 static char kernfs_pr_cont_buf[PATH_MAX];	/* protected by rename_lock */
 static DEFINE_SPINLOCK(kernfs_idr_lock);	/* root->ino_idr */
 
@@ -184,9 +184,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;
 }
 
@@ -212,9 +212,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);
@@ -229,12 +229,12 @@ void pr_cont_kernfs_name(struct kernfs_node *kn)
 {
 	unsigned long flags;
 
-	spin_lock_irqsave(&kernfs_rename_lock, flags);
+	write_lock_irqsave(&kernfs_rename_lock, flags);
 
 	kernfs_name_locked(kn, kernfs_pr_cont_buf, sizeof(kernfs_pr_cont_buf));
 	pr_cont("%s", kernfs_pr_cont_buf);
 
-	spin_unlock_irqrestore(&kernfs_rename_lock, flags);
+	write_unlock_irqrestore(&kernfs_rename_lock, flags);
 }
 
 /**
@@ -248,7 +248,7 @@ void pr_cont_kernfs_path(struct kernfs_node *kn)
 	unsigned long flags;
 	int sz;
 
-	spin_lock_irqsave(&kernfs_rename_lock, flags);
+	write_lock_irqsave(&kernfs_rename_lock, flags);
 
 	sz = kernfs_path_from_node_locked(kn, NULL, kernfs_pr_cont_buf,
 					  sizeof(kernfs_pr_cont_buf));
@@ -265,7 +265,7 @@ void pr_cont_kernfs_path(struct kernfs_node *kn)
 	pr_cont("%s", kernfs_pr_cont_buf);
 
 out:
-	spin_unlock_irqrestore(&kernfs_rename_lock, flags);
+	write_unlock_irqrestore(&kernfs_rename_lock, flags);
 }
 
 /**
@@ -280,10 +280,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;
 }
@@ -824,12 +824,12 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,
 	lockdep_assert_held_read(&kernfs_root(parent)->kernfs_rwsem);
 
 	/* grab kernfs_rename_lock to piggy back on kernfs_pr_cont_buf */
-	spin_lock_irq(&kernfs_rename_lock);
+	write_lock_irq(&kernfs_rename_lock);
 
 	len = strlcpy(kernfs_pr_cont_buf, path, sizeof(kernfs_pr_cont_buf));
 
 	if (len >= sizeof(kernfs_pr_cont_buf)) {
-		spin_unlock_irq(&kernfs_rename_lock);
+		write_unlock_irq(&kernfs_rename_lock);
 		return NULL;
 	}
 
@@ -841,7 +841,7 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,
 		parent = kernfs_find_ns(parent, name, ns);
 	}
 
-	spin_unlock_irq(&kernfs_rename_lock);
+	write_unlock_irq(&kernfs_rename_lock);
 
 	return parent;
 }
@@ -1635,7 +1635,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;
@@ -1646,7 +1646,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