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 v5 2/4] kernfs: Change kernfs_notify_list to llist.
Date:   Tue, 14 Jun 2022 12:08:38 +1000
Message-Id: <20220614020840.546013-3-imran.f.khan@oracle.com>
In-Reply-To: <20220614020840.546013-1-imran.f.khan@oracle.com>
References: <20220614020840.546013-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?+M19bHIGUJbVDThaJ6uZBjROBPDvbk/KTxrdJhAC5py3KUcrJdBOId9ikYFD?=
 =?us-ascii?Q?+VtZ1lP5kWW8v9pOn0t9Fg7lCeSefTaFdmrXh6dITwGdjBJ9lkgbuURgeNSy?=
 =?us-ascii?Q?HOUef+6N83NFFv2QEktAnTj4Vhbbu3JM+++KJ/LTPbWvL37bmKpL8WAv6gfP?=
 =?us-ascii?Q?yZCGA7w4xCbUyDGW5OFepHA0R8XTiyAnLM6SSPhCHd3/3ZGdHaYI9Xa7xePv?=
 =?us-ascii?Q?dcc0uJTicFQjcwQGvv2fAT93mERKo4Pwr5W4hfVzfBEA0TzOizdsTBtLTBHD?=
 =?us-ascii?Q?7rNcymL3uZiFbYIGnqi/XmQjU+Iy6paUsvLkpTFCFDq/XufzK88oSGlErnYa?=
 =?us-ascii?Q?80OH6BN0BGcqu+i/Sk+Jx2TtO4Zjo/jhptRX0u2K/kjxHE8x1wnyYx6+BmiG?=
 =?us-ascii?Q?VVcf/lhGdYsIz/b5SA7yzi5qyBm1p7ED3fFjCqn5jbb1tLloA1r3+yCzPKDr?=
 =?us-ascii?Q?MPrDAubhr8Eyxbq+gJhXEXszezoYpWWKmoeUCQGivAsTr5sIrOua+QxTFAHS?=
 =?us-ascii?Q?gVDLB7D7pjYM4RW+Ft4EqfmC36ub9Vf02nB+lbfYHK2mVJ1ti4zbbF3z6poI?=
 =?us-ascii?Q?8ldfATE8sS/e6BFUWwm/4o8pflNJsUPgAnZHAmciRBD8JpAqriAyn8Pb0//I?=
 =?us-ascii?Q?4yg16vYM/jTh6eP3LUbS2vyfc2MklZ2EnbqzdIBrd49HRP4P8gYy+NSgfH67?=
 =?us-ascii?Q?v0NjgMkKNcqglTE4YTVsTxAkVwQpiGO8zh1C+B3Tu7ICMv4mKol479Wd+7V7?=
 =?us-ascii?Q?G1TYRdXaMpVaMc3L0oQ5dGtS7lmwhZFkNTGbaKqoqWufQf6b5zf2VGpbAcuV?=
 =?us-ascii?Q?W47LtdHozp2onAjkC0PdjgZ0iJNh9JF/qqmTNvnxF0Xhn/CZ+SJsiRpvbtuq?=
 =?us-ascii?Q?Ki6N8ibb37sDnFV+Wq0KlJVtHathi80VchsdRrYZfw8E3GeKZKLOd+gF1BN7?=
 =?us-ascii?Q?zqK68VmNhEfF6Pl7EbV8giPRKWr92Is/88x8XXsP8hjve7HWteILP4L5naon?=
 =?us-ascii?Q?98BYmYwhisBNHVvdMbsLfwDsCYr/KHOomEHlFy0YdgPM7XEBRTDImkJ92U33?=
 =?us-ascii?Q?lHiRo4zRriZtYFusPWtrcy8NGBh4HGXEOpYjnHYIVa62ODL8yZE1OylQ4Vtu?=
 =?us-ascii?Q?uf3c2DPHbDf4zeXL3ZehkjTQXFEIVzSExB8s0MvQKbVVKUSqNfsQ7CD88j0S?=
 =?us-ascii?Q?SJuRZOTneEMgoVpiHXQKPeqi91tDbDnnw8ExBxbMc7rlMUwA7dtlpOrXgFfU?=
 =?us-ascii?Q?T/TcOzWnLBnnon8VDoeFLPSJ8sff4uyjAwK3SZG91J6J0M7lI78gHWJ6VdWi?=
 =?us-ascii?Q?UTIhZSSL6p5vBUndsE46IJU7s/+AVnCSc8YOkYsWFlnZBIRFJiTXcsYa4wo6?=
 =?us-ascii?Q?N0x0fODnEt8ar5BrfGUVXKIArhQGHZYviSRXrylFR4w1TsZHWGnxLJbE4UDi?=
 =?us-ascii?Q?Fh07o7XKS5280RYH0I37HLjtv1eTLuRSQqlfmSVos8E1GMZ5eOwo8lNGgFkR?=
 =?us-ascii?Q?hyFDSyJDih51tcGqbI/hiWyyhfJfNAHzTgOeNlfRRdYDdmd+DuOR4GfFh7lX?=
 =?us-ascii?Q?lcdDHzgRYUxqw2ShpYIkw54lURsGfosS0ONGI+DwrcjsRgYf2ivO9iHx7caO?=
 =?us-ascii?Q?t5vYrdyC6VGDTAe5Lo50jqTrJ2QH0/OhdlCCi6i0+E8uzf+1MQgNwBgVVWZm?=
 =?us-ascii?Q?J9osoZcdMl5uY9c7U+ZatDV0i0nQOMFQxe+kwXOp+pzZRXzJsRtSKV1yykH2?=
 =?us-ascii?Q?KhOHeY+6LSLJ1qsUHeLC2YJ0zze8LgE=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 06f3ffe3-a5cb-4b92-8a90-08da4daad5f1
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2022 02:08:55.6908
 (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: rls1CQlPAhI11h91bA9Lq+n5GcHMUrb0tg6sK/sAhJG1eOBeX4D/dZZOhGRFL76rGdpY9x7hwT+4UPY3TqxFoQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2398
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874
 definitions=2022-06-14_01:2022-06-13,2022-06-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxscore=0
 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206140007
X-Proofpoint-GUID: LFyTaHnqSwY8N4F9Lr6YoGO52Kv5aTAD
X-Proofpoint-ORIG-GUID: LFyTaHnqSwY8N4F9Lr6YoGO52Kv5aTAD
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 42ee5dbe351d3..0cc288dcf51d9 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.
@@ -898,18 +896,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);
@@ -965,12 +961,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);
@@ -981,14 +979,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