Commit 9b1b234b authored Jun 09, 2020 by Peng Liu Committed by Peter Zijlstra Jun 15, 2020

sched: correct SD_flags returned by tl->sd_flags()

During sched domain init, we check whether non-topological SD_flags are
returned by tl->sd_flags(), if found, fire a waning and correct the
violation, but the code failed to correct the violation. Correct this.

Fixes: 143e1e28 ("sched: Rework sched_domain topology definition")
Signed-off-by: Peng Liu <iwtbavbm@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ

parent 3ea2f097

kernel/sched/topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1328,7 +1328,7 @@ sd_init(struct sched_domain_topology_level *tl,
		sd_flags = (*tl->sd_flags)();
		if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS,
		"wrong sd_flags in topology description\n"))
		sd_flags &= ~TOPOLOGY_SD_FLAGS;
		sd_flags &= TOPOLOGY_SD_FLAGS;

		/* Apply detected topology flags */
		sd_flags \|= dflags;