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 1/5] kernfs: Use a per-fs rwsem to protect per-fs list of kernfs_super_info.
Date:   Thu, 14 Jul 2022 10:22:20 +1000
Message-Id: <20220714002224.3641629-2-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?isN7T9dq8hJtdco9GktbeWTPJChnYRLxIyfQGung5uQT0Z2QpG8WCFikCtdg?=
 =?us-ascii?Q?Uhw6ovMv3ziL+DUHsxgdu68OyXwhICx5rNF51CR3eLAHtvX5bJt72IYfW9kp?=
 =?us-ascii?Q?WEn83us3hF2rRQLXLquGtSF5U0kO27/gbF0sTUoauGxUWdymjrzg4+GFqFYG?=
 =?us-ascii?Q?Ex53nYa9h/B4GDD2lKpmDYk4CO9lwP9wU2RX2fVyj4qMk5PrMHRMsIoUAubI?=
 =?us-ascii?Q?IYz9kQwbST2KHSivdnMN8Cwb2AWdiR2QKSj85pr5NYQkAy/FxPTqd4BFCelD?=
 =?us-ascii?Q?4Vp68zMwDs+A8W/Wq/WrZ8q7snGotx8lf0BfeB4dmIHgjmNzhwNc3eYxVSLk?=
 =?us-ascii?Q?C5Fpt/ALFAc+8oTGF7fMlCv0wiylcpG7SYjfEfXJUQqW3ltDu1UJA0owqZBi?=
 =?us-ascii?Q?Tu9iLpUpiFZWeaJtZiDq0HnfimaNeEGvJVwV171/qfDeFRpCJBTChmzzmF65?=
 =?us-ascii?Q?jpSCu0shBZMgqtF2VKGQs6wk+HQijC+MSuzvAsCKKtzT+kdh2J1flzQLMZmk?=
 =?us-ascii?Q?GoNeB/j3yNlZcntJslsdl9b9GVraD2KYYEFUJYfvY+bW/0JoDK6szGg08Hcu?=
 =?us-ascii?Q?QmJJQAgRql1VzWLFh2rxlRu7qrxp7BQzRjY2Yhzv01dUJluuYhfMT3WYHKCw?=
 =?us-ascii?Q?snY4SpzummtJNJwHyo8xgoRKR1uXBtqIRUhGi0EfKHeJA8hfCnRxSXfJjNEF?=
 =?us-ascii?Q?WWF6VBfgEK+l7RCa7A5oRBwyuUAXjQ/MamVu+CwN7lwIrjuhPc1t+YlasKE/?=
 =?us-ascii?Q?2/v7ODItOlPyNSqBdmfAGu2uRjRZlhntTDCa7AzVVy8txzOilUzGLxHvOzCP?=
 =?us-ascii?Q?3pllla+W5kncXIuITrKXH2QoHP59FzwWz/8eEArlK+DuG9cfhPCPFFnA5M0P?=
 =?us-ascii?Q?MxKNO0PvHiWQaVjuWhWC18MosHYWKyg7HOPC16oKtSfB4lRcGtLe3XfoHl6R?=
 =?us-ascii?Q?gRwESSnga6GnKOB5ex/targKAS94cN9Fze2k5iaG/9DgKUzLET0pQ5I9wiPf?=
 =?us-ascii?Q?uKGHqB7Q/H25ocsUWdnzZv5WkYL7RRpiIfuYXnml5yyFu5Z4vLTvxTqhQxW5?=
 =?us-ascii?Q?082KNGCbajcHnBn42ZIVe+sLMZh1SbBEQCmBIe7YtzzJz3qlJuMvv4vx4P3c?=
 =?us-ascii?Q?a7wYmnpvk15eshZX+dj8TrTw1gmRpFn4hArDnjfV55vbrLhxTpZ6d8Itd16Z?=
 =?us-ascii?Q?FaBXyTB+Db3X0ybriR+gRuR3twxR0eNp+EeAWHG7z7rVhyCqg/lUFtAERNH/?=
 =?us-ascii?Q?cgReYrn+r6rqVlgPnoU4RSLZzWL3DWcRkIC7lPIbaTGFc6KrUTlr8BHXi/Oy?=
 =?us-ascii?Q?Ut2CIYYJ/Rr5Bl7HiztMHB5Lkq9w3nG1hs6tw4S2Ub1eXrOLpRyRJqOK00zg?=
 =?us-ascii?Q?KX+MlbwG5S9qn4yVMgosok8uuHM6lUvRx+n9ZjsWDK9fIjcb0w4MR4wbyNtr?=
 =?us-ascii?Q?ee+Ly4WLuZrkTyMYSgt4UKFbxUf/+sLD24pnbT78/g+AEvPRiQt9givP+VBa?=
 =?us-ascii?Q?j3dn3a9T9hfVhjvdkaeU52CEXP/sApsshOyq+SB0XghTa41U4WPC1ROwzpk8?=
 =?us-ascii?Q?S50SYjwpffaOOHqHLkF/GnK0txQO62XbefX3Av+v6unc1AflaPJ/3dxIcWVX?=
 =?us-ascii?Q?wA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 488e2ba5-c316-4262-eef7-08da652ef4fe
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:38.1145
 (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: QLxelA0cFN4u0kcLv0wY8ivxKaPa86lIVQ0a/5z/YNe58tpLzNCfLynohplSar/2R3jVGb9KNkY0rkheN95pHQ==
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 phishscore=0 malwarescore=0 spamscore=0
 adultscore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207140000
X-Proofpoint-ORIG-GUID: 9lZeNpbxf_VgxmlarJpbgdx32stvyYPx
X-Proofpoint-GUID: 9lZeNpbxf_VgxmlarJpbgdx32stvyYPx
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

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 ++++----
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 1cc88ba6de907..45e1882bd51fb 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -924,6 +924,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 baff4b1d40c76..77c3e34a6c7da 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -927,6 +927,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;
@@ -962,6 +963,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 3ae214d02d441..3cd17c100d10e 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 d0859f72d2d64..d2be1c3047157 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
-- 
2.30.2