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: [PATCH 2/5] kernfs: Change kernfs_rename_lock into a read-write lock.
Date:   Thu, 14 Jul 2022 10:22:21 +1000
Message-Id: <20220714002224.3641629-3-imran.f.khan@oracle.com>
In-Reply-To: <20220714002224.3641629-1-imran.f.khan@oracle.com>
References: <20220714002224.3641629-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?uxMVFj72Gyl43NB5vf3rT4E/hb9wEHvHFWyWP1Qb076yUVS3y6C7h45NCY+e?=
 =?us-ascii?Q?QpLtUGy9KNVtFusrsP3bYrM82ogZsishUZv+QWRn3MOr5opaUQe/kicmC5Tf?=
 =?us-ascii?Q?2xpTiBRWFWnBgyU3Z+gVIaxY/dq8KQqsFHzDWDeXT4DdlNPV79G1i1qYBwGF?=
 =?us-ascii?Q?0P0rLX/Xbxfwl+zTx61QqAHf1pJhLH1kyIm6l0rikU3TvogU982kqlX1ueTG?=
 =?us-ascii?Q?xEDso9WGjsCEgGS+8mvCKj5XcPCM2Ji5iVB08T/FAKnWVB9qPSB7VP0mbnoA?=
 =?us-ascii?Q?iOPMu+aQjyFUc305DfU1LiO1P+cyx8os+hTpKF+BCAU+5vkGfEV47rH4qc5I?=
 =?us-ascii?Q?TwsPinaJX+d84kTF7Z3bD4rTovbvGYz7kSjyaFoVo8UBgkx6nU5+5Hh3anO6?=
 =?us-ascii?Q?e6N1T+VjnItBPEFv3CuOefYHdizwznexQPShnjTFvLuHtrjHyL7JD4MNxje8?=
 =?us-ascii?Q?V56BaDe5fNC77epBD5VY0XLLUuUiW4MOn3CvPcBXmYsIuLh3Fhm52aLRxqCG?=
 =?us-ascii?Q?lrA97VjpLpyBmD9QImLJ8sFdAEU4ZREk1Ppq+4G+RxD3rF21LEaye5mSoead?=
 =?us-ascii?Q?6iw5DiokCLsX7AXCiKvW9LScpAdCYgUeLgBxOS0EAd0LC9wTiittLPoV59JW?=
 =?us-ascii?Q?9CQx7k7IfKJL49imeKe05Sm9DSA4PMm8mPKbtUcSKDUrcxAi6e8y56j3Oi5S?=
 =?us-ascii?Q?d0j//jIvWJL0MlWxISBPpVQZZKfb0RaYptlBQXD4LnUOKuo4yWHcLg0yRu86?=
 =?us-ascii?Q?sooDrKpRtpaAXAOVGRacwRob6tjvOCQNGO4Om57xyRlSv7LlIt3yALPn6em5?=
 =?us-ascii?Q?9bm+YIP1lyYj49Inq05CucfUtxu6g8VqhndhMAzYBS8uuZ/WDdCiVsOf/Itz?=
 =?us-ascii?Q?b4qnehSH8JwZ4ppUqfBEGe/5O7EaoeMFiC4pSudh+2ERTMVxz6BbmgihWmIb?=
 =?us-ascii?Q?yTHCa/D6sTA6INgQHriHKtddAGc4kID1WPgBZJMqKIDQSH32bHjptNXOGh+b?=
 =?us-ascii?Q?2Iyrr518PTSxNJ7j2X+KhPTFYrOrtBa6FvA+6k1hgASuV8rXtHQRjBuHWTui?=
 =?us-ascii?Q?8q6/Z8ITkegUcsvvnKJwK0SC9HLD3YoYm0oPLPL3xGBxKgYnc7fZsmfdgb7B?=
 =?us-ascii?Q?u7IYyBdjd+nMIBm1kULvad2gWjw14gf3iKvG3Hrah4UF4En4AYNW/eDBQspY?=
 =?us-ascii?Q?dAUgMpuGn/Hb0/r7ylYEyKsEUmER9XolG4pxi9WfrDmyAJy6ylMo/jQBf00/?=
 =?us-ascii?Q?QxvmbH3E8MOwKfIp6W/ovq6me0I6KDc7piiUdJimRLWq7cbXJa85X20dSazk?=
 =?us-ascii?Q?9uNKjEah5upMCfks/lamDd+jbWD1jeKNcJ3kW2Owx9Xg/lmUf/2dCwy9UqgI?=
 =?us-ascii?Q?3X7fU4F2TMvO7gEfgZ8d4av++x+U8yIa3nPmKIQqnsUbnaIN1wSMhV4PfUoJ?=
 =?us-ascii?Q?zD1iFZ/2FkE8t1WYn0QwevmEiIC+KyCq36iMLw7j+RZAU4G7D7Uu0AN/4SyR?=
 =?us-ascii?Q?1lMmZyDh5S+KbUmsRWKx6iNUh8ihrSUgx5W+EU746dc2Y8IJrXNzqFcXmE71?=
 =?us-ascii?Q?xYmyYgh8ip3pChy1TGIm+/OoBV+pwTKgWungu0fcnaFQrqbVwrRji4GuUZlN?=
 =?us-ascii?Q?jw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45d57b91-0e43-4a4c-38df-08da652ef618
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 00:22:39.9123
 (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: 6l3IC+0DLzLNKqCrXVVyPxSmA3z4nHnD31r4WJx1h+FBoAk1ryuaE0itbqqqJmGeZXYj4GjSoSjU7QvPwPOfmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-07-13_13:2022-07-13,2022-07-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 mlxscore=0
 suspectscore=0 adultscore=0 spamscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207140000
X-Proofpoint-GUID: Dcip7RxgpWO6njo_gpdYMKEHTCxIcNnq
X-Proofpoint-ORIG-GUID: Dcip7RxgpWO6njo_gpdYMKEHTCxIcNnq
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 45e1882bd51fb..d2a0b4acd0733 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