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
Subject: [PATCH v2 4/5] kernfs: Introduce interface to access global kernfs_open_file_mutex.
Date:   Wed,  4 May 2022 19:51:22 +1000
Message-Id: <20220504095123.295859-5-imran.f.khan@oracle.com>
In-Reply-To: <20220504095123.295859-1-imran.f.khan@oracle.com>
References: <20220504095123.295859-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?Cbr7Bc5zNhZW2rhTIY/VMv4QArgfjQY4oTTS8CcAl43dPHD5/eqmR7H69p8t?=
 =?us-ascii?Q?cHnxgQU+DpEM5dzEKoHDjK5dxnfo4TgQ/Yknzws3l5JAwGC1p7ww38q/4usd?=
 =?us-ascii?Q?KSx9R/GBjz4R81+w0js1fUn+DqvuysGITQ1v1YF16WG0Fi6MLjFxLfCfx14K?=
 =?us-ascii?Q?jVLA9NHSXPkSGU7wGPxX/vQ8zKPfXhj6hs4Q6zznyvCPzFj/0v7WJqJ8gIph?=
 =?us-ascii?Q?Jq5JGcMY26UV1/DfphCSNYpaj3P1ihU03YBKG8pK5OjeHbt8m8EkweLcrUjU?=
 =?us-ascii?Q?K5WjVsUHOhrvhKPDevu4PwRjqGF6uthd+en8i2aodz7bxoH7JnjERc8+1mdi?=
 =?us-ascii?Q?8ZpVyT0hWcJLLuG1ocbC3QyDF4j+Z2bZP8TXsoNc84jeobG8MQDjvf6UxoPv?=
 =?us-ascii?Q?5XHp33efeLC6mALTWiS6LpzhWnuzerv5IbzV8jwW9/kUXSms25jjUIsVrc+F?=
 =?us-ascii?Q?n/M8AAirCbjShUyNXzJWnoGPEApq3LnNnjsRnXhBQHhJKTvHXCKGMkaeb0iE?=
 =?us-ascii?Q?jFlRFP9blcFCSDXggb6T8djwiJ/PU1PL7ozBn2PThMe7Cuqtu5d1qouZC8kM?=
 =?us-ascii?Q?lD2TU9k2ZspJTB4x71gXKxzs4s5wSAdnRGPWUDIjYgKzmT4ZRyKx3ynbuJkS?=
 =?us-ascii?Q?17qTQhiQoN2zN7T1l5bDvV3/6XQ61cD3FfWm2JcrscpoxzS4lFpcvN25Ujtw?=
 =?us-ascii?Q?dgjcQS1ZVWZXnL6WkQsI81kZSaKHGHmypmcKmaMQtr3Vpcv0l2wsyyxt351y?=
 =?us-ascii?Q?zo4n/WMH91CKYhqr/fZSFALCoWy+8O4qkBkhlmQSqAxq6lr6NkqVJTNmEcgB?=
 =?us-ascii?Q?Kj0rKHj6Lv8+Wya0F/C/V/j1pl76hN6thp0CHtq+ivcVwzJiPxxWddiuWVVT?=
 =?us-ascii?Q?xfLRuO41cII9TvB9B61KJtljP73hsbI1BzS2lo9xxX8vZm1s0EYY3+17QVZg?=
 =?us-ascii?Q?CKeOb6cHNIzNS8mQ/N5zGOF4Pn87M+DGQDsgkw3Z54ekHZ0WgRjJ3wy/yX+B?=
 =?us-ascii?Q?I9Vyku8o7gPXCIXCLmFk/gvYt1K2m+MSC4bAxpKvpQBUSpu7f+7stsvh0FaJ?=
 =?us-ascii?Q?Ig1D14Qba/wj6p+U1/ju7LfWZF/U1oaJT5ge7mEvQKI9tZe8OQENxfz+ud+u?=
 =?us-ascii?Q?zItBQ5GWiyTyx88enNwg7GPFmmcDKtk7iiOZDyWpv+iYdAKYNh9W3oX+Vomd?=
 =?us-ascii?Q?RfOdftRQ4Q4+L9AhcY45jUa/fEkoK+nPcBPWhvZ9P1QVCD+5zVyTs/SZpmpJ?=
 =?us-ascii?Q?GRgXXNE2YTxqMi9MxZpzzZFR9cvVaHThALo0RBKnzs59I+MnVtPzOIzTWryI?=
 =?us-ascii?Q?wHOxlpa8IF8nBvNGd1v1tgW7Z8uoXzlG8tudM28NX011jkIKBR5JhEpdNmgo?=
 =?us-ascii?Q?OiX7EcNMMfPVQeQoclbD+bCb1LU1wJgFN8oLFJpdj2IfTNm6OBkuHpOL7UKL?=
 =?us-ascii?Q?lek92Jo7hhCFFYoSplFGRIgGPl8WE+VhAYc5lIFK7OmU0pBLjcDHCXu2fUE/?=
 =?us-ascii?Q?GZ4EhtLCxiGfx7XgWNSaUUXu6XRqw7V3cOkTs1L2R/oexh2mW9MvYyXFntDa?=
 =?us-ascii?Q?80HN+XBK60yL/KRs7Os6RBTCYjpu33IBPAetJmCwY/Ix0R1K/wQnH5eRaViY?=
 =?us-ascii?Q?fSbP1vKlcjmR5HgW21Z9rzZZrRAEEk5AlfKGbQtI6wQy7VDNU3QM1nBLMutK?=
 =?us-ascii?Q?GttuGNyCpXAkBzgk6O7LpEb7Z830UV4MVs0fxgLt1H9KUGdF6B+D0RAkXajP?=
 =?us-ascii?Q?Bo+Ka+NwxTepm6t6jMYiRn5S7YBeykc=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee53f7d7-bd85-41f7-adfe-08da2db3b44d
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 09:51:47.7651
 (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: e05CNKefdqLrTBbtQK1qoSHuOc+4pQ8eNiVDByqPnLBeRZb4e9PHrFXijrc01AeddwlCAgljTx070mkZmrT9ng==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4899
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-04_03:2022-05-02,2022-05-04 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0
 mlxlogscore=998 adultscore=0 phishscore=0 suspectscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2205040065
X-Proofpoint-GUID: Wbg31iDQgwKpsMCWszaMTtYTIdbgVyjX
X-Proofpoint-ORIG-GUID: Wbg31iDQgwKpsMCWszaMTtYTIdbgVyjX
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,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

This allows to change underlying mutex locking, without needing to change
the users of the lock. For example next patch modifies this interface to
use hashed mutexes in place of a single global kernfs_open_file_mutex.

Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
---
 fs/kernfs/file.c | 50 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 96c8493003b6..7a60074ec0a0 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -49,6 +49,22 @@ struct kernfs_open_node {
 
 static LLIST_HEAD(kernfs_notify_list);
 
+static inline struct mutex *kernfs_open_file_mutex_ptr(struct kernfs_node *kn)
+{
+	return &kernfs_open_file_mutex;
+}
+
+static inline struct mutex *kernfs_open_file_mutex_lock(struct kernfs_node *kn)
+{
+	struct mutex *lock;
+
+	lock = kernfs_open_file_mutex_ptr(kn);
+
+	mutex_lock(lock);
+
+	return lock;
+}
+
 /*
  * Raw deref RCU protected kn->attr.open.
  * The caller guarantees that @on will not vanish in the middle of this
@@ -67,7 +83,7 @@ static struct kernfs_open_node *kernfs_deref_on_raw(struct kernfs_node *kn)
 static struct kernfs_open_node *kernfs_deref_on_protected(struct kernfs_node *kn)
 {
 	return rcu_dereference_protected(kn->attr.open,
-					 lockdep_is_held(&kernfs_open_file_mutex));
+				 lockdep_is_held(kernfs_open_file_mutex_ptr(kn)));
 }
 
 /*
@@ -78,7 +94,7 @@ static struct kernfs_open_node *kernfs_deref_on_protected(struct kernfs_node *kn
 static struct kernfs_open_node *kernfs_check_on_protected(struct kernfs_node *kn)
 {
 	return rcu_dereference_check(kn->attr.open,
-				      lockdep_is_held(&kernfs_open_file_mutex));
+				 lockdep_is_held(kernfs_open_file_mutex_ptr(kn)));
 }
 
 static struct kernfs_open_file *kernfs_of(struct file *file)
@@ -551,19 +567,20 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 				struct kernfs_open_file *of)
 {
 	struct kernfs_open_node *on, *new_on = NULL;
+	struct mutex *mutex = NULL;
 
-	mutex_lock(&kernfs_open_file_mutex);
+	mutex = kernfs_open_file_mutex_lock(kn);
 	on = kernfs_deref_on_protected(kn);
 
 	if (on) {
 		list_add_tail(&of->list, &on->files);
-		mutex_unlock(&kernfs_open_file_mutex);
+		mutex_unlock(mutex);
 		return 0;
 	} else {
 		/* not there, initialize a new one */
 		new_on = kmalloc(sizeof(*new_on), GFP_KERNEL);
 		if (!new_on) {
-			mutex_unlock(&kernfs_open_file_mutex);
+			mutex_unlock(mutex);
 			return -ENOMEM;
 		}
 		atomic_set(&new_on->event, 1);
@@ -572,7 +589,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 		list_add_tail(&of->list, &new_on->files);
 		rcu_assign_pointer(kn->attr.open, new_on);
 	}
-	mutex_unlock(&kernfs_open_file_mutex);
+	mutex_unlock(mutex);
 
 	return 0;
 }
@@ -594,12 +611,13 @@ static void kernfs_unlink_open_file(struct kernfs_node *kn,
 				 struct kernfs_open_file *of)
 {
 	struct kernfs_open_node *on;
+	struct mutex *mutex = NULL;
 
-	mutex_lock(&kernfs_open_file_mutex);
+	mutex = kernfs_open_file_mutex_lock(kn);
 
 	on = kernfs_deref_on_protected(kn);
 	if (!on) {
-		mutex_unlock(&kernfs_open_file_mutex);
+		mutex_unlock(mutex);
 		return;
 	}
 
@@ -611,7 +629,7 @@ static void kernfs_unlink_open_file(struct kernfs_node *kn,
 		kfree_rcu(on, rcu_head);
 	}
 
-	mutex_unlock(&kernfs_open_file_mutex);
+	mutex_unlock(mutex);
 }
 
 static int kernfs_fop_open(struct inode *inode, struct file *file)
@@ -753,7 +771,7 @@ static void kernfs_release_file(struct kernfs_node *kn,
 	 * here because drain path may be called from places which can
 	 * cause circular dependency.
 	 */
-	lockdep_assert_held(&kernfs_open_file_mutex);
+	lockdep_assert_held(kernfs_open_file_mutex_ptr(kn));
 
 	if (!of->released) {
 		/*
@@ -770,11 +788,12 @@ static int kernfs_fop_release(struct inode *inode, struct file *filp)
 {
 	struct kernfs_node *kn = inode->i_private;
 	struct kernfs_open_file *of = kernfs_of(filp);
+	struct mutex *mutex = NULL;
 
 	if (kn->flags & KERNFS_HAS_RELEASE) {
-		mutex_lock(&kernfs_open_file_mutex);
+		mutex = kernfs_open_file_mutex_lock(kn);
 		kernfs_release_file(kn, of);
-		mutex_unlock(&kernfs_open_file_mutex);
+		mutex_unlock(mutex);
 	}
 
 	kernfs_unlink_open_file(kn, of);
@@ -789,6 +808,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 {
 	struct kernfs_open_node *on;
 	struct kernfs_open_file *of;
+	struct mutex *mutex = NULL;
 
 	if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE)))
 		return;
@@ -804,10 +824,10 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 	if (!rcu_access_pointer(kn->attr.open))
 		return;
 
-	mutex_lock(&kernfs_open_file_mutex);
+	mutex = kernfs_open_file_mutex_lock(kn);
 	on = kernfs_check_on_protected(kn);
 	if (!on) {
-		mutex_unlock(&kernfs_open_file_mutex);
+		mutex_unlock(mutex);
 		return;
 	}
 
@@ -821,7 +841,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 			kernfs_release_file(kn, of);
 	}
 
-	mutex_unlock(&kernfs_open_file_mutex);
+	mutex_unlock(mutex);
 }
 
 /*
-- 
2.30.2