* Re: [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
2023-08-15 3:57 [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Ricardo Neri
@ 2023-09-11 23:16 ` Ricardo Neri
2023-09-12 11:45 ` Peter Zijlstra
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ricardo Neri @ 2023-09-11 23:16 UTC (permalink / raw)
To: Peter Zijlstra (Intel)
Cc: Ravi V. Shankar, Ricardo Neri, Ben Segall, Caleb Callaway,
Chen Yu, Daniel Bristot de Oliveira, Dietmar Eggemann, Len Brown,
Mel Gorman, Steven Rostedt, Tim C . Chen, Valentin Schneider,
Vincent Guittot, x86, linux-kernel
On Mon, Aug 14, 2023 at 08:57:47PM -0700, Ricardo Neri wrote:
> Commit 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") dropped the
> SD_ASYM_PACKING flag in the DIE domain added in commit 044f0e27dec6
> ("x86/sched: Add the SD_ASYM_PACKING flag to the die domain of hybrid
> processors"). Restore it on hybrid processors.
>
> The die-level domain does not depend on any build configuration and now
> x86_sched_itmt_flags() is always needed. Remove the build dependency on
> CONFIG_SCHED_[SMT|CLUSTER|MC].
>
> Cc: Ben Segall <bsegall@google.com>
> Cc: Caleb Callaway <caleb.callaway@intel.com>
> Cc: Chen Yu <yu.c.chen@intel.com>
> Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
> Cc: Len Brown <len.brown@intel.com>
> Cc: Mel Gorman <mgorman@suse.de>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Tim C. Chen <tim.c.chen@intel.com>
> Cc: Valentin Schneider <vschneid@redhat.com>
> Cc: Vincent Guittot <vincent.guittot@linaro.org>
> Cc: x86@kernel.org
> Cc: linux-kernel@vger.kernel.org
> Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup")
> Reviewed-by: Chen Yu <yu.c.chen@intel.com>
> Tested-by: Caleb Callaway <caleb.callaway@intel.com>
> Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
> ---
> arch/x86/kernel/smpboot.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index d7667a29acf3..944008c72754 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -579,7 +579,6 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
> }
>
>
> -#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_CLUSTER) || defined(CONFIG_SCHED_MC)
> static inline int x86_sched_itmt_flags(void)
> {
> return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0;
> @@ -603,7 +602,12 @@ static int x86_cluster_flags(void)
> return cpu_cluster_flags() | x86_sched_itmt_flags();
> }
> #endif
> -#endif
> +
> +static int x86_die_flags(void)
> +{
> + return cpu_feature_enabled(X86_FEATURE_HYBRID_CPU) ?
> + x86_sched_itmt_flags() : 0;
> +}
>
> /*
> * Set if a package/die has multiple NUMA nodes inside.
> @@ -640,7 +644,7 @@ static void __init build_sched_topology(void)
> */
> if (!x86_has_numa_in_package) {
> x86_topology[i++] = (struct sched_domain_topology_level){
> - cpu_cpu_mask, SD_INIT_NAME(DIE)
> + cpu_cpu_mask, x86_die_flags, SD_INIT_NAME(DIE)
> };
> }
>
Hi, just checking if there are any comments on this patch?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
2023-08-15 3:57 [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Ricardo Neri
2023-09-11 23:16 ` Ricardo Neri
@ 2023-09-12 11:45 ` Peter Zijlstra
2023-09-12 15:15 ` [tip: sched/urgent] " tip-bot2 for Ricardo Neri
2023-09-13 13:11 ` tip-bot2 for Ricardo Neri
3 siblings, 0 replies; 5+ messages in thread
From: Peter Zijlstra @ 2023-09-12 11:45 UTC (permalink / raw)
To: Ricardo Neri
Cc: Ravi V. Shankar, Ricardo Neri, Ben Segall, Caleb Callaway,
Chen Yu, Daniel Bristot de Oliveira, Dietmar Eggemann, Len Brown,
Mel Gorman, Steven Rostedt, Tim C . Chen, Valentin Schneider,
Vincent Guittot, x86, linux-kernel
On Mon, Aug 14, 2023 at 08:57:47PM -0700, Ricardo Neri wrote:
> Commit 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") dropped the
> SD_ASYM_PACKING flag in the DIE domain
Urgh.. indeed.
> added in commit 044f0e27dec6
> ("x86/sched: Add the SD_ASYM_PACKING flag to the die domain of hybrid
> processors"). Restore it on hybrid processors.
>
> The die-level domain does not depend on any build configuration and now
> x86_sched_itmt_flags() is always needed. Remove the build dependency on
> CONFIG_SCHED_[SMT|CLUSTER|MC].
>
> Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup")
> Reviewed-by: Chen Yu <yu.c.chen@intel.com>
> Tested-by: Caleb Callaway <caleb.callaway@intel.com>
> Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: sched/urgent] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
2023-08-15 3:57 [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Ricardo Neri
2023-09-11 23:16 ` Ricardo Neri
2023-09-12 11:45 ` Peter Zijlstra
@ 2023-09-12 15:15 ` tip-bot2 for Ricardo Neri
2023-09-13 13:11 ` tip-bot2 for Ricardo Neri
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Ricardo Neri @ 2023-09-12 15:15 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ricardo Neri, Peter Zijlstra (Intel),
Chen Yu, Caleb Callaway, x86, linux-kernel
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: c7d1d6e2b9e555d18d5e742fa67a16a0f36ef8d6
Gitweb: https://git.kernel.org/tip/c7d1d6e2b9e555d18d5e742fa67a16a0f36ef8d6
Author: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
AuthorDate: Mon, 14 Aug 2023 20:57:47 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 12 Sep 2023 17:07:34 +02:00
x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
Commit 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") dropped the
SD_ASYM_PACKING flag in the DIE domain added in commit 044f0e27dec6
("x86/sched: Add the SD_ASYM_PACKING flag to the die domain of hybrid
processors"). Restore it on hybrid processors.
The die-level domain does not depend on any build configuration and now
x86_sched_itmt_flags() is always needed. Remove the build dependency on
CONFIG_SCHED_[SMT|CLUSTER|MC].
Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup")
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Chen Yu <yu.c.chen@intel.com>
Tested-by: Caleb Callaway <caleb.callaway@intel.com>
Link: https://lkml.kernel.org/r/20230815035747.11529-1-ricardo.neri-calderon@linux.intel.com
---
arch/x86/kernel/smpboot.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d40ed3a..266d05e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -579,7 +579,6 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
}
-#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_CLUSTER) || defined(CONFIG_SCHED_MC)
static inline int x86_sched_itmt_flags(void)
{
return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0;
@@ -603,7 +602,14 @@ static int x86_cluster_flags(void)
return cpu_cluster_flags() | x86_sched_itmt_flags();
}
#endif
-#endif
+
+static int x86_die_flags(void)
+{
+ if (cpu_feature_enabled(X86_FEATURE_HYBRID_CPU))
+ return x86_sched_itmt_flags();
+
+ return 0;
+}
/*
* Set if a package/die has multiple NUMA nodes inside.
@@ -640,7 +646,7 @@ static void __init build_sched_topology(void)
*/
if (!x86_has_numa_in_package) {
x86_topology[i++] = (struct sched_domain_topology_level){
- cpu_cpu_mask, SD_INIT_NAME(DIE)
+ cpu_cpu_mask, x86_die_flags, SD_INIT_NAME(DIE)
};
}
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: sched/urgent] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
2023-08-15 3:57 [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Ricardo Neri
` (2 preceding siblings ...)
2023-09-12 15:15 ` [tip: sched/urgent] " tip-bot2 for Ricardo Neri
@ 2023-09-13 13:11 ` tip-bot2 for Ricardo Neri
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Ricardo Neri @ 2023-09-13 13:11 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ricardo Neri, Peter Zijlstra (Intel),
Ingo Molnar, Chen Yu, Caleb Callaway, x86, linux-kernel
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 108af4b4bd3813610701379a58538e3339b162e4
Gitweb: https://git.kernel.org/tip/108af4b4bd3813610701379a58538e3339b162e4
Author: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
AuthorDate: Mon, 14 Aug 2023 20:57:47 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 13 Sep 2023 15:03:18 +02:00
x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain
Commit 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") dropped the
SD_ASYM_PACKING flag in the DIE domain added in commit 044f0e27dec6
("x86/sched: Add the SD_ASYM_PACKING flag to the die domain of hybrid
processors"). Restore it on hybrid processors.
The die-level domain does not depend on any build configuration and now
x86_sched_itmt_flags() is always needed. Remove the build dependency on
CONFIG_SCHED_[SMT|CLUSTER|MC].
Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup")
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Chen Yu <yu.c.chen@intel.com>
Tested-by: Caleb Callaway <caleb.callaway@intel.com>
Link: https://lkml.kernel.org/r/20230815035747.11529-1-ricardo.neri-calderon@linux.intel.com
---
arch/x86/kernel/smpboot.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d40ed3a..266d05e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -579,7 +579,6 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
}
-#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_CLUSTER) || defined(CONFIG_SCHED_MC)
static inline int x86_sched_itmt_flags(void)
{
return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0;
@@ -603,7 +602,14 @@ static int x86_cluster_flags(void)
return cpu_cluster_flags() | x86_sched_itmt_flags();
}
#endif
-#endif
+
+static int x86_die_flags(void)
+{
+ if (cpu_feature_enabled(X86_FEATURE_HYBRID_CPU))
+ return x86_sched_itmt_flags();
+
+ return 0;
+}
/*
* Set if a package/die has multiple NUMA nodes inside.
@@ -640,7 +646,7 @@ static void __init build_sched_topology(void)
*/
if (!x86_has_numa_in_package) {
x86_topology[i++] = (struct sched_domain_topology_level){
- cpu_cpu_mask, SD_INIT_NAME(DIE)
+ cpu_cpu_mask, x86_die_flags, SD_INIT_NAME(DIE)
};
}
^ permalink raw reply [flat|nested] 5+ messages in thread