Commit c0b67534 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cgroup-for-6.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fix from Tejun Heo:
 "cpuset has a bug which can cause an oops after some configuration
  operations, introduced during the v6.1 cycle.

  This single commit fixes the bug"

* tag 'cgroup-for-6.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup/cpuset: Fix wrong check in update_parent_subparts_cpumask()
parents 58706f7f e5ae8803

kernel/cgroup/cpuset.c

+2 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cs, int cmd, 
		 * A parent can be left with no CPU as long as there is no

		 * task directly associated with the parent partition.

		 */

		if (!cpumask_intersects(cs->cpus_allowed, parent->effective_cpus) &&

		if (cpumask_subset(parent->effective_cpus, cs->cpus_allowed) &&

		    partition_is_populated(parent, cs))

			return PERR_NOCPUS;
@@ -2324,6 +2324,7 @@ static int update_prstate(struct cpuset *cs, int new_prs) 
		new_prs = -new_prs;

	spin_lock_irq(&callback_lock);

	cs->partition_root_state = new_prs;

	WRITE_ONCE(cs->prs_err, err);

	spin_unlock_irq(&callback_lock);

	/*

	 * Update child cpusets, if present.

tools/testing/selftests/cgroup/test_cpuset_prs.sh

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ TEST_MATRIX=( 
	# Taking away all CPUs from parent or itself if there are tasks

	# will make the partition invalid.

	"  S+ C2-3:P1:S+  C3:P1  .      .      T     C2-3    .      .     0 A1:2-3,A2:2-3 A1:P1,A2:P-1"

	"  S+  C3:P1:S+    C3    .      .      T      P1     .      .     0 A1:3,A2:3 A1:P1,A2:P-1"

	"  S+ $SETUP_A123_PARTITIONS    .    T:C2-3   .      .      .     0 A1:2-3,A2:2-3,A3:3 A1:P1,A2:P-1,A3:P-1"

	"  S+ $SETUP_A123_PARTITIONS    . T:C2-3:C1-3 .      .      .     0 A1:1,A2:2,A3:3 A1:P1,A2:P1,A3:P1"