From: Peter Zijlstra <peterz@infradead.org> To: Thomas Gleixner <tglx@linutronix.de> Cc: mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: [RFC][PATCH] sched: Rename DIE domain Date: Wed, 12 Jul 2023 16:10:56 +0200 [thread overview] Message-ID: <20230712141056.GI3100107@hirez.programming.kicks-ass.net> (raw) Hi Thomas just tripped over the x86 topology setup creating a 'DIE' domain for the package mask :-) Since these names are SCHED_DEBUG only, rename them. I don't think anybody *should* be relying on this, but who knows. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- arch/powerpc/kernel/smp.c | 2 +- arch/s390/kernel/topology.c | 2 +- arch/x86/kernel/smpboot.c | 2 +- kernel/sched/topology.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index fbbb695bae3d..5ed6b9fe5094 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1050,7 +1050,7 @@ static struct sched_domain_topology_level powerpc_topology[] = { #endif { shared_cache_mask, powerpc_shared_cache_flags, SD_INIT_NAME(CACHE) }, { cpu_mc_mask, SD_INIT_NAME(MC) }, - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, }; diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 68adf1de8888..c803f5e6ab46 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -522,7 +522,7 @@ static struct sched_domain_topology_level s390_topology[] = { { cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) }, { cpu_book_mask, SD_INIT_NAME(BOOK) }, { cpu_drawer_mask, SD_INIT_NAME(DRAWER) }, - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, }; diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e1aa2cd7734b..09cc9d0aa358 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -653,7 +653,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, SD_INIT_NAME(PKG) }; } diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index d3a3b2646ec4..e9d9cf776b7a 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1670,7 +1670,7 @@ static struct sched_domain_topology_level default_topology[] = { #ifdef CONFIG_SCHED_MC { cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) }, #endif - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, };
WARNING: multiple messages have this Message-ID (diff)
From: Peter Zijlstra <peterz@infradead.org> To: Thomas Gleixner <tglx@linutronix.de> Cc: juri.lelli@redhat.com, peterz@infradead.org, dave.hansen@linux.intel.com, bsegall@google.com, hpa@zytor.com, agordeev@linux.ibm.com, linux-s390@vger.kernel.org, vschneid@redhat.com, vincent.guittot@linaro.org, x86@kernel.org, mingo@redhat.com, mgorman@suse.de, borntraeger@linux.ibm.com, gor@linux.ibm.com, hca@linux.ibm.com, npiggin@gmail.com, bp@alien8.de, rostedt@goodmis.org, tglx@linutronix.de, dietmar.eggemann@arm.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, svens@linux.ibm.com, bristot@redhat.com Subject: [RFC][PATCH] sched: Rename DIE domain Date: Wed, 12 Jul 2023 16:10:56 +0200 [thread overview] Message-ID: <20230712141056.GI3100107@hirez.programming.kicks-ass.net> (raw) Hi Thomas just tripped over the x86 topology setup creating a 'DIE' domain for the package mask :-) Since these names are SCHED_DEBUG only, rename them. I don't think anybody *should* be relying on this, but who knows. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- arch/powerpc/kernel/smp.c | 2 +- arch/s390/kernel/topology.c | 2 +- arch/x86/kernel/smpboot.c | 2 +- kernel/sched/topology.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index fbbb695bae3d..5ed6b9fe5094 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1050,7 +1050,7 @@ static struct sched_domain_topology_level powerpc_topology[] = { #endif { shared_cache_mask, powerpc_shared_cache_flags, SD_INIT_NAME(CACHE) }, { cpu_mc_mask, SD_INIT_NAME(MC) }, - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, }; diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 68adf1de8888..c803f5e6ab46 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -522,7 +522,7 @@ static struct sched_domain_topology_level s390_topology[] = { { cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) }, { cpu_book_mask, SD_INIT_NAME(BOOK) }, { cpu_drawer_mask, SD_INIT_NAME(DRAWER) }, - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, }; diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e1aa2cd7734b..09cc9d0aa358 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -653,7 +653,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, SD_INIT_NAME(PKG) }; } diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index d3a3b2646ec4..e9d9cf776b7a 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1670,7 +1670,7 @@ static struct sched_domain_topology_level default_topology[] = { #ifdef CONFIG_SCHED_MC { cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) }, #endif - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, SD_INIT_NAME(PKG) }, { NULL, }, };
next reply other threads:[~2023-07-12 14:11 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-12 14:10 Peter Zijlstra [this message] 2023-07-12 14:10 ` [RFC][PATCH] sched: Rename DIE domain Peter Zijlstra 2023-07-12 15:02 ` Valentin Schneider 2023-07-12 15:02 ` Valentin Schneider 2023-07-12 15:08 ` Peter Zijlstra 2023-07-12 15:08 ` Peter Zijlstra 2023-07-14 9:28 ` Mel Gorman 2023-07-14 9:28 ` Mel Gorman 2023-07-14 14:25 ` Shrikanth Hegde 2023-07-14 14:25 ` Shrikanth Hegde 2023-07-14 14:04 ` Heiko Carstens 2023-07-14 14:04 ` Heiko Carstens 2023-07-17 5:42 ` Gautham R. Shenoy 2023-07-17 5:42 ` Gautham R. Shenoy 2023-07-17 13:51 ` Vincent Guittot 2023-07-17 13:51 ` Vincent Guittot 2023-07-17 14:19 ` Peter Zijlstra 2023-07-17 14:19 ` Peter Zijlstra 2023-10-12 17:50 ` [tip: sched/core] sched/topology: Rename 'DIE' domain to 'PKG' tip-bot2 for Peter Zijlstra
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230712141056.GI3100107@hirez.programming.kicks-ass.net \ --to=peterz@infradead.org \ --cc=agordeev@linux.ibm.com \ --cc=borntraeger@linux.ibm.com \ --cc=bp@alien8.de \ --cc=bristot@redhat.com \ --cc=bsegall@google.com \ --cc=christophe.leroy@csgroup.eu \ --cc=dave.hansen@linux.intel.com \ --cc=dietmar.eggemann@arm.com \ --cc=gor@linux.ibm.com \ --cc=hca@linux.ibm.com \ --cc=hpa@zytor.com \ --cc=juri.lelli@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mgorman@suse.de \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=rostedt@goodmis.org \ --cc=svens@linux.ibm.com \ --cc=tglx@linutronix.de \ --cc=vincent.guittot@linaro.org \ --cc=vschneid@redhat.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.