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 2/5] kernfs: make ->attr.open RCU protected.
Date:   Wed,  4 May 2022 19:51:20 +1000
Message-Id: <20220504095123.295859-3-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?WRekcAJeJGMDQIkdEl9TK3xvj/I631a6nNWkaQSKz1h7bwm30WrkohThdsCJ?=
 =?us-ascii?Q?Ok0DCTnqMGevWVirkNPIC2pocvCNE1Snm/SdJMQXFiCwp5/teog4S9w5vwMi?=
 =?us-ascii?Q?dF+UWq8dd7EDOF6Dp3uoU71gWzRh8L7VSovQGq+tRE8GpPdvHj0oI4DScCqu?=
 =?us-ascii?Q?LJLbQTgJBtIk0ctReU/IEfhXanxapCMtUijph6FL44WzPCvkFDY82WdROHTW?=
 =?us-ascii?Q?KqrOgbIaOVLL/H5RRmcysBhyu+QXdfvWFZS6LxdQn2MeJVO5tJSsmHkdPm32?=
 =?us-ascii?Q?u5xOyCHFcDNW5v9Yo0Ff9+zGLkocyvB9nMAyYXmbfYntPQFa7aJ5BX/J67KK?=
 =?us-ascii?Q?IV6v1eqXfzzqf36Jsix6sJJMHwaUTG2wvElNw/x9P7j9ZIGXk9PWPzYdyXuZ?=
 =?us-ascii?Q?m5yYCCvDk9Ggfd1oYf5YfWhA15kCREEgRJBya2eGk04trXNp6vWfie7EJOLa?=
 =?us-ascii?Q?1gpLR7G2fEGPDwndNbAX2S/SBSvZq0og2lptwwMAjBO4su9nIu2aO3Ltn4WV?=
 =?us-ascii?Q?y5fW0+FzDkFSq/HdFyFq4jmXQnyjZcUtVKAXaBuLkRXEFcyPez4EzxKSWNRn?=
 =?us-ascii?Q?rAqZKbWadrtE7dKzqazkmQsBSKP/DMe42wlJlzueVMcuEL0n8Vc+56nJz7mq?=
 =?us-ascii?Q?9LcpGp5jzSM+dwjIghOXu/9KcFLlfbHIocPwTho/JNKFvDbjrMDmLtD5W2s2?=
 =?us-ascii?Q?BfBoej/LuA+3OF+CjH7sKdRNgtSAdNvyTDxMEHTlN2h7Vwt9iZAuML1qe7dD?=
 =?us-ascii?Q?+ttRQwAI4W7Icu37xlbodljC3pV7eXAkEyUkCDNyo7Lmpj+cgeRpJGdy1ImK?=
 =?us-ascii?Q?Z6R3seUmUjoCQ6F/QnV96mx1tQcyj27KwABQu7aDTCTu7ZixX5OuYakLjWEZ?=
 =?us-ascii?Q?NQ71ktLEofiLrFybUK+ocFnZIZu9a1YAv5aTgJOWl+UlDYUOlvWbpa5kAfTc?=
 =?us-ascii?Q?XZNKcCHZrQFkWlMVnEOZTe4rFr46KO7lthlZI8I2ZnMgMPvU1OeqzFLxO/NF?=
 =?us-ascii?Q?dYcjjX7Ze4QQhTd4QLn7TSZTlC8DnnaWs2oVkeVJ7VDLTOBFS5wuEHC5Dnyt?=
 =?us-ascii?Q?WLz9yVar7cV3WHqqSb1fbkIK6gBQoVEXVBTNNu9/hmw0wQaIt1+STvOi7fY6?=
 =?us-ascii?Q?ezI2e+sNUxoQXkpNQ/l0PaPSWWly5+TXkusDAd43KszUxOkXDO3remWnyAij?=
 =?us-ascii?Q?zlSiHmt7evx2tgfYsoetshIcK1yH2piuklHi+baCEywg30iezrFipS8Z6HFp?=
 =?us-ascii?Q?huQ3ACv32+fsZkXAHyHTrfSEh+llK/pOC4Ni0BmGrUSN3zKfjCA57rQiIXiq?=
 =?us-ascii?Q?gYqOaWBqYRe1teGb2lVqv3vdYHXS26Z4IKC1La2537D1OtMuKlXxrzxJHP44?=
 =?us-ascii?Q?Hj0Q3WqfN3J8i+cvStsqCgmrIAMXmPZweDyUwldz09K90U3b+SkuEx75+CPR?=
 =?us-ascii?Q?zghPfrS6t9NokDzqMyvWIdONYwnXilTymmbQLLJR9Khjv/NKuVQ6xV1EfowT?=
 =?us-ascii?Q?uJuTEtIlLKi0NaD2b4lvNECr4/T7uIJ2jr6YvPeOgBxPpD34TFBgAuIykE+I?=
 =?us-ascii?Q?Z/mWNnYaQmT9uekjE6A1xVtBkEtB50ERQeba/5TabOLsmHzDEq1ngmx2gb8F?=
 =?us-ascii?Q?fDYPjt7OuiXe+cpVFxDvHUfEQjy6wORA2WAdfdKLQ1dqtMpM7uhyIxWXgNJD?=
 =?us-ascii?Q?oplJ3OiPENk08dLIVF9nJug/ww8GJWpnf0efkb67sLPO8FH43FgHAMHdtN+3?=
 =?us-ascii?Q?Cy+ht/bso/Q0YBTi2s6sYz0X0p8IwQA=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d0dd33b-a723-49e6-e5cf-08da2db3b122
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:42.3096
 (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: 6WJkMvYfKsjVE0A6NK33tjl2swVfU/otVIO3Aq7LVeIlVsik+ywg3ZnZeixKGixwPq1vRv5yT5/Qx0H4+K5sqQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1001MB2316
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 phishscore=0 bulkscore=0 spamscore=0
 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205040065
X-Proofpoint-ORIG-GUID: oU1O_JjiY0QM6WmtqVp-N2STes3Ke0E6
X-Proofpoint-GUID: oU1O_JjiY0QM6WmtqVp-N2STes3Ke0E6
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

After removal of kernfs_open_node->refcnt in the previous patch,
kernfs_open_node_lock can be removed as well by making ->attr.open
RCU protected. kernfs_put_open_node can delegate freeing to ->attr.open
to RCU and other readers of ->attr.open can do so under rcu_read_(un)lock.

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

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index e3abfa843879..36bff71ab263 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -23,16 +23,16 @@
  * for each kernfs_node with one or more open files.
  *
  * kernfs_node->attr.open points to kernfs_open_node.  attr.open is
- * protected by kernfs_open_node_lock.
+ * RCU protected.
  *
  * filp->private_data points to seq_file whose ->private points to
  * kernfs_open_file.  kernfs_open_files are chained at
  * kernfs_open_node->files, which is protected by kernfs_open_file_mutex.
  */
-static DEFINE_SPINLOCK(kernfs_open_node_lock);
 static DEFINE_MUTEX(kernfs_open_file_mutex);
 
 struct kernfs_open_node {
+	struct rcu_head		rcu_head;
 	atomic_t		event;
 	wait_queue_head_t	poll;
 	struct list_head	files; /* goes through kernfs_open_file.list */
@@ -51,6 +51,38 @@ struct kernfs_open_node {
 static DEFINE_SPINLOCK(kernfs_notify_lock);
 static struct kernfs_node *kernfs_notify_list = KERNFS_NOTIFY_EOL;
 
+/*
+ * Raw deref RCU protected kn->attr.open.
+ * The caller guarantees that @on will not vanish in the middle of this
+ * function and hence we can deref ->attr.open raw.
+ */
+static struct kernfs_open_node *kernfs_deref_on_raw(struct kernfs_node *kn)
+{
+	return rcu_dereference_raw(kn->attr.open);
+}
+
+/*
+ * Deref ->attr.open corresponding to @kn while holding kernfs_open_file_mutex.
+ * ->attr.open is modified under kernfs_open_file_mutex. So it can be safely
+ * accessed outside RCU read-side critical section, while holding the mutex.
+ */
+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));
+}
+
+/*
+ * Check ->attr.open corresponding to @kn while holding kernfs_open_file_mutex.
+ * ->attr.open is modified under kernfs_open_file_mutex. So it can be safely
+ * accessed outside RCU read-side critical section, while holding the mutex.
+ */
+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));
+}
+
 static struct kernfs_open_file *kernfs_of(struct file *file)
 {
 	return ((struct seq_file *)file->private_data)->private;
@@ -156,8 +188,9 @@ static void kernfs_seq_stop(struct seq_file *sf, void *v)
 static int kernfs_seq_show(struct seq_file *sf, void *v)
 {
 	struct kernfs_open_file *of = sf->private;
+	struct kernfs_open_node *on = kernfs_deref_on_raw(of->kn);
 
-	of->event = atomic_read(&of->kn->attr.open->event);
+	of->event = atomic_read(&unrcu_pointer(on)->event);
 
 	return of->kn->attr.ops->seq_show(sf, v);
 }
@@ -180,6 +213,7 @@ static ssize_t kernfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 	struct kernfs_open_file *of = kernfs_of(iocb->ki_filp);
 	ssize_t len = min_t(size_t, iov_iter_count(iter), PAGE_SIZE);
 	const struct kernfs_ops *ops;
+	struct kernfs_open_node *on;
 	char *buf;
 
 	buf = of->prealloc_buf;
@@ -201,7 +235,8 @@ static ssize_t kernfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 		goto out_free;
 	}
 
-	of->event = atomic_read(&of->kn->attr.open->event);
+	on = kernfs_deref_on_raw(of->kn);
+	of->event = atomic_read(&unrcu_pointer(on)->event);
 	ops = kernfs_ops(of->kn);
 	if (ops->read)
 		len = ops->read(of, buf, len, iocb->ki_pos);
@@ -519,36 +554,29 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 {
 	struct kernfs_open_node *on, *new_on = NULL;
 
- retry:
 	mutex_lock(&kernfs_open_file_mutex);
-	spin_lock_irq(&kernfs_open_node_lock);
-
-	if (!kn->attr.open && new_on) {
-		kn->attr.open = new_on;
-		new_on = NULL;
-	}
-
-	on = kn->attr.open;
-	if (on)
-		list_add_tail(&of->list, &on->files);
-
-	spin_unlock_irq(&kernfs_open_node_lock);
-	mutex_unlock(&kernfs_open_file_mutex);
+	on = kernfs_deref_on_protected(kn);
 
 	if (on) {
-		kfree(new_on);
+		list_add_tail(&of->list, &on->files);
+		mutex_unlock(&kernfs_open_file_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);
+			return -ENOMEM;
+		}
+		atomic_set(&new_on->event, 1);
+		init_waitqueue_head(&new_on->poll);
+		INIT_LIST_HEAD(&new_on->files);
+		list_add_tail(&of->list, &new_on->files);
+		rcu_assign_pointer(kn->attr.open, new_on);
 	}
+	mutex_unlock(&kernfs_open_file_mutex);
 
-	/* not there, initialize a new one and retry */
-	new_on = kmalloc(sizeof(*new_on), GFP_KERNEL);
-	if (!new_on)
-		return -ENOMEM;
-
-	atomic_set(&new_on->event, 1);
-	init_waitqueue_head(&new_on->poll);
-	INIT_LIST_HEAD(&new_on->files);
-	goto retry;
+	return 0;
 }
 
 /**
@@ -567,24 +595,25 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
 static void kernfs_unlink_open_file(struct kernfs_node *kn,
 				 struct kernfs_open_file *of)
 {
-	struct kernfs_open_node *on = kn->attr.open;
-	unsigned long flags;
+	struct kernfs_open_node *on;
 
 	mutex_lock(&kernfs_open_file_mutex);
-	spin_lock_irqsave(&kernfs_open_node_lock, flags);
+
+	on = kernfs_deref_on_protected(kn);
+	if (!on) {
+		mutex_unlock(&kernfs_open_file_mutex);
+		return;
+	}
 
 	if (of)
 		list_del(&of->list);
 
-	if (list_empty(&on->files))
-		kn->attr.open = NULL;
-	else
-		on = NULL;
+	if (list_empty(&on->files)) {
+		rcu_assign_pointer(kn->attr.open, NULL);
+		kfree_rcu(on, rcu_head);
+	}
 
-	spin_unlock_irqrestore(&kernfs_open_node_lock, flags);
 	mutex_unlock(&kernfs_open_file_mutex);
-
-	kfree(on);
 }
 
 static int kernfs_fop_open(struct inode *inode, struct file *file)
@@ -774,17 +803,16 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 	 * check under kernfs_open_file_mutex will ensure bailing out if
 	 * ->attr.open became NULL while waiting for the mutex.
 	 */
-	if (!kn->attr.open)
+	if (!rcu_access_pointer(kn->attr.open))
 		return;
 
 	mutex_lock(&kernfs_open_file_mutex);
-	if (!kn->attr.open) {
+	on = kernfs_check_on_protected(kn);
+	if (!on) {
 		mutex_unlock(&kernfs_open_file_mutex);
 		return;
 	}
 
-	on = kn->attr.open;
-
 	list_for_each_entry(of, &on->files, list) {
 		struct inode *inode = file_inode(of->file);
 
@@ -815,7 +843,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 __poll_t kernfs_generic_poll(struct kernfs_open_file *of, poll_table *wait)
 {
 	struct kernfs_node *kn = kernfs_dentry_node(of->file->f_path.dentry);
-	struct kernfs_open_node *on = kn->attr.open;
+	struct kernfs_open_node *on = kernfs_deref_on_raw(kn);
 
 	poll_wait(of->file, &on->poll, wait);
 
@@ -922,13 +950,13 @@ void kernfs_notify(struct kernfs_node *kn)
 		return;
 
 	/* kick poll immediately */
-	spin_lock_irqsave(&kernfs_open_node_lock, flags);
-	on = kn->attr.open;
+	rcu_read_lock();
+	on = rcu_dereference(kn->attr.open);
 	if (on) {
 		atomic_inc(&on->event);
 		wake_up_interruptible(&on->poll);
 	}
-	spin_unlock_irqrestore(&kernfs_open_node_lock, flags);
+	rcu_read_unlock();
 
 	/* schedule work to kick fsnotify */
 	spin_lock_irqsave(&kernfs_notify_lock, flags);
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index e2ae15a6225e..13f54f078a52 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -114,7 +114,7 @@ struct kernfs_elem_symlink {
 
 struct kernfs_elem_attr {
 	const struct kernfs_ops	*ops;
-	struct kernfs_open_node	*open;
+	struct kernfs_open_node __rcu	*open;
 	loff_t			size;
 	struct kernfs_node	*notify_next;	/* for kernfs_notify() */
 };
-- 
2.30.2