* [PATCH] sched: correct SD_flags returned by tl->sd_flags()
@ 2020-06-09 15:09 Peng Liu
2020-06-09 15:43 ` Vincent Guittot
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Peng Liu @ 2020-06-09 15:09 UTC (permalink / raw)
To: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, linux-kernel
Cc: iwtbavbm
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: 143e1e28cb40 ("sched: Rework sched_domain topology definition")
Signed-off-by: Peng Liu <iwtbavbm@gmail.com>
---
kernel/sched/topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index ba81187bb7af..9079d865a935 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -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;
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sched: correct SD_flags returned by tl->sd_flags()
2020-06-09 15:09 [PATCH] sched: correct SD_flags returned by tl->sd_flags() Peng Liu
@ 2020-06-09 15:43 ` Vincent Guittot
2020-06-10 10:03 ` Valentin Schneider
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Peng Liu
2 siblings, 0 replies; 4+ messages in thread
From: Vincent Guittot @ 2020-06-09 15:43 UTC (permalink / raw)
To: Peng Liu
Cc: Ingo Molnar, Peter Zijlstra, Juri Lelli, Dietmar Eggemann,
Steven Rostedt, Ben Segall, Mel Gorman, linux-kernel
On Tue, 9 Jun 2020 at 17:09, Peng Liu <iwtbavbm@gmail.com> wrote:
>
> 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: 143e1e28cb40 ("sched: Rework sched_domain topology definition")
> Signed-off-by: Peng Liu <iwtbavbm@gmail.com>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
> ---
> kernel/sched/topology.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
> index ba81187bb7af..9079d865a935 100644
> --- a/kernel/sched/topology.c
> +++ b/kernel/sched/topology.c
> @@ -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;
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sched: correct SD_flags returned by tl->sd_flags()
2020-06-09 15:09 [PATCH] sched: correct SD_flags returned by tl->sd_flags() Peng Liu
2020-06-09 15:43 ` Vincent Guittot
@ 2020-06-10 10:03 ` Valentin Schneider
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Peng Liu
2 siblings, 0 replies; 4+ messages in thread
From: Valentin Schneider @ 2020-06-10 10:03 UTC (permalink / raw)
To: Peng Liu
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, linux-kernel
On 09/06/20 16:09, Peng Liu wrote:
> 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
^^^^^^
s/waning/warning/
> violation, but the code failed to correct the violation. Correct this.
>
> Fixes: 143e1e28cb40 ("sched: Rework sched_domain topology definition")
> Signed-off-by: Peng Liu <iwtbavbm@gmail.com>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
> ---
> kernel/sched/topology.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
> index ba81187bb7af..9079d865a935 100644
> --- a/kernel/sched/topology.c
> +++ b/kernel/sched/topology.c
> @@ -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;
^ permalink raw reply [flat|nested] 4+ messages in thread* [tip: sched/core] sched: correct SD_flags returned by tl->sd_flags()
2020-06-09 15:09 [PATCH] sched: correct SD_flags returned by tl->sd_flags() Peng Liu
2020-06-09 15:43 ` Vincent Guittot
2020-06-10 10:03 ` Valentin Schneider
@ 2020-06-16 12:21 ` tip-bot2 for Peng Liu
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Peng Liu @ 2020-06-16 12:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: Peng Liu, Peter Zijlstra (Intel),
Vincent Guittot, Valentin Schneider, x86, LKML
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 9b1b234bb86bcdcdb142e900d39b599185465dbb
Gitweb: https://git.kernel.org/tip/9b1b234bb86bcdcdb142e900d39b599185465dbb
Author: Peng Liu <iwtbavbm@gmail.com>
AuthorDate: Tue, 09 Jun 2020 23:09:36 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 15 Jun 2020 14:10:04 +02:00
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: 143e1e28cb40 ("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
---
kernel/sched/topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index ba81187..9079d86 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-16 12:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-09 15:09 [PATCH] sched: correct SD_flags returned by tl->sd_flags() Peng Liu
2020-06-09 15:43 ` Vincent Guittot
2020-06-10 10:03 ` Valentin Schneider
2020-06-16 12:21 ` [tip: sched/core] " tip-bot2 for Peng Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).