Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Imran Khan <imran.f.khan@oracle.com>
To:     viro@zeniv.linux.org.uk, tj@kernel.org, gregkh@linuxfoundation.org
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] kernfs: Remove reference counting for kernfs_open_node.
Date:   Thu, 24 Mar 2022 21:30:39 +1100
Message-Id: <20220324103040.584491-2-imran.f.khan@oracle.com>
In-Reply-To: <20220324103040.584491-1-imran.f.khan@oracle.com>
References: <20220324103040.584491-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?Y8ZPHnh9ayArgNZxPOvzORkipCv+a3c06QvSYwbTS5GXYdiZTrCNgwG/F8Jf?=
 =?us-ascii?Q?VV0NiZs/vLkrQ3Gxka1MZsSevy9cmHn6PzFwMvtpvUpGh0W+/qW44sLzLOUO?=
 =?us-ascii?Q?cb5yD+DZWBRhyJPpHZLFi2uILVcmdOZ71fqgA2Q0gqcgLCSTY3GHnK/vZed3?=
 =?us-ascii?Q?OeLTFKu1lFuhESD53t7gdS5dcl4RNYVWLfBfyfKuZe7NP4HSHnaLQPI9B0Ix?=
 =?us-ascii?Q?+moNqeMaDrdByQ2zfTSN+v9ZWxzPbBbrkYLHVsUZ7lLUm4cFu7ypYY0DltsI?=
 =?us-ascii?Q?KcwZgsdIOYXFgTRcft0wMhWFjSWK6hH24mQXDvfLiq4TulToY8iJyhXcilXB?=
 =?us-ascii?Q?U5uks8HiSsozNI/0E5ERvsZiY1zh9nKXii3XfjaIL1T3XS+zGFRwKMNhSK8L?=
 =?us-ascii?Q?8bktCB1TtBLaM8b3J+Llit+qwA/iDOVuA+ESWGxXL1kLSJIyYs8QxhhQViNc?=
 =?us-ascii?Q?xrbu+jhTrGViXcQHhS72WxZlRQ3VV/LlBAgFcEiawxykgMxq2MS3hxXubL21?=
 =?us-ascii?Q?TjdjzdmgsUbQcnBuMqHF5uKnkgDXKRpVDtaWu/yeB5wcOF+BmyYx/sGsjnBl?=
 =?us-ascii?Q?iullYfhD9gKdEIGUbaKRqbs16FtUVcrPiz/6g3+CKs+Bgh9YA+r7ETSlW9Fk?=
 =?us-ascii?Q?4Y7dvj4lS3jv+vTlK1cwwiZk/ap4Ha5GRKPnYl8YNJ+W9B/pbmEPoh/ErKSv?=
 =?us-ascii?Q?TdQv0J3YBxbEWunUUuoi/WvKIl8vuArDAEZ8OlFTU+6bR5k7/tCi7xLPYe4O?=
 =?us-ascii?Q?v8NUO+ag0L60EVolQ5l6X+Uj+x9PIQpenghLb74xiinPKw5Ikm/TN/n5qMt/?=
 =?us-ascii?Q?O7BJjpYj4+zJ0aqCckMRKU5suxOD7uUV+3xlx7GuH7Or2QeINuebjqWDYCI9?=
 =?us-ascii?Q?FD2TJykRdGhGGMriyer+H5Z8Hi66fKt5r/+vBlDkeQq4aKhiZpW0ugxyNf30?=
 =?us-ascii?Q?mvlxOAyU4Zlwo4LSboY7MlYGslbBTOHH1Lgx48meftmEoNlFG3J2ODdojQSH?=
 =?us-ascii?Q?50oQv4NhQBF8hE4N1zk3xJvAbLvGHmWBCDvm8hVspjjmbZ7c1MH8mK1Bh2JO?=
 =?us-ascii?Q?a9mAmmZ4czNVGElNAUiCpglikaH5n/StXhXbQPrdLeTeu7w5MgOjK7Ptczj3?=
 =?us-ascii?Q?OxYxZa6PTLWKP8QJu42GIhk1t5ZxsA0Jc9SSjVuqE3DXLR6+KDsPMkAuh8ET?=
 =?us-ascii?Q?EvUcHy8GkXtZ6XSgU0qqGG/4vxRjEgaK1OZUG1+2HXBeWEOrbG9OUTUDRuH4?=
 =?us-ascii?Q?c9+2jdg6BdtFErpF2HYZNKbrcr8FXR3Yx1bXh4MFjMc/iLCsZzZuAf1JQzFj?=
 =?us-ascii?Q?s1H0N3YLdHeNy/uYBGcBJ2evYTzyyosub5p1cv/SPS6Q/utamXp6BeQHfl2+?=
 =?us-ascii?Q?SjwW4yd0Y9WuY1n1rCXHK7eQ6KM8+Q/Ts1oKsP0qe1ypZduQ0MJGFNdwCUfF?=
 =?us-ascii?Q?tOjhAh595PT7In/bFtHnQq03HM5p/xbQOPgdOCJJ4+ddoxpr0Xw+5A=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aba9efa6-ba0d-4d77-5fbf-08da0d816118
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 10:30:55.8682
 (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: IZhQfmXVgy/fxvB0oookNtlwJpnU1STA9gRwBxwDUs4To3zeHAShNLFbTCcTcwRXI+130ySxBRACmijhz5JcGg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3981
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10295 signatures=694973
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 malwarescore=0
 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2203240061
X-Proofpoint-GUID: QTaKTj7lUx-wcncK8X2j2zBjEoY_e2hO
X-Proofpoint-ORIG-GUID: QTaKTj7lUx-wcncK8X2j2zBjEoY_e2hO
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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

The decision to free kernfs_open_node object in kernfs_put_open_node can
be taken based on whether kernfs_open_node->files list is empty or not. As
far as kernfs_drain_open_files is concerned it can't overlap with
kernfs_fops_open and hence can check for ->attr.open optimistically
(if ->attr.open is NULL) or under kernfs_open_file_mutex (if it needs to
traverse the ->files list.) Thus kernfs_drain_open_files can work w/o ref
counting involved kernfs_open_node as well.
So remove ->refcnt and modify the above mentioned users accordingly.

Suggested by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
---
 fs/kernfs/file.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 88423069407c..aea6968c979e 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -33,7 +33,6 @@ static DEFINE_SPINLOCK(kernfs_open_node_lock);
 static DEFINE_MUTEX(kernfs_open_file_mutex);
 
 struct kernfs_open_node {
-	atomic_t		refcnt;
 	atomic_t		event;
 	wait_queue_head_t	poll;
 	struct list_head	files; /* goes through kernfs_open_file.list */
@@ -530,10 +529,8 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 	}
 
 	on = kn->attr.open;
-	if (on) {
-		atomic_inc(&on->refcnt);
+	if (on)
 		list_add_tail(&of->list, &on->files);
-	}
 
 	spin_unlock_irq(&kernfs_open_node_lock);
 	mutex_unlock(&kernfs_open_file_mutex);
@@ -548,7 +545,6 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 	if (!new_on)
 		return -ENOMEM;
 
-	atomic_set(&new_on->refcnt, 0);
 	atomic_set(&new_on->event, 1);
 	init_waitqueue_head(&new_on->poll);
 	INIT_LIST_HEAD(&new_on->files);
@@ -557,11 +553,12 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 
 /**
  *	kernfs_put_open_node - put kernfs_open_node
- *	@kn: target kernfs_nodet
+ *	@kn: target kernfs_node
  *	@of: associated kernfs_open_file
  *
  *	Put @kn->attr.open and unlink @of from the files list.  If
- *	reference count reaches zero, disassociate and free it.
+ *	list of associated open files becomes empty, disassociate and
+ *	free kernfs_open_node.
  *
  *	LOCKING:
  *	None.
@@ -578,7 +575,7 @@ static void kernfs_put_open_node(struct kernfs_node *kn,
 	if (of)
 		list_del(&of->list);
 
-	if (atomic_dec_and_test(&on->refcnt))
+	if (list_empty(&on->files))
 		kn->attr.open = NULL;
 	else
 		on = NULL;
@@ -768,15 +765,15 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 	if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE)))
 		return;
 
-	spin_lock_irq(&kernfs_open_node_lock);
 	on = kn->attr.open;
-	if (on)
-		atomic_inc(&on->refcnt);
-	spin_unlock_irq(&kernfs_open_node_lock);
 	if (!on)
 		return;
 
 	mutex_lock(&kernfs_open_file_mutex);
+	if (!kn->attr.open) {
+		mutex_unlock(&kernfs_open_file_mutex);
+		return;
+	}
 
 	list_for_each_entry(of, &on->files, list) {
 		struct inode *inode = file_inode(of->file);
@@ -789,8 +786,6 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 	}
 
 	mutex_unlock(&kernfs_open_file_mutex);
-
-	kernfs_put_open_node(kn, NULL);
 }
 
 /*
-- 
2.30.2