linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: libaokun@huaweicloud.com
To: netfs@lists.linux.dev, dhowells@redhat.com, jlayton@kernel.org
Cc: hsiangkao@linux.alibaba.com, jefflexu@linux.alibaba.com,
	zhujia.zj@bytedance.com, linux-erofs@lists.ozlabs.org,
	brauner@kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, libaokun@huaweicloud.com,
	yangerkun@huawei.com, houtao1@huawei.com, yukuai3@huawei.com,
	wozizhi@huawei.com, Baokun Li <libaokun1@huawei.com>
Subject: [PATCH v3 9/9] cachefiles: add missing lock protection when polling
Date: Fri, 28 Jun 2024 14:29:30 +0800	[thread overview]
Message-ID: <20240628062930.2467993-10-libaokun@huaweicloud.com> (raw)
In-Reply-To: <20240628062930.2467993-1-libaokun@huaweicloud.com>

From: Jingbo Xu <jefflexu@linux.alibaba.com>

Add missing lock protection in poll routine when iterating xarray,
otherwise:

Even with RCU read lock held, only the slot of the radix tree is
ensured to be pinned there, while the data structure (e.g. struct
cachefiles_req) stored in the slot has no such guarantee.  The poll
routine will iterate the radix tree and dereference cachefiles_req
accordingly.  Thus RCU read lock is not adequate in this case and
spinlock is needed here.

Fixes: b817e22b2e91 ("cachefiles: narrow the scope of triggering EPOLLIN events in ondemand mode")
Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jia Zhu <zhujia.zj@bytedance.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Acked-by: Jeff Layton <jlayton@kernel.org>
---
 fs/cachefiles/daemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 06cdf1a8a16f..89b11336a836 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -366,14 +366,14 @@ static __poll_t cachefiles_daemon_poll(struct file *file,
 
 	if (cachefiles_in_ondemand_mode(cache)) {
 		if (!xa_empty(&cache->reqs)) {
-			rcu_read_lock();
+			xas_lock(&xas);
 			xas_for_each_marked(&xas, req, ULONG_MAX, CACHEFILES_REQ_NEW) {
 				if (!cachefiles_ondemand_is_reopening_read(req)) {
 					mask |= EPOLLIN;
 					break;
 				}
 			}
-			rcu_read_unlock();
+			xas_unlock(&xas);
 		}
 	} else {
 		if (test_bit(CACHEFILES_STATE_CHANGED, &cache->flags))
-- 
2.39.2


  parent reply	other threads:[~2024-06-28  6:31 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-28  6:29 [PATCH v3 0/9] cachefiles: random bugfixes libaokun
2024-06-28  6:29 ` [PATCH v3 1/9] netfs, fscache: export fscache_put_volume() and add fscache_try_get_volume() libaokun
2024-06-28  6:29 ` [PATCH v3 2/9] cachefiles: fix slab-use-after-free in fscache_withdraw_volume() libaokun
2024-06-28  6:29 ` [PATCH v3 3/9] cachefiles: fix slab-use-after-free in cachefiles_withdraw_cookie() libaokun
2024-06-28  6:29 ` [PATCH v3 4/9] cachefiles: propagate errors from vfs_getxattr() to avoid infinite loop libaokun
2024-06-28  7:30   ` Gao Xiang
2024-06-28  6:29 ` [PATCH v3 5/9] cachefiles: stop sending new request when dropping object libaokun
2024-06-28  6:51   ` Gao Xiang
2024-07-02 12:29   ` [External] " Jia Zhu
2024-06-28  6:29 ` [PATCH v3 6/9] cachefiles: cancel all requests for the object that is being dropped libaokun
2024-06-28  7:21   ` Gao Xiang
2024-07-02 12:31   ` [External] " Jia Zhu
2024-06-28  6:29 ` [PATCH v3 7/9] cachefiles: wait for ondemand_object_worker to finish when dropping object libaokun
2024-06-28  7:22   ` Gao Xiang
2024-06-28  6:29 ` [PATCH v3 8/9] cachefiles: cyclic allocation of msg_id to avoid reuse libaokun
2024-07-02 12:34   ` [External] " Jia Zhu
2024-06-28  6:29 ` libaokun [this message]
2024-06-28  7:39 ` [PATCH v3 0/9] cachefiles: random bugfixes Gao Xiang
2024-06-28 11:37   ` Baokun Li
2024-07-02 12:25 ` Baokun Li
2024-07-03  8:30 ` (subset) " Christian Brauner
2024-07-03  8:37 ` Christian Brauner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240628062930.2467993-10-libaokun@huaweicloud.com \
    --to=libaokun@huaweicloud.com \
    --cc=brauner@kernel.org \
    --cc=dhowells@redhat.com \
    --cc=houtao1@huawei.com \
    --cc=hsiangkao@linux.alibaba.com \
    --cc=jefflexu@linux.alibaba.com \
    --cc=jlayton@kernel.org \
    --cc=libaokun1@huawei.com \
    --cc=linux-erofs@lists.ozlabs.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netfs@lists.linux.dev \
    --cc=wozizhi@huawei.com \
    --cc=yangerkun@huawei.com \
    --cc=yukuai3@huawei.com \
    --cc=zhujia.zj@bytedance.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).