sched/topology: Use prebuilt SD flag degeneration mask (6f349818) · Commits · 戴 / test

kernel/sched/topology.c

+4 −16

Original line number	Diff line number	Diff line
		@@ -160,15 +160,9 @@ static int sd_degenerate(struct sched_domain *sd)
		return 1;

		/* Following flags need at least 2 groups */
		if (sd->flags & (SD_BALANCE_NEWIDLE \|
		SD_BALANCE_FORK \|
		SD_BALANCE_EXEC \|
		SD_SHARE_CPUCAPACITY \|
		SD_ASYM_CPUCAPACITY \|
		SD_SHARE_PKG_RESOURCES)) {
		if (sd->groups != sd->groups->next)
		if ((sd->flags & SD_DEGENERATE_GROUPS_MASK) &&
		(sd->groups != sd->groups->next))
		return 0;
		}

		/* Following flags don't use groups */
		if (sd->flags & (SD_WAKE_AFFINE))
		@@ -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 */
		if (parent->groups == parent->groups->next) {
		pflags &= ~(SD_BALANCE_NEWIDLE \|
		SD_BALANCE_FORK \|
		SD_BALANCE_EXEC \|
		SD_ASYM_CPUCAPACITY \|
		SD_SHARE_CPUCAPACITY \|
		SD_SHARE_PKG_RESOURCES \|
		SD_PREFER_SIBLING);
		pflags &= ~(SD_DEGENERATE_GROUPS_MASK \| SD_PREFER_SIBLING);
		if (nr_node_ids == 1)
		pflags &= ~SD_SERIALIZE;
		}