Commit 6f349818 authored by Valentin Schneider's avatar Valentin Schneider Committed by Ingo Molnar

sched/topology: Use prebuilt SD flag degeneration mask

Leverage SD_DEGENERATE_GROUPS_MASK in sd_degenerate() and
sd_parent_degenerate().
Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: https://lore.kernel.org/r/20200817113003.20802-9-valentin.schneider@arm.com
parent 4ee4ea44
...@@ -160,15 +160,9 @@ static int sd_degenerate(struct sched_domain *sd) ...@@ -160,15 +160,9 @@ static int sd_degenerate(struct sched_domain *sd)
return 1; return 1;
/* Following flags need at least 2 groups */ /* Following flags need at least 2 groups */
if (sd->flags & (SD_BALANCE_NEWIDLE | if ((sd->flags & SD_DEGENERATE_GROUPS_MASK) &&
SD_BALANCE_FORK | (sd->groups != sd->groups->next))
SD_BALANCE_EXEC |
SD_SHARE_CPUCAPACITY |
SD_ASYM_CPUCAPACITY |
SD_SHARE_PKG_RESOURCES)) {
if (sd->groups != sd->groups->next)
return 0; return 0;
}
/* Following flags don't use groups */ /* Following flags don't use groups */
if (sd->flags & (SD_WAKE_AFFINE)) if (sd->flags & (SD_WAKE_AFFINE))
...@@ -190,13 +184,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent) ...@@ -190,13 +184,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
/* Flags needing groups don't count if only 1 group in parent */ /* Flags needing groups don't count if only 1 group in parent */
if (parent->groups == parent->groups->next) { if (parent->groups == parent->groups->next) {
pflags &= ~(SD_BALANCE_NEWIDLE | pflags &= ~(SD_DEGENERATE_GROUPS_MASK | SD_PREFER_SIBLING);
SD_BALANCE_FORK |
SD_BALANCE_EXEC |
SD_ASYM_CPUCAPACITY |
SD_SHARE_CPUCAPACITY |
SD_SHARE_PKG_RESOURCES |
SD_PREFER_SIBLING);
if (nr_node_ids == 1) if (nr_node_ids == 1)
pflags &= ~SD_SERIALIZE; pflags &= ~SD_SERIALIZE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment