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 1/5] kernfs: Use a per-fs rwsem to protect per-fs list of kernfs_super_info.
Date:   Wed, 10 Aug 2022 21:10:13 +1000
Message-Id: <20220810111017.2267160-2-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?N9BcnBl5EXDjne9eKIK3w5DHsDTVkI+gZWv8+w7wcwQFNidsfHxcdpxUTZnO?=
 =?us-ascii?Q?lW2ky/4h9c3QGBYR4bsyH0HQS38U2wOijBi4TX8Q6jK9RaHh6XbqzoQp+QgP?=
 =?us-ascii?Q?lJcPkWTCNOU6M0bx+Z/GjJzJ6TZpNBccXyP4uKlerIWimXgMIZcdphCZd9tq?=
 =?us-ascii?Q?pNhlVzBiKYw6BwnhVUk+M9GacBl0QUjudAgpFsb9BlI9/S4MaLXfNPFRz8ZO?=
 =?us-ascii?Q?WUtWY0jR43iiQPkb55L7SFn4kjOr685XPk8it/9BvcEUQUdKq1hkf4jZJfP0?=
 =?us-ascii?Q?DZWcNdTadtqy/a/uMoBzBFZijy1RHicczVk8zlIebYvAA3P7DTok5Lbx0VRU?=
 =?us-ascii?Q?EieA1b9gtet2JvccKU823PmXk4JMPKITh8eWigy8AgQWy77Hc9sj/+vaEfc6?=
 =?us-ascii?Q?E18F0V06IozZPfD7wsP+LSIPDbX2ncZXcj9GqGu9lYvxyRocfQFA3BcxFjQm?=
 =?us-ascii?Q?v/iTjfyonG4A3vYEFCDkn2+2uL+Z6JLj/rQuP8A5RU5rlrQLqtXfAthBLs6V?=
 =?us-ascii?Q?bbq29Y5lxl+zfP39HHunN6wFinnV8IJMyWITRaEgGAUP0sY0y5g/nC+54PJb?=
 =?us-ascii?Q?LXuRFxXa6WtdANyKN//g5zy4WM3IdkOTNcjFwAIFPS2Zp6i8+Ds1HImKtH6Y?=
 =?us-ascii?Q?k4GVE0TY7XMlhHPMto/IPjLvdVUtnPNowkqhOiH2hLuvjo24C80dEqfDgY/t?=
 =?us-ascii?Q?3c38xaB8gvs4sqvm1IUbsUtUUy+KUCtOEkv2Q4SC3MI0c8WMNczZBjuXMyOZ?=
 =?us-ascii?Q?Dhaz4JQfat54EYK5nziWYZewEslaSN2+F2AqzVbyrF7RuDM0FRsx1rP6ACcN?=
 =?us-ascii?Q?Ye9xBCx0B8ayIwBDbi/94179P8dj1nKE63Sd71TeGI7gabAfH5ku+ZGQrxMr?=
 =?us-ascii?Q?//T9Pz5seunXi1SJs55JnE27OmWOQl4ABv6RelalSX8JTy8VQjlhmSKuTqym?=
 =?us-ascii?Q?ie+lGNVBjsga6cilyi1OiI8hN2o5bJuZnT3EzNxbp7CQwthkmFaiWbr3xT/H?=
 =?us-ascii?Q?wNZB8eY6IygptGc7OmvOm4n2Vf273cCadcl37ukytr2oXZaxQ1hLytFhJzAl?=
 =?us-ascii?Q?WKgyyvqxbzevEa5pdtpP+Ns4/qpny5AWmNuSK3WXxdLHwxASi45hCilxE1GI?=
 =?us-ascii?Q?KdeYhn006hOLJYBBAgiJezYJl1Qm4NTW7xtgVc8B8+elfJJ4hTsVK4UR9X47?=
 =?us-ascii?Q?OzxO2Jgc6+xYW9OKIk3XN3Q+aeU7t4x/XG7BMXsWEVKyCNu/ugSf+IQPuvpb?=
 =?us-ascii?Q?CEmyV/vmxqJ6EDyRHoaV/BbO3DPQ4nKv2L0ZttS8Um/KCkO6T3hpdqDPNR8R?=
 =?us-ascii?Q?gV9Ad3kctf8Te1k33fmjsc2cjJFvD60LCmPfDNjx1kAaLkCZc7nZF3VTf4yL?=
 =?us-ascii?Q?+HeXz9LqR0SoA/z+tUzTzqIhuKPDfZ1NGDfkQP867oWXWSqx1iBG4CoYnoNm?=
 =?us-ascii?Q?NTPuQmftRc2mdVSNXSSO4aDNhBV6FAIRWHjtoTQRrBZ+hCFX1ImtJvt7Rsjj?=
 =?us-ascii?Q?4yePY4DTP6Nro6xY7toOOGk9j1euZBVjONj3aeBOY0TtbkaNr4O6nV7gKnrG?=
 =?us-ascii?Q?QRT7SFE19U1gBJ0CGjB1UzvkLYeJn8xtJv2kDHLHxPpNTJsp6B3LMD4X+0tH?=
 =?us-ascii?Q?Cw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 327a1a9d-3915-4571-45d8-08da7ac0f03d
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:31.2014
 (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: oI9uk0bGRQ74ETpeSHdsvdbnUWmbFzKwMPTH3jyHgAkyIcUI5S0dewLU2qhYPGvqAXDQiMt4b432OSfl4LR31g==
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-ORIG-GUID: w5B6FBsvseLeYQcVW_U0ANWaK631u4oV
X-Proofpoint-GUID: w5B6FBsvseLeYQcVW_U0ANWaK631u4oV
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 1cc88ba6de90..45e1882bd51f 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 b3ec34386b43..812165d8ab4f 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 3ae214d02d44..3cd17c100d10 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 d0859f72d2d6..d2be1c304715 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