summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2026-07-27 11:20:23 -1000
committerTejun Heo <tj@kernel.org>2026-07-27 11:20:23 -1000
commitf883dbb64ca53f75d9006d1e73180c9d9ecfc9a2 (patch)
treec8dad194fe498efbdb9d8815ed0e36ab49d349ff
parent34572206208c1ac646bf734b6035f9304c1da31d (diff)
downloadlinux-next-f883dbb64ca53f75d9006d1e73180c9d9ecfc9a2.tar.gz
linux-next-f883dbb64ca53f75d9006d1e73180c9d9ecfc9a2.zip
sched_ext: Make exit claiming lock-free
scx_claim_exit() claims descendants' exits by walking the subtree under scx_sched_lock, making exit claiming, and thus scx_error(), unusable from NMI and from under scx_sched_lock. However, kfuncs raising errors can run from NMI-attached BPF progs, the hardlockup handler runs in NMI, and scx_link_sched() wants to report failures under the lock. The walk does two things with different urgencies: ->aborting must be asserted synchronously to break IRQs-off dispatch-path live-locks, while the descendants' exit_kind claims can happen later. Split them: sweep ->aborting locklessly under RCU to unwedge the system and defer the locked SCX_EXIT_PARENT walk to a new irq_work, both of which are NMI-safe. The sweep stores each node's ->aborting and then reads its children list while scx_link_sched() inserts and then checks the parent's ->aborting, the two sides paired by full barriers - one side always sees the other. A link that sees ->aborting undoes its insert and fails. As the undo's list_del_rcu() leaves ->sibling non-empty, list_empty() can no longer identify a never-linked sched during teardown - add sch->linked instead. trace_sched_ext_exit can now fire from NMI and is called after the ->aborting stores so that its callbacks don't hold up live-lock recovery. The exit backtrace is skipped for NMI exits as stack_trace_save()'s NMI-safety is arch-dependent and undocumented. v2: Move trace_sched_ext_exit() after the ->aborting stores (Andrea). Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: Andrea Righi <arighi@nvidia.com>
-rw-r--r--kernel/sched/ext/ext.c110
-rw-r--r--kernel/sched/ext/internal.h2
-rw-r--r--kernel/sched/ext/sub.c12
3 files changed, 79 insertions, 45 deletions
diff --git a/kernel/sched/ext/ext.c b/kernel/sched/ext/ext.c
index ff9151232f58..dfa624b8607e 100644
--- a/kernel/sched/ext/ext.c
+++ b/kernel/sched/ext/ext.c
@@ -5035,6 +5035,7 @@ static void scx_sched_free_rcu_work(struct work_struct *work)
struct scx_dispatch_q *dsq;
int cpu, node;
+ irq_work_sync(&sch->propagate_exit_irq_work);
irq_work_sync(&sch->disable_irq_work);
kthread_destroy_worker(sch->helper);
timer_shutdown_sync(&sch->bypass_lb_timer);
@@ -6004,18 +6005,6 @@ s32 scx_link_sched(struct scx_sched *sch)
if (parent) {
/*
- * scx_claim_exit() propagates exit_kind transition to
- * its sub-scheds while holding scx_sched_lock - either
- * we can see the parent's non-NONE exit_kind or the
- * parent can shoot us down.
- */
- if (atomic_read(&parent->exit_kind) != SCX_EXIT_NONE) {
- err_msg = "parent disabled";
- ret = -ENOENT;
- break;
- }
-
- /*
* Bypass state is spread across per-cpu flags and a
* depth count, so inheriting it is tricky and has no
* valid use case. Refuse it.
@@ -6034,6 +6023,23 @@ s32 scx_link_sched(struct scx_sched *sch)
}
list_add_tail_rcu(&sch->sibling, &parent->children);
+
+ /*
+ * Pairs with the mb after the ->aborting assertion in
+ * scx_claim_exit(). Either we see ->aborting and back
+ * out, or the exit path sees us and exits us.
+ */
+ smp_mb();
+ if (unlikely(READ_ONCE(parent->aborting))) {
+ rhashtable_remove_fast(&scx_sched_hash, &sch->hash_node,
+ scx_sched_hash_params);
+ list_del_rcu(&sch->sibling);
+ err_msg = "parent disabled";
+ ret = -ENOENT;
+ break;
+ }
+
+ sch->linked = true;
}
#endif /* CONFIG_EXT_SUB_SCHED */
@@ -6057,10 +6063,11 @@ void scx_unlink_sched(struct scx_sched *sch)
{
scoped_guard(raw_spinlock_irq, &scx_sched_lock) {
#ifdef CONFIG_EXT_SUB_SCHED
- if (scx_parent(sch)) {
+ if (sch->linked) {
rhashtable_remove_fast(&scx_sched_hash, &sch->hash_node,
scx_sched_hash_params);
list_del_rcu(&sch->sibling);
+ sch->linked = false;
}
#endif /* CONFIG_EXT_SUB_SCHED */
list_del_rcu(&sch->all);
@@ -6270,12 +6277,36 @@ done:
scx_bypass(sch, false);
}
+/**
+ * scx_propagate_exit_irq_workfn - Claim SCX_EXIT_PARENT on the exiting subtree
+ * @irq_work: &scx_sched.propagate_exit_irq_work
+ *
+ * Queued by scx_claim_exit() after a non-PARENT claim. Claims SCX_EXIT_PARENT
+ * on each descendant, giving every one its own disable work - most of disabling
+ * is serialized but ops.exit() can take arbitrarily long and running them in
+ * separate helper kthreads parallelizes it. No recursion as only non-PARENT
+ * claims propagate.
+ */
+static void scx_propagate_exit_irq_workfn(struct irq_work *irq_work)
+{
+ struct scx_sched *sch = container_of(irq_work, struct scx_sched,
+ propagate_exit_irq_work);
+ struct scx_sched *pos;
+
+ scoped_guard (raw_spinlock_irqsave, &scx_sched_lock) {
+ scx_for_each_descendant_pre(pos, sch)
+ scx_disable(pos, SCX_EXIT_PARENT);
+ }
+}
+
/*
* Claim the exit on @sch. The caller must ensure that the helper kthread work
* is kicked before the current task can be preempted. Once exit_kind is
* claimed, scx_error() can no longer trigger, so if the current task gets
* preempted and the BPF scheduler fails to schedule it back, the helper work
* will never be kicked and the whole system can wedge.
+ *
+ * Lock-free and safe to call from any context including NMI.
*/
static bool scx_claim_exit(struct scx_sched *sch, enum scx_exit_kind kind)
{
@@ -6289,37 +6320,31 @@ static bool scx_claim_exit(struct scx_sched *sch, enum scx_exit_kind kind)
if (!atomic_try_cmpxchg(&sch->exit_kind, &none, kind))
return false;
- /*
- * Some CPUs may be trapped in the dispatch paths. Set the aborting
- * flag to break potential live-lock scenarios, ensuring we can
- * successfully reach scx_bypass().
- */
- WRITE_ONCE(sch->aborting, true);
-
- trace_sched_ext_exit(sch, kind);
+ if (kind == SCX_EXIT_PARENT) {
+ /* an ancestor is already sweeping the subtree */
+ WRITE_ONCE(sch->aborting, true);
+ } else {
+ struct scx_sched *pos;
- /*
- * Propagate exits to descendants immediately. Each has a dedicated
- * helper kthread and can run in parallel. While most of disabling is
- * serialized, running them in separate threads allows parallelizing
- * ops.exit(), which can take arbitrarily long prolonging bypass mode.
- *
- * To guarantee forward progress, this propagation must be in-line so
- * that ->aborting is synchronously asserted for all sub-scheds. The
- * propagation is also the interlocking point against sub-sched
- * attachment. See scx_link_sched().
- *
- * This doesn't cause recursions as propagation only takes place for
- * non-propagation exits.
- */
- if (kind != SCX_EXIT_PARENT) {
- scoped_guard (raw_spinlock_irqsave, &scx_sched_lock) {
- struct scx_sched *pos;
+ /*
+ * CPUs may be live-locked in the dispatch paths of @sch or its
+ * descendants, which ->aborting breaks. Sweep the subtree
+ * locklessly so that this works from NMI. smp_store_mb() orders
+ * each node's ->aborting store before its children are walked -
+ * either we see a racing scx_link_sched() on ->children or it
+ * sees ->aborting.
+ */
+ scoped_guard (rcu) {
scx_for_each_descendant_pre(pos, sch)
- scx_disable(pos, SCX_EXIT_PARENT);
+ smp_store_mb(pos->aborting, true);
}
+
+ irq_work_queue(&sch->propagate_exit_irq_work);
}
+ /* fired after ->aborting is set so callbacks can't delay recovery */
+ trace_sched_ext_exit(sch, kind);
+
return true;
}
@@ -6748,7 +6773,11 @@ bool scx_vexit(struct scx_sched *sch,
ei->exit_code = exit_code;
#ifdef CONFIG_STACKTRACE
- if (kind >= SCX_EXIT_ERROR)
+ /*
+ * stack_trace_save()'s NMI-safety is arch-dependent and undocumented.
+ * Skip the backtrace when exiting from NMI.
+ */
+ if (kind >= SCX_EXIT_ERROR && !in_nmi())
ei->bt_len = stack_trace_save(ei->bt, SCX_EXIT_BT_LEN, 1);
#endif
vscnprintf(ei->msg, SCX_EXIT_MSG_LEN, fmt, args);
@@ -6918,6 +6947,7 @@ struct scx_sched *scx_alloc_and_add_sched(struct scx_enable_cmd *cmd,
sch->slice_dfl = SCX_SLICE_DFL;
atomic_set(&sch->exit_kind, SCX_EXIT_NONE);
sch->disable_irq_work = IRQ_WORK_INIT_HARD(scx_disable_irq_workfn);
+ sch->propagate_exit_irq_work = IRQ_WORK_INIT_HARD(scx_propagate_exit_irq_workfn);
kthread_init_work(&sch->disable_work, scx_disable_workfn);
timer_setup(&sch->bypass_lb_timer, scx_bypass_lb_timerfn, 0);
diff --git a/kernel/sched/ext/internal.h b/kernel/sched/ext/internal.h
index 144e962d3342..d9ab6571d7ad 100644
--- a/kernel/sched/ext/internal.h
+++ b/kernel/sched/ext/internal.h
@@ -1559,6 +1559,7 @@ struct scx_sched {
char *cgrp_path;
struct kset *sub_kset;
+ bool linked; /* on ->children, see scx_link_sched() */
bool sub_attached;
#endif /* CONFIG_EXT_SUB_SCHED */
@@ -1577,6 +1578,7 @@ struct scx_sched {
struct kthread_worker *helper;
struct irq_work disable_irq_work;
struct kthread_work disable_work;
+ struct irq_work propagate_exit_irq_work; /* see scx_claim_exit() */
struct timer_list bypass_lb_timer;
cpumask_var_t bypass_lb_donee_cpumask;
cpumask_var_t bypass_lb_resched_cpumask;
diff --git a/kernel/sched/ext/sub.c b/kernel/sched/ext/sub.c
index 7265f32bd8f5..7a5eb3a6f488 100644
--- a/kernel/sched/ext/sub.c
+++ b/kernel/sched/ext/sub.c
@@ -1067,12 +1067,14 @@ void scx_sub_disable(struct scx_sched *sch)
scx_cgroup_lock();
/*
- * An enable that failed before scx_link_sched() never owned a cgroup or
- * task and won't be waited on by an ancestor's drain_descendants().
- * Nothing to reparent and walking the tasks can misbehave as the task
- * ownership invariant (either owned by self or parent) does not hold.
+ * An enable that failed before scx_link_sched() succeeded never owned a
+ * cgroup or task and won't be waited on by an ancestor's
+ * drain_descendants(). Nothing to reparent and walking the tasks can
+ * misbehave as the task ownership invariant (either owned by self or
+ * parent) does not hold. ->sibling can't identify this case - an undone
+ * link leaves it non-empty.
*/
- if (list_empty(&sch->sibling))
+ if (!sch->linked)
goto dump;
set_cgroup_sched(sch_cgroup(sch), parent);