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 v7 2/4] kernfs: Change kernfs_notify_list to llist.
Date:   Wed, 15 Jun 2022 12:10:57 +1000
Message-Id: <20220615021059.862643-3-imran.f.khan@oracle.com>
In-Reply-To: <20220615021059.862643-1-imran.f.khan@oracle.com>
References: <20220615021059.862643-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?WVrjjPCRCb/HE+0TWhsYunMU57WRO1JiqlxrWqMQBMqmbSsin4mDFF9UwEac?=
 =?us-ascii?Q?HOqAFEBw+uTo7WQ8rXFXJh3YTtCmgFLjIJWQIpY4HqjcAi6xJ9EmJbMEvde+?=
 =?us-ascii?Q?YM52K6FWBD6hsZZB8q53LIOpHbwDKsTYevO0ejM7pC96nwvFr5rlLcFfPfeC?=
 =?us-ascii?Q?6vE8BUoA07MwT1pZrRYsMA5TOmfLb/EV/aXATh0Kqtwx3Ht3L7rH/eo3UhXM?=
 =?us-ascii?Q?9sAz/ME+KpTKkkvhh/FfmLZ5WeUPJ6v3ThyTVj+DJPNRANEapVSgc5++vstI?=
 =?us-ascii?Q?1yDt/ctNXfZK1G8PKEgtX/zg+AyJIntAHvPJY++UlGmyXN/Htle+oPocecp+?=
 =?us-ascii?Q?6lMejoda7FtlxZs/t9sAsNE9RcZ58i2fS7F4Spg9HnzeZ7jstm+EBcg/m/ql?=
 =?us-ascii?Q?B6lSyrP27Y+9F5d5doIdoKmXTGjzQxUVjqLarpwfWtyRWN9lRzdhErccfCzK?=
 =?us-ascii?Q?dfk/WXOMCRhP+hNTbPJ4nejbGLguNaYJdup3qgA3QWK1IoNN5Q3KTUEjmq8n?=
 =?us-ascii?Q?orxBF1or8qgzY3d5o3wgyRNB5ZeAyvo1e78cloBDBJ3RFwY8wUtfMqjHAEMt?=
 =?us-ascii?Q?9/BdAuGt4h+TgBLR35H7aB2/UmLDfbN4ghidEtXxbqyyYxFTqP4n0QFz6Ior?=
 =?us-ascii?Q?D8UhTPrE4YcswAVVPUhW4JiNE4YgcbudedHnKhGnyvYic9lCtw1TfIZQ9yF7?=
 =?us-ascii?Q?va0t0uLIi6EXTRy38vvDEGUPmmsJ0b5PzZe+RWDw8dpf8KsmHbw1lk9on5A1?=
 =?us-ascii?Q?2bvKUD7xBXJdQzJRZNe2xz6SIuf2EupiHqx7J2p8FnSI6uPft5hfpGiMNoJd?=
 =?us-ascii?Q?/IUPI/VZAYTPVNBQiqKKQCpgLiTOoZO+iczY0GnmvB6T2v/qzgTcS16IjUX+?=
 =?us-ascii?Q?iO/ZSVhPYlhusS6FS6uD6T+QF/xVZoEcnep4pb33Eba3NVQZJwmMusfyy/zT?=
 =?us-ascii?Q?mLSpA+98LpnbodIZ36srefH35U9DI+9LkePJbzhwrR3FguYdao6Gzd2xDkwl?=
 =?us-ascii?Q?mY7mAu31VsHzwEhy4ujLYfE8Q2Ul6qyhy8Ix1QasRutWoT+1ma+CVrZB+Ctw?=
 =?us-ascii?Q?Qr61511sHnUU2mygeWCpwOx+d5woEl0jkSHQe2bsn/pGXsS95fX383FbMZzR?=
 =?us-ascii?Q?iOuBqOTqID99GvHK4kPELr2luHbsGG7zBGKA/dLuhO/U4KR6l2+Beo3Fjkt9?=
 =?us-ascii?Q?HaNzls5AXaz6JonwXYOURE3ZCcGDhZPPfT3DVGWGW4Bh+BH5bgMxSM0KJtOD?=
 =?us-ascii?Q?golj+Gkun2IaF/8iDXyEFd5M1epRxbvOw2V+0xXAmS5UrDHButwAyZ/glwPc?=
 =?us-ascii?Q?tAqS+0wymJp+jEOf7Rn/A7usM4cNMD3BxYSMcPL+32Jfy1yH8xiVjAovI9hF?=
 =?us-ascii?Q?qKQLMVsjOY0bInSVTMvFLZkdxXHEuu2rR9/tt79PeiT39SY99jbLSQBOvs0C?=
 =?us-ascii?Q?RByMCzCzcCu5MZBPvLu/kKrqBot21i3bFaGUOM6UaRsr7aAbEWj0nQt8APAW?=
 =?us-ascii?Q?GQXTqSi4HegckJGx409VeyFAU3oTgr6jN71lFb6b//ld++momuYnMoEs3aIv?=
 =?us-ascii?Q?vMOCFEEbRG0XajgCtwiHFdtNy0cnaAOvt/teHCEQpfAoSTCU/qQVi2YnTsMs?=
 =?us-ascii?Q?DrdS8NGrVXgpH8U+Y1zXQYzZ/WYFvsVzEN6FWa2rlIy1gSGTLpg+BrtJsJge?=
 =?us-ascii?Q?NCM7Mbv/cOpZAZOXt1hY/9jpUdxfiR7JBEdjcpDDKM5X0fW07CNMB3wsM6CQ?=
 =?us-ascii?Q?09qqj8Z/7aDMY7TJah5+1MeDAZ0X/ug=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0f42a077-8f87-481d-febb-08da4e745437
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 02:11:16.3724
 (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: MTDJXoceoCoS+UAKKIpehbX3xgISeWnvAHUR9ujIEoHrQ/CwICMPW5sZYI9UJzmUa0DdWoioGIr+ibMUXSzVjg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR10MB2513
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874
 definitions=2022-06-15_01:2022-06-13,2022-06-14 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 adultscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206150004
X-Proofpoint-ORIG-GUID: o49r0AZZRjirLWGt_8yW7vP3WzMid6XO
X-Proofpoint-GUID: o49r0AZZRjirLWGt_8yW7vP3WzMid6XO
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

At present kernfs_notify_list is implemented as a singly linked
list of kernfs_node(s), where last element points to itself and
value of ->attr.next tells if node is present on the list or not.
Both addition and deletion to list happen under kernfs_notify_lock.

Change kernfs_notify_list to llist so that addition to list can heppen
locklessly.

Suggested by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Imran Khan <imran.f.khan@oracle.com>
Acked-by: Tejun Heo <tj@kernel.org>
---
 fs/kernfs/file.c       | 47 ++++++++++++++++++------------------------
 include/linux/kernfs.h |  2 +-
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 706aebcfb8f69..dce654ad2cea9 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -38,18 +38,16 @@ struct kernfs_open_node {
 	struct list_head	files; /* goes through kernfs_open_file.list */
 };
 
-/*
- * kernfs_notify() may be called from any context and bounces notifications
- * through a work item.  To minimize space overhead in kernfs_node, the
- * pending queue is implemented as a singly linked list of kernfs_nodes.
- * The list is terminated with the self pointer so that whether a
- * kernfs_node is on the list or not can be determined by testing the next
- * pointer for NULL.
+/**
+ * attribute_to_node - get kernfs_node object corresponding to a kernfs attribute
+ * @ptr:	&struct kernfs_elem_attr
+ * @type:	struct kernfs_node
+ * @member:	name of member (i.e attr)
  */
-#define KERNFS_NOTIFY_EOL			((void *)&kernfs_notify_list)
+#define attribute_to_node(ptr, type, member)	\
+	container_of(ptr, type, member)
 
-static DEFINE_SPINLOCK(kernfs_notify_lock);
-static struct kernfs_node *kernfs_notify_list = KERNFS_NOTIFY_EOL;
+static LLIST_HEAD(kernfs_notify_list);
 
 /**
  * kernfs_deref_open_node - Get kernfs_open_node corresponding to @kn.
@@ -903,18 +901,16 @@ static void kernfs_notify_workfn(struct work_struct *work)
 	struct kernfs_node *kn;
 	struct kernfs_super_info *info;
 	struct kernfs_root *root;
+	struct llist_node *free;
+	struct kernfs_elem_attr *attr;
 repeat:
 	/* pop one off the notify_list */
-	spin_lock_irq(&kernfs_notify_lock);
-	kn = kernfs_notify_list;
-	if (kn == KERNFS_NOTIFY_EOL) {
-		spin_unlock_irq(&kernfs_notify_lock);
+	free = llist_del_first(&kernfs_notify_list);
+	if (free == NULL)
 		return;
-	}
-	kernfs_notify_list = kn->attr.notify_next;
-	kn->attr.notify_next = NULL;
-	spin_unlock_irq(&kernfs_notify_lock);
 
+	attr = llist_entry(free, struct kernfs_elem_attr, notify_next);
+	kn = attribute_to_node(attr, struct kernfs_node, attr);
 	root = kernfs_root(kn);
 	/* kick fsnotify */
 	down_write(&root->kernfs_rwsem);
@@ -970,12 +966,14 @@ static void kernfs_notify_workfn(struct work_struct *work)
 void kernfs_notify(struct kernfs_node *kn)
 {
 	static DECLARE_WORK(kernfs_notify_work, kernfs_notify_workfn);
-	unsigned long flags;
 	struct kernfs_open_node *on;
 
 	if (WARN_ON(kernfs_type(kn) != KERNFS_FILE))
 		return;
 
+	/* Because we are using llist for kernfs_notify_list */
+	WARN_ON_ONCE(in_nmi());
+
 	/* kick poll immediately */
 	rcu_read_lock();
 	on = rcu_dereference(kn->attr.open);
@@ -986,14 +984,9 @@ void kernfs_notify(struct kernfs_node *kn)
 	rcu_read_unlock();
 
 	/* schedule work to kick fsnotify */
-	spin_lock_irqsave(&kernfs_notify_lock, flags);
-	if (!kn->attr.notify_next) {
-		kernfs_get(kn);
-		kn->attr.notify_next = kernfs_notify_list;
-		kernfs_notify_list = kn;
-		schedule_work(&kernfs_notify_work);
-	}
-	spin_unlock_irqrestore(&kernfs_notify_lock, flags);
+	kernfs_get(kn);
+	llist_add(&kn->attr.notify_next, &kernfs_notify_list);
+	schedule_work(&kernfs_notify_work);
 }
 EXPORT_SYMBOL_GPL(kernfs_notify);
 
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 13f54f078a52a..2dd9c8df0f4f6 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -116,7 +116,7 @@ struct kernfs_elem_attr {
 	const struct kernfs_ops	*ops;
 	struct kernfs_open_node __rcu	*open;
 	loff_t			size;
-	struct kernfs_node	*notify_next;	/* for kernfs_notify() */
+	struct llist_node	notify_next;	/* for kernfs_notify() */
 };
 
 /*
-- 
2.30.2