From: Andrea Righi <arighi@nvidia.com>
To: Tejun Heo <tj@kernel.org>, David Vernet <void@manifault.com>,
Changwoo Min <changwoo@igalia.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH sched_ext/for-6.16] sched_ext: Add RCU protection to scx_root in DSQ iterator
Date: Wed, 30 Apr 2025 11:09:30 +0200 [thread overview]
Message-ID: <20250430090930.355732-1-arighi@nvidia.com> (raw)
Using a DSQ iterators from a timer callback can trigger the following
lockdep splat:
=============================
WARNING: suspicious RCU usage
6.14.0-virtme #1 Not tainted
-----------------------------
kernel/sched/ext.c:6907 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
no locks held by swapper/0/0.
stack backtrace:
CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.14.0-virtme #1 PREEMPT(full)
Sched_ext: tickless (enabled+all)
Call Trace:
<IRQ>
dump_stack_lvl+0x6f/0xb0
lockdep_rcu_suspicious.cold+0x4e/0xa3
bpf_iter_scx_dsq_new+0xb1/0xd0
bpf_prog_63f4fd1bccc101e7_dispatch_cpu+0x3e/0x156
bpf_prog_8320d4217989178c_dispatch_all_cpus+0x153/0x1b6
bpf_prog_97f847d871513f95_sched_timerfn+0x4c/0x264
? hrtimer_run_softirq+0x4f/0xd0
bpf_timer_cb+0x7a/0x140
__hrtimer_run_queues+0x1f9/0x3a0
hrtimer_run_softirq+0x8c/0xd0
handle_softirqs+0xd3/0x3d0
__irq_exit_rcu+0x9a/0xc0
irq_exit_rcu+0xe/0x20
sysvec_apic_timer_interrupt+0x73/0x80
Add rcu_read_lock/unlock() around scx_root access to prevent this.
Fixes: cdf5a6faa8cf0 ("sched_ext: Move dsq_hash into scx_sched")
Signed-off-by: Andrea Righi <arighi@nvidia.com>
---
kernel/sched/ext.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 1ee5a0088b1a1..d2856529711d7 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -6907,28 +6907,39 @@ __bpf_kfunc int bpf_iter_scx_dsq_new(struct bpf_iter_scx_dsq *it, u64 dsq_id,
{
struct bpf_iter_scx_dsq_kern *kit = (void *)it;
struct scx_sched *sch;
+ int ret = 0;
BUILD_BUG_ON(sizeof(struct bpf_iter_scx_dsq_kern) >
sizeof(struct bpf_iter_scx_dsq));
BUILD_BUG_ON(__alignof__(struct bpf_iter_scx_dsq_kern) !=
__alignof__(struct bpf_iter_scx_dsq));
+ rcu_read_lock();
sch = rcu_dereference(scx_root);
- if (!sch)
- return -ENODEV;
+ if (!sch) {
+ ret = -ENODEV;
+ goto out_unlock;
+ }
- if (flags & ~__SCX_DSQ_ITER_USER_FLAGS)
- return -EINVAL;
+ if (flags & ~__SCX_DSQ_ITER_USER_FLAGS) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
kit->dsq = find_user_dsq(sch, dsq_id);
- if (!kit->dsq)
- return -ENOENT;
+ if (!kit->dsq) {
+ ret = -ENOENT;
+ goto out_unlock;
+ }
INIT_LIST_HEAD(&kit->cursor.node);
kit->cursor.flags = SCX_DSQ_LNODE_ITER_CURSOR | flags;
kit->cursor.priv = READ_ONCE(kit->dsq->seq);
- return 0;
+out_unlock:
+ rcu_read_unlock();
+
+ return ret;
}
/**
--
2.49.0
next reply other threads:[~2025-04-30 9:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-30 9:09 Andrea Righi [this message]
2025-04-30 18:59 ` [PATCH sched_ext/for-6.16] sched_ext: Add RCU protection to scx_root in DSQ iterator Tejun Heo
2025-04-30 19:59 ` Andrea Righi
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=20250430090930.355732-1-arighi@nvidia.com \
--to=arighi@nvidia.com \
--cc=changwoo@igalia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=void@manifault.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.