cgroup/cpuset: Fix incorrect isolated_cpus update in update_parent_effective_cpumask()
[ Upstream commit 668e041662e92ab3ebcb9eb606d3ec01884546ab ] Before commitf0af1bfc27("cgroup/cpuset: Relax constraints to partition & cpus changes"), a cpuset partition cannot be enabled if not all the requested CPUs can be granted from the parent cpuset. After that commit, a cpuset partition can be created even if the requested exclusive CPUs contain CPUs not allowed its parent. The delmask containing exclusive CPUs to be removed from its parent wasn't adjusted accordingly. That is not a problem until the introduction of a new isolated_cpus mask in commit11e5f407b6("cgroup/cpuset: Keep track of CPUs in isolated partitions") as the CPUs in the delmask may be added directly into isolated_cpus. As a result, isolated_cpus may incorrectly contain CPUs that are not isolated leading to incorrect data reporting. Fix this by adjusting the delmask to reflect the actual exclusive CPUs for the creation of the partition. Fixes:11e5f407b6("cgroup/cpuset: Keep track of CPUs in isolated partitions") Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b980b83231
commit
40bc55e4fc
@@ -1656,9 +1656,9 @@ static int update_parent_effective_cpumask(struct cpuset *cs, int cmd,
|
||||
if (nocpu)
|
||||
return PERR_NOCPUS;
|
||||
|
||||
cpumask_copy(tmp->delmask, xcpus);
|
||||
deleting = true;
|
||||
subparts_delta++;
|
||||
deleting = cpumask_and(tmp->delmask, xcpus, parent->effective_xcpus);
|
||||
if (deleting)
|
||||
subparts_delta++;
|
||||
new_prs = (cmd == partcmd_enable) ? PRS_ROOT : PRS_ISOLATED;
|
||||
} else if (cmd == partcmd_disable) {
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user