mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 10:11:38 -04:00
sched_ext: Unregister sub_kset on scheduler disable
When ops.sub_attach is set, scx_alloc_and_add_sched() creates sub_kset as a
child of &sch->kobj, which pins the parent with its own reference. The
disable paths never call kset_unregister(), so the final kobject_put() in
bpf_scx_unreg() leaves a stale reference and scx_kobj_release() never runs,
leaking the whole struct scx_sched on every load/unload cycle.
Unregister sub_kset in scx_root_disable() and scx_sub_disable() before
kobject_del(&sch->kobj).
Fixes: ebeca1f930 ("sched_ext: Introduce cgroup sub-sched support")
Reported-by: Chris Mason <clm@meta.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Andrea Righi <arighi@nvidia.com>
This commit is contained in:
@@ -5721,6 +5721,8 @@ static void scx_sub_disable(struct scx_sched *sch)
|
||||
|
||||
if (sch->ops.exit)
|
||||
SCX_CALL_OP(sch, exit, NULL, sch->exit_info);
|
||||
if (sch->sub_kset)
|
||||
kset_unregister(sch->sub_kset);
|
||||
kobject_del(&sch->kobj);
|
||||
}
|
||||
#else /* CONFIG_EXT_SUB_SCHED */
|
||||
@@ -5852,6 +5854,10 @@ static void scx_root_disable(struct scx_sched *sch)
|
||||
* could observe an object of the same name still in the hierarchy when
|
||||
* the next scheduler is loaded.
|
||||
*/
|
||||
#ifdef CONFIG_EXT_SUB_SCHED
|
||||
if (sch->sub_kset)
|
||||
kset_unregister(sch->sub_kset);
|
||||
#endif
|
||||
kobject_del(&sch->kobj);
|
||||
|
||||
free_kick_syncs();
|
||||
|
||||
Reference in New Issue
Block a user