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
Cc:     gregkh@linuxfoundation.org, akpm@linux-foundation.org,
        linux-kernel@vger.kernel.org
Subject: [RESEND PATCH v7 5/8] kernfs: Use a per-fs rwsem to protect per-fs list of kernfs_super_info.
Date:   Thu, 17 Mar 2022 18:26:09 +1100
Message-Id: <20220317072612.163143-6-imran.f.khan@oracle.com>
In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com>
References: <20220317072612.163143-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?qhN5PC4ud7KKpG4kbCGinVDkUL44hvyUtqE80wkYbeU/rak++3nPdjmRvmei?=
 =?us-ascii?Q?s+i5E5GEmpFaC6lqKlwuFcozLjm5qfGQxCW7SyWzIUDTKN3BGOjRIPOSH923?=
 =?us-ascii?Q?9IoOGtkkITA/+V0VCbNxk9CzQQSC9fg/I3m3RhmYloJXHkb19p1SCsiR6pJX?=
 =?us-ascii?Q?xewk09xKi/tJVi33YGgP3Z1ao+XnygenXTNwaBpi1n8wUshlvSFJSKny8Leb?=
 =?us-ascii?Q?lUTJXHE9lr/7OdlKXd3mi2GKpfxzXhAc5pNDZr8RAHJQln+leqlubj6gQRQ2?=
 =?us-ascii?Q?w2x/QZA8xMouzocjClXntfELv3jCYlQ5IhAUWnHUlufxuP7+th60gHEK2n/I?=
 =?us-ascii?Q?dUjI5BKPXsmK/ovQ5uB/hObE77au3nDCMJpFQMxi8u9YkOtHkQqYcQSecpW0?=
 =?us-ascii?Q?f/tIxm15a7iNCYg+qMTME+11hTpjeAgy96sUrvHQanpWMJHLdeBekSy/lbRD?=
 =?us-ascii?Q?b1eaNrMZRe8tQKFSyX/1VXvhrEgPs9oCmb5qoZqE3SXkEdbcPB+cHLuhtccB?=
 =?us-ascii?Q?eYe6hDTrR51ryl+nvWFKvLfJlNL+KE1YUt8DfsMnwq8onlCizQ0V3iX4GPB1?=
 =?us-ascii?Q?7LtglFYiN6kjC0ogoUc5GIRK/SOenx0GGikkwtsg3FHXFQEjXwngw2Y8xFgS?=
 =?us-ascii?Q?gWppkabS9wOOa1WMsBXai4kIb6AuSpnc4SnYva42fvUffQussJUcMf5mod5h?=
 =?us-ascii?Q?RnoXTv1LTT/Dr+swa2Rmp1wet59H2aVAk2Vetag00WaJgYUHwNs7hmFtUV5N?=
 =?us-ascii?Q?IQly4EHjNeHbUZndNSaE4xNgdedENFgpgCXG/OfRO7tjf+i8dCYDA3H2P9vH?=
 =?us-ascii?Q?4anef04vRYVE++2jubsFsfy/S4ftvnRzbQ2mF+u6eYroFYJwU8Vvkh1rjqJm?=
 =?us-ascii?Q?1QfNNWjJczLlZMDpuzYh2GXTsxiRpTunLL+y/2kTcz8Ur7b8PXp+kG+R9d/m?=
 =?us-ascii?Q?p1bmgWp10qBm3ir9W1CDI05mxx0J+cMAZh35Ju9n+IKGXltjOpjUqCys64GJ?=
 =?us-ascii?Q?EoEAQZ9shHfzaOxMjmnXzVY2Vsw6w6i90NEixIGuUwhJrthzGVB4yOvhrMDq?=
 =?us-ascii?Q?2YUIZmb3PwCkjdlR/EuqTNFlFV7mTtDuTJ4/61kNkrjKUzHfxMWtARl0KZTr?=
 =?us-ascii?Q?szaDdC0Zf9g1rK/vl7T9FzyHMIS3CuraznxK6Vyu0h2Ve1pyuaV8AJVAkXp1?=
 =?us-ascii?Q?E0a1vIIWdo4iFz8pI62seb5cbNquhkQiWRVRdIkEoDqU6wD1h0BLE/lerMmT?=
 =?us-ascii?Q?efjKy8aVz9breVqMXjUBmYyuUChTkfNVuo6ZuzHQa1A6zM3MIZzO+gseVUKB?=
 =?us-ascii?Q?uc03bo4IncWdentXcKqXf3IoM0/ptYkfBuT3B2Gk1FX4p6N73ffQ3+hFNj+G?=
 =?us-ascii?Q?7jrRaApikxINppcCbTBRfMZRj9/+AqnqaVW+YGSpUTreEJ4XmGoeqnANizXz?=
 =?us-ascii?Q?PsZoyPaBAGO5S989/klkouNM/Zislp//s2djdrJHa90PiXMtYI79tw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 90972759-7b9a-41d3-9896-08da07e776ec
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:34.2444
 (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: cikg3ytatxaaj9wx9eLmjE4WSDpjqhTiaX6a2wdPuMAqOmzGE9tGVjjyYzE56umdgSiT66nwwhwF2hIvVFSQKg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3067
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2203170042
X-Proofpoint-GUID: 1xu4gxu9_iuBgM3bgUZO7bTY6qQ33CQ5
X-Proofpoint-ORIG-GUID: 1xu4gxu9_iuBgM3bgUZO7bTY6qQ33CQ5
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

Right now per-fs kernfs_rwsem protects list of kernfs_super_info instances
for a kernfs_root. Since kernfs_rwsem is used to synchronize several other
operations across kernfs and since most of these operations don't impact
kernfs_super_info, we can use a separate per-fs rwsem to synchronize access
to list of kernfs_super_info.
This helps in reducing contention around kernfs_rwsem and also allows
operations that change/access list of kernfs_super_info to proceed without
contending for kernfs_rwsem.

Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
---
 fs/kernfs/dir.c             | 1 +
 fs/kernfs/file.c            | 2 ++
 fs/kernfs/kernfs-internal.h | 1 +
 fs/kernfs/mount.c           | 8 ++++----
 include/linux/kernfs.h      | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 61a8edc4ba8b..17b438498c0b 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -917,6 +917,7 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,
 	idr_init(&root->ino_idr);
 	init_rwsem(&root->kernfs_rwsem);
 	INIT_LIST_HEAD(&root->supers);
+	init_rwsem(&root->supers_rwsem);
 
 	/*
 	 * On 64bit ino setups, id is ino.  On 32bit, low 32bits are ino.
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 95426df9f030..07003d47343d 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -854,6 +854,7 @@ static void kernfs_notify_workfn(struct work_struct *work)
 	/* kick fsnotify */
 	down_write(&root->kernfs_rwsem);
 
+	down_write(&root->supers_rwsem);
 	list_for_each_entry(info, &kernfs_root(kn)->supers, node) {
 		struct kernfs_node *parent;
 		struct inode *p_inode = NULL;
@@ -889,6 +890,7 @@ static void kernfs_notify_workfn(struct work_struct *work)
 
 		iput(inode);
 	}
+	up_write(&root->supers_rwsem);
 
 	up_write(&root->kernfs_rwsem);
 	kernfs_put(kn);
diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h
index 25c3329bd60e..6e6398a72578 100644
--- a/fs/kernfs/kernfs-internal.h
+++ b/fs/kernfs/kernfs-internal.h
@@ -47,6 +47,7 @@ struct kernfs_root {
 
 	wait_queue_head_t	deactivate_waitq;
 	struct rw_semaphore	kernfs_rwsem;
+	struct rw_semaphore     supers_rwsem;
 };
 
 /* +1 to avoid triggering overflow warning when negating it */
diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index 809b738739b1..d35142226c34 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -347,9 +347,9 @@ int kernfs_get_tree(struct fs_context *fc)
 		}
 		sb->s_flags |= SB_ACTIVE;
 
-		down_write(&root->kernfs_rwsem);
+		down_write(&root->supers_rwsem);
 		list_add(&info->node, &info->root->supers);
-		up_write(&root->kernfs_rwsem);
+		up_write(&root->supers_rwsem);
 	}
 
 	fc->root = dget(sb->s_root);
@@ -376,9 +376,9 @@ void kernfs_kill_sb(struct super_block *sb)
 	struct kernfs_super_info *info = kernfs_info(sb);
 	struct kernfs_root *root = info->root;
 
-	down_write(&root->kernfs_rwsem);
+	down_write(&root->supers_rwsem);
 	list_del(&info->node);
-	up_write(&root->kernfs_rwsem);
+	up_write(&root->supers_rwsem);
 
 	/*
 	 * Remove the superblock from fs_supers/s_instances
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index e82e57c007e9..9f0926f553fc 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -267,6 +267,7 @@ struct kernfs_root {
 
 	wait_queue_head_t	deactivate_waitq;
 	struct rw_semaphore	kernfs_rwsem;
+	struct rw_semaphore	supers_rwsem;
 };
 #endif
 
-- 
2.30.2