mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
cgroup/cpuset: Disable cpuset_cpumask_can_shrink() test if not load balancing
With some recent proposed changes [1] in the deadline server code, it has caused a test failure in test_cpuset_prs.sh when a change is being made to an isolated partition. This is due to failing the cpuset_cpumask_can_shrink() check for SCHED_DEADLINE tasks at validate_change(). This is actually a false positive as the failed test case involves an isolated partition with load balancing disabled. The deadline check is not meaningful in this case and the users should know what they are doing. Fix this by doing the cpuset_cpumask_can_shrink() check only when loading balanced is enabled. Also change its arguments to use effective_cpus for the current cpuset and user_xcpus() as an approiximation for the target effective_cpus as the real effective_cpus hasn't been fully computed yet as this early stage. As the check isn't comprehensive, there may be false positives or negatives. We may have to revise the code to do a more thorough check in the future if this becomes a concern. [1] https://lore.kernel.org/lkml/82be06c1-6d6d-4651-86c9-bcc828cbcb80@redhat.com/T/#t Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
c4c9cebe2f
commit
fbfbf86685
@ -581,12 +581,24 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* We can't shrink if we won't have enough room for SCHED_DEADLINE
|
* We can't shrink if we won't have enough room for SCHED_DEADLINE
|
||||||
* tasks.
|
* tasks. This check is not done when scheduling is disabled as the
|
||||||
|
* users should know what they are doing.
|
||||||
|
*
|
||||||
|
* For v1, effective_cpus == cpus_allowed & user_xcpus() returns
|
||||||
|
* cpus_allowed.
|
||||||
|
*
|
||||||
|
* For v2, is_cpu_exclusive() & is_sched_load_balance() are true only
|
||||||
|
* for non-isolated partition root. At this point, the target
|
||||||
|
* effective_cpus isn't computed yet. user_xcpus() is the best
|
||||||
|
* approximation.
|
||||||
|
*
|
||||||
|
* TBD: May need to precompute the real effective_cpus here in case
|
||||||
|
* incorrect scheduling of SCHED_DEADLINE tasks in a partition
|
||||||
|
* becomes an issue.
|
||||||
*/
|
*/
|
||||||
ret = -EBUSY;
|
ret = -EBUSY;
|
||||||
if (is_cpu_exclusive(cur) &&
|
if (is_cpu_exclusive(cur) && is_sched_load_balance(cur) &&
|
||||||
!cpuset_cpumask_can_shrink(cur->cpus_allowed,
|
!cpuset_cpumask_can_shrink(cur->effective_cpus, user_xcpus(trial)))
|
||||||
trial->cpus_allowed))
|
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user