github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()

Browse Source 
commit c80d401c52 upstream.

subparts_cpus should be limited as a subset of cpus_allowed, but it is
updated wrongly by using cpumask_andnot(). Use cpumask_and() instead to
fix it.

Fixes: ee8dde0cd2 ("cpuset: Add new v2 cpuset.sched.partition flag")
Signed-off-by: Tianchen Ding <dtcccc@linux.alibaba.com>
Reviewed-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tianchen Ding 2022-01-18 18:05:18 +08:00 committed by Greg Kroah-Hartman
parent 3bbe2019dd
commit aa9e96db31
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/cgroup/cpuset.c
View File

@ -1566,8 +1566,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
* Make sure that subparts_cpus is a subset of cpus_allowed. * Make sure that subparts_cpus is a subset of cpus_allowed.
*/ */
if (cs->nr_subparts_cpus) { if (cs->nr_subparts_cpus) {
cpumask_andnot(cs->subparts_cpus, cs->subparts_cpus, cpumask_and(cs->subparts_cpus, cs->subparts_cpus, cs->cpus_allowed);
cs->cpus_allowed);
cs->nr_subparts_cpus = cpumask_weight(cs->subparts_cpus); cs->nr_subparts_cpus = cpumask_weight(cs->subparts_cpus);
} }
spin_unlock_irq(&callback_lock); spin_unlock_irq(&callback_lock);