From: Laurent Dufour <ldufour@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, tglx@linutronix.de, dave.hansen@linux.intel.com, mingo@redhat.com, bp@alien8.de, rui.zhang@intel.com Subject: [PATCH v4 01/10] cpu/hotplug: remove dependancy against cpu_primary_thread_mask Date: Wed, 5 Jul 2023 16:51:34 +0200 [thread overview] Message-ID: <20230705145143.40545-2-ldufour@linux.ibm.com> (raw) In-Reply-To: <20230705145143.40545-1-ldufour@linux.ibm.com> The commit 18415f33e2ac ("cpu/hotplug: Allow "parallel" bringup up to CPUHP_BP_KICK_AP_STATE") introduce a dependancy against a global variable cpu_primary_thread_mask exported by the X86 code. This variable is only used when CONFIG_HOTPLUG_PARALLEL is set. Since cpuhp_get_primary_thread_mask() and cpuhp_smt_aware() are only used when CONFIG_HOTPLUG_PARALLEL is set, don't define them when it is not set. There is no functional change introduce by that patch. Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> --- kernel/cpu.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 88a7ede322bd..03309f2f35a4 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -650,22 +650,8 @@ bool cpu_smt_possible(void) } EXPORT_SYMBOL_GPL(cpu_smt_possible); -static inline bool cpuhp_smt_aware(void) -{ - return topology_smt_supported(); -} - -static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) -{ - return cpu_primary_thread_mask; -} #else static inline bool cpu_smt_allowed(unsigned int cpu) { return true; } -static inline bool cpuhp_smt_aware(void) { return false; } -static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) -{ - return cpu_present_mask; -} #endif static inline enum cpuhp_state @@ -1793,6 +1779,16 @@ static int __init parallel_bringup_parse_param(char *arg) } early_param("cpuhp.parallel", parallel_bringup_parse_param); +static inline bool cpuhp_smt_aware(void) +{ + return topology_smt_supported(); +} + +static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) +{ + return cpu_primary_thread_mask; +} + /* * On architectures which have enabled parallel bringup this invokes all BP * prepare states for each of the to be onlined APs first. The last state -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Dufour <ldufour@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: linux-arch@vger.kernel.org, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, mingo@redhat.com, bp@alien8.de, npiggin@gmail.com, tglx@linutronix.de, rui.zhang@intel.com Subject: [PATCH v4 01/10] cpu/hotplug: remove dependancy against cpu_primary_thread_mask Date: Wed, 5 Jul 2023 16:51:34 +0200 [thread overview] Message-ID: <20230705145143.40545-2-ldufour@linux.ibm.com> (raw) In-Reply-To: <20230705145143.40545-1-ldufour@linux.ibm.com> The commit 18415f33e2ac ("cpu/hotplug: Allow "parallel" bringup up to CPUHP_BP_KICK_AP_STATE") introduce a dependancy against a global variable cpu_primary_thread_mask exported by the X86 code. This variable is only used when CONFIG_HOTPLUG_PARALLEL is set. Since cpuhp_get_primary_thread_mask() and cpuhp_smt_aware() are only used when CONFIG_HOTPLUG_PARALLEL is set, don't define them when it is not set. There is no functional change introduce by that patch. Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> --- kernel/cpu.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index 88a7ede322bd..03309f2f35a4 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -650,22 +650,8 @@ bool cpu_smt_possible(void) } EXPORT_SYMBOL_GPL(cpu_smt_possible); -static inline bool cpuhp_smt_aware(void) -{ - return topology_smt_supported(); -} - -static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) -{ - return cpu_primary_thread_mask; -} #else static inline bool cpu_smt_allowed(unsigned int cpu) { return true; } -static inline bool cpuhp_smt_aware(void) { return false; } -static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) -{ - return cpu_present_mask; -} #endif static inline enum cpuhp_state @@ -1793,6 +1779,16 @@ static int __init parallel_bringup_parse_param(char *arg) } early_param("cpuhp.parallel", parallel_bringup_parse_param); +static inline bool cpuhp_smt_aware(void) +{ + return topology_smt_supported(); +} + +static inline const struct cpumask *cpuhp_get_primary_thread_mask(void) +{ + return cpu_primary_thread_mask; +} + /* * On architectures which have enabled parallel bringup this invokes all BP * prepare states for each of the to be onlined APs first. The last state -- 2.41.0
next prev parent reply other threads:[~2023-07-05 14:52 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-05 14:51 [PATCH v4 00/10] Introduce SMT level and add PowerPC support Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour [this message] 2023-07-05 14:51 ` [PATCH v4 01/10] cpu/hotplug: remove dependancy against cpu_primary_thread_mask Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] cpu/hotplug: Remove " tip-bot2 for Laurent Dufour 2023-07-05 14:51 ` [PATCH v4 02/10] cpu/SMT: Move SMT prototypes into cpu_smt.h Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman 2023-07-05 14:51 ` [PATCH v4 03/10] cpu/SMT: Move smt/control simple exit cases earlier Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman 2023-07-05 14:51 ` [PATCH v4 04/10] cpu/SMT: Store the current/max number of threads Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman 2023-07-05 14:51 ` [PATCH v4 05/10] cpu/SMT: Remove topology_smt_supported() Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Laurent Dufour 2023-07-05 14:51 ` [PATCH v4 06/10] cpu/SMT: Create topology_smt_thread_allowed() Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman 2023-07-05 14:51 ` [PATCH v4 07/10] cpu/SMT: Allow enabling partial SMT states via sysfs Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman 2024-04-08 14:13 ` [PATCH v4 07/10] " Michal Suchánek 2024-04-08 14:13 ` Michal Suchánek 2023-07-05 14:51 ` [PATCH v4 08/10] powerpc/pseries: Initialise CPU hotplug callbacks earlier Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-08-14 10:51 ` Srikar Dronamraju 2023-08-14 10:51 ` Srikar Dronamraju 2023-07-05 14:51 ` [PATCH v4 09/10] powerpc: Add HOTPLUG_SMT support Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-08-14 10:52 ` Srikar Dronamraju 2023-08-14 10:52 ` Srikar Dronamraju 2023-07-05 14:51 ` [PATCH v4 10/10] powerpc/pseries: Honour current SMT state when DLPAR onlining CPUs Laurent Dufour 2023-07-05 14:51 ` Laurent Dufour 2023-08-14 10:53 ` Srikar Dronamraju 2023-08-14 10:53 ` Srikar Dronamraju 2023-07-09 15:25 ` [PATCH v4 00/10] Introduce SMT level and add PowerPC support Zhang, Rui 2023-07-09 15:25 ` Zhang, Rui 2023-07-10 9:08 ` Laurent Dufour 2023-07-10 9:08 ` Laurent Dufour 2023-07-28 7:40 ` Thomas Gleixner 2023-07-28 7:40 ` Thomas Gleixner 2023-07-28 14:23 ` Zhang, Rui 2023-07-28 14:23 ` Zhang, Rui 2023-07-28 14:51 ` Thomas Gleixner 2023-07-28 14:51 ` Thomas Gleixner 2023-07-28 7:58 ` Thomas Gleixner 2023-07-28 7:58 ` Thomas Gleixner 2023-07-31 11:55 ` Laurent Dufour 2023-07-31 11:55 ` Laurent Dufour 2023-08-10 6:23 ` Michael Ellerman 2023-08-10 6:23 ` Michael Ellerman 2023-08-10 8:51 ` Laurent Dufour 2023-08-10 8:51 ` Laurent Dufour
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=20230705145143.40545-2-ldufour@linux.ibm.com \ --to=ldufour@linux.ibm.com \ --cc=bp@alien8.de \ --cc=christophe.leroy@csgroup.eu \ --cc=dave.hansen@linux.intel.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=rui.zhang@intel.com \ --cc=tglx@linutronix.de \ /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.