mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] sched/isolation: Enable cpuset_mutex synchronization before freeing old housekeeping cpumask
@ 2026-11-17  4:15 Waiman Long
  0 siblings, 0 replies; only message in thread
From: Waiman Long @ 2026-11-17  4:15 UTC (permalink / raw)
  To: Ingo Molnar, Peter Zijlstra, Juri Lelli, Vincent Guittot,
	Dietmar Eggemann, Steven Rostedt, Ben Segall, Mel Gorman,
	Valentin Schneider, K Prateek Nayak, Tejun Heo,
	Frederic Weisbecker
  Cc: linux-kernel, Guopeng Zhang, Ridong Chen, Mathieu Desnoyers, Waiman Long

Commit a84097e625f2 ("cgroup/cpuset: Call housekeeping_update() without
holding cpus_read_lock") adds a new cpuset_top_mutex on top but drops
cpus_read_lock and cpuset_mutex before calling housekeeping_update()
which calls other functions that may acquire cpus_read_lock leading to
to a possibility of deadlock if cpus_read_lock isn't dropped before
calling housekeeping_update().

This commit also changes lockdep_is_cpuset_held() to return true if
either cpuset_mutex or cpuset_top_mutex is held. lockdep_is_cpuset_held()
is used by housekeeping_dereference_check() as one of the conditions
that rcu_read_lock() is not needed to access HK_TYPE_DOMAIN cpumask
which can be changed by housekeeping_update() at run time. In reality,
it isn't right to allow holding cpuset_mutex as a condition where
rcu_read_lock isn't needed. It is certainly possible that there can be
a parallel housekeeping_update() call going on if only cpuset_mutex is
being held. This can lead to a potential use-after-free situation when
HK_TYPE_DOMAIN housekeeping cpumask is being accessed.

One possible solution is to hold rcu_read_lock for functions that may
be called with only cpuset_mutex held. Beside some cpuset functions,
several scheduler functions will also need to be changed. A far simpler
solution is to synchronize with other cpuset_mutex critical sections
before freeing the old housekeeping cpumask. This will ensure that code
within cpuset_mutex critical sections will not have a UaF situation
when accessing housekeeping cpumask. This commit implements the latter
solution and make the conditions used by lockdep_is_cpuset_held() correct.

Fixes: a84097e625f2 ("cgroup/cpuset: Call housekeeping_update() without holding cpus_read_lock")
Signed-off-by: Waiman Long <longman@redhat.com>
---
 kernel/sched/isolation.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
index 156025ef81b7..eb4ceeaf0f9d 100644
--- a/kernel/sched/isolation.c
+++ b/kernel/sched/isolation.c
@@ -159,6 +159,13 @@ int housekeeping_update(struct cpumask *isol_mask)
 	err = kthreads_update_housekeeping();
 	WARN_ON_ONCE(err < 0);
 
+	/*
+	 * Synchronize with cpuset_mutex to make sure that its critical sections
+	 * afterward will not have access to the old housekeeping cpumask.
+	 */
+	cpuset_lock();
+	cpuset_unlock();
+
 	kfree(old);
 
 	return 0;
-- 
2.56.0


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-17  4:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17  4:15 [PATCH] sched/isolation: Enable cpuset_mutex synchronization before freeing old housekeeping cpumask Waiman Long

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®