From: Jonathan Cameron <Jonathan.Cameron@huawei.com> To: Thomas Gleixner <tglx@linutronix.de>, Peter Zijlstra <peterz@infradead.org>, <linux-pm@vger.kernel.org>, <loongarch@lists.linux.dev>, <linux-acpi@vger.kernel.org>, <linux-arch@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <kvmarm@lists.linux.dev>, <x86@kernel.org>, Russell King <linux@armlinux.org.uk>, "Rafael J . Wysocki" <rafael@kernel.org>, Miguel Luis <miguel.luis@oracle.com>, James Morse <james.morse@arm.com>, Salil Mehta <salil.mehta@huawei.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, <linuxarm@huawei.com>, <justin.he@arm.com>, <jianyong.wu@arm.com> Subject: [PATCH v7 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Date: Thu, 18 Apr 2024 14:54:02 +0100 [thread overview] Message-ID: <20240418135412.14730-7-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240418135412.14730-1-Jonathan.Cameron@huawei.com> From: James Morse <james.morse@arm.com> The arm64 specific arch_register_cpu() call may defer CPU registration until the ACPI interpreter is available and the _STA method can be evaluated. If this occurs, then a second attempt is made in acpi_processor_get_info(). Note that the arm64 specific call has not yet been added so for now this will be called for the original hotplug case. For architectures that do not defer until the ACPI Processor driver loads (e.g. x86), for initially present CPUs there will already be a CPU device. If present do not try to register again. Systems can still be booted with 'acpi=off', or not include an ACPI description at all as in these cases arch_register_cpu() will not have deferred registration when first called. This moves the CPU register logic back to a subsys_initcall(), while the memory nodes will have been registered earlier. Note this is where the call was prior to the cleanup series so there should be no side effects of moving it back again for this specific case. [PATCH 00/21] Initial cleanups for vCPU HP. https://lore.kernel.org/all/ZVyz%2FVe5pPu8AWoA@shell.armlinux.org.uk/ commit 5b95f94c3b9f ("x86/topology: Switch over to GENERIC_CPU_DEVICES") Signed-off-by: James Morse <james.morse@arm.com> Reviewed-by: Gavin Shan <gshan@redhat.com> Tested-by: Miguel Luis <miguel.luis@oracle.com> Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> Tested-by: Jianyong Wu <jianyong.wu@arm.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> --- v7: Simplify the logic on whether to hotadd the CPU. This path can only be reached either for coldplug in which case all we care about is has register_cpu() already been called (identifying deferred), or hotplug in which case whether register_cpu() has been called is also sufficient. Checks on _STA related elements or the validity of the ID are no longer necessary here due to similar checks having moved elsewhere in the path. v6: Squash the two paths for conventional CPU Hotplug and arm64 vCPU HP. --- drivers/acpi/acpi_processor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 127ae8dcb787..4e65011e706c 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -350,14 +350,14 @@ static int acpi_processor_get_info(struct acpi_device *device) } /* - * Extra Processor objects may be enumerated on MP systems with - * less than the max # of CPUs. They should be ignored _iff - * they are physically not present. - * - * NOTE: Even if the processor has a cpuid, it may not be present - * because cpuid <-> apicid mapping is persistent now. + * This code is not called unless we know the CPU is present and + * enabled. The two paths are: + * a) Initially present CPUs on architectures that do not defer + * their arch_register_cpu() calls until this point. + * b) Hotplugged CPUs (enabled bit in _STA has transitioned from not + * enabled to enabled) */ - if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) { + if (!get_cpu_device(pr->id)) { ret = acpi_processor_hotadd_init(pr, device); if (ret) -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <Jonathan.Cameron@huawei.com> To: Thomas Gleixner <tglx@linutronix.de>, Peter Zijlstra <peterz@infradead.org>, <linux-pm@vger.kernel.org>, <loongarch@lists.linux.dev>, <linux-acpi@vger.kernel.org>, <linux-arch@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <kvmarm@lists.linux.dev>, <x86@kernel.org>, Russell King <linux@armlinux.org.uk>, "Rafael J . Wysocki" <rafael@kernel.org>, Miguel Luis <miguel.luis@oracle.com>, James Morse <james.morse@arm.com>, Salil Mehta <salil.mehta@huawei.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org> Cc: Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, <linuxarm@huawei.com>, <justin.he@arm.com>, <jianyong.wu@arm.com> Subject: [PATCH v7 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Date: Thu, 18 Apr 2024 14:54:02 +0100 [thread overview] Message-ID: <20240418135412.14730-7-Jonathan.Cameron@huawei.com> (raw) In-Reply-To: <20240418135412.14730-1-Jonathan.Cameron@huawei.com> From: James Morse <james.morse@arm.com> The arm64 specific arch_register_cpu() call may defer CPU registration until the ACPI interpreter is available and the _STA method can be evaluated. If this occurs, then a second attempt is made in acpi_processor_get_info(). Note that the arm64 specific call has not yet been added so for now this will be called for the original hotplug case. For architectures that do not defer until the ACPI Processor driver loads (e.g. x86), for initially present CPUs there will already be a CPU device. If present do not try to register again. Systems can still be booted with 'acpi=off', or not include an ACPI description at all as in these cases arch_register_cpu() will not have deferred registration when first called. This moves the CPU register logic back to a subsys_initcall(), while the memory nodes will have been registered earlier. Note this is where the call was prior to the cleanup series so there should be no side effects of moving it back again for this specific case. [PATCH 00/21] Initial cleanups for vCPU HP. https://lore.kernel.org/all/ZVyz%2FVe5pPu8AWoA@shell.armlinux.org.uk/ commit 5b95f94c3b9f ("x86/topology: Switch over to GENERIC_CPU_DEVICES") Signed-off-by: James Morse <james.morse@arm.com> Reviewed-by: Gavin Shan <gshan@redhat.com> Tested-by: Miguel Luis <miguel.luis@oracle.com> Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> Tested-by: Jianyong Wu <jianyong.wu@arm.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> --- v7: Simplify the logic on whether to hotadd the CPU. This path can only be reached either for coldplug in which case all we care about is has register_cpu() already been called (identifying deferred), or hotplug in which case whether register_cpu() has been called is also sufficient. Checks on _STA related elements or the validity of the ID are no longer necessary here due to similar checks having moved elsewhere in the path. v6: Squash the two paths for conventional CPU Hotplug and arm64 vCPU HP. --- drivers/acpi/acpi_processor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 127ae8dcb787..4e65011e706c 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -350,14 +350,14 @@ static int acpi_processor_get_info(struct acpi_device *device) } /* - * Extra Processor objects may be enumerated on MP systems with - * less than the max # of CPUs. They should be ignored _iff - * they are physically not present. - * - * NOTE: Even if the processor has a cpuid, it may not be present - * because cpuid <-> apicid mapping is persistent now. + * This code is not called unless we know the CPU is present and + * enabled. The two paths are: + * a) Initially present CPUs on architectures that do not defer + * their arch_register_cpu() calls until this point. + * b) Hotplugged CPUs (enabled bit in _STA has transitioned from not + * enabled to enabled) */ - if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) { + if (!get_cpu_device(pr->id)) { ret = acpi_processor_hotadd_init(pr, device); if (ret) -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-18 13:57 UTC|newest] Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-18 13:53 [PATCH v7 00/16] ACPI/arm64: add support for virtual cpu hotplug Jonathan Cameron 2024-04-18 13:53 ` Jonathan Cameron 2024-04-18 13:53 ` [PATCH v7 01/16] ACPI: processor: Simplify initial onlining to use same path for cold and hotplug Jonathan Cameron 2024-04-18 13:53 ` Jonathan Cameron 2024-04-22 18:46 ` Rafael J. Wysocki 2024-04-22 18:46 ` Rafael J. Wysocki 2024-04-23 6:18 ` Hanjun Guo 2024-04-23 6:18 ` Hanjun Guo 2024-04-26 9:23 ` Gavin Shan 2024-04-26 9:23 ` Gavin Shan 2024-04-18 13:53 ` [PATCH v7 02/16] cpu: Do not warn on arch_register_cpu() returning -EPROBE_DEFER Jonathan Cameron 2024-04-18 13:53 ` Jonathan Cameron 2024-04-23 6:22 ` Hanjun Guo 2024-04-23 6:22 ` Hanjun Guo 2024-04-26 9:20 ` Gavin Shan 2024-04-26 9:20 ` Gavin Shan 2024-04-18 13:53 ` [PATCH v7 03/16] ACPI: processor: Drop duplicated check on _STA (enabled + present) Jonathan Cameron 2024-04-18 13:53 ` Jonathan Cameron 2024-04-22 18:48 ` Rafael J. Wysocki 2024-04-22 18:48 ` Rafael J. Wysocki 2024-04-23 6:49 ` Hanjun Guo 2024-04-23 6:49 ` Hanjun Guo 2024-04-23 9:31 ` Rafael J. Wysocki 2024-04-23 9:31 ` Rafael J. Wysocki 2024-04-23 11:13 ` Hanjun Guo 2024-04-23 11:13 ` Hanjun Guo 2024-04-26 9:24 ` Gavin Shan 2024-04-26 9:24 ` Gavin Shan 2024-04-18 13:54 ` [PATCH v7 04/16] ACPI: processor: Move checks and availability of acpi_processor earlier Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 18:56 ` Rafael J. Wysocki 2024-04-22 18:56 ` Rafael J. Wysocki 2024-04-24 16:53 ` Jonathan Cameron 2024-04-24 16:53 ` Jonathan Cameron 2024-04-23 11:53 ` Hanjun Guo 2024-04-23 11:53 ` Hanjun Guo 2024-04-24 17:18 ` Jonathan Cameron 2024-04-24 17:18 ` Jonathan Cameron 2024-04-25 1:20 ` Hanjun Guo 2024-04-25 1:20 ` Hanjun Guo 2024-04-18 13:54 ` [PATCH v7 05/16] ACPI: processor: Add acpi_get_processor_handle() helper Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 18:59 ` Rafael J. Wysocki 2024-04-22 18:59 ` Rafael J. Wysocki 2024-04-26 9:15 ` Gavin Shan 2024-04-26 9:15 ` Gavin Shan 2024-04-18 13:54 ` Jonathan Cameron [this message] 2024-04-18 13:54 ` [PATCH v7 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Jonathan Cameron 2024-04-22 19:02 ` Rafael J. Wysocki 2024-04-22 19:02 ` Rafael J. Wysocki 2024-04-23 11:58 ` Hanjun Guo 2024-04-23 11:58 ` Hanjun Guo 2024-04-26 9:18 ` Gavin Shan 2024-04-26 9:18 ` Gavin Shan 2024-04-18 13:54 ` [PATCH v7 07/16] ACPI: scan: switch to flags for acpi_scan_check_and_detach() Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 19:05 ` Rafael J. Wysocki 2024-04-22 19:05 ` Rafael J. Wysocki 2024-04-23 12:02 ` Hanjun Guo 2024-04-23 12:02 ` Hanjun Guo 2024-04-26 9:25 ` Gavin Shan 2024-04-26 9:25 ` Gavin Shan 2024-04-18 13:54 ` [PATCH v7 08/16] ACPI: Add post_eject to struct acpi_scan_handler for cpu hotplug Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 19:10 ` Rafael J. Wysocki 2024-04-22 19:10 ` Rafael J. Wysocki 2024-04-23 12:06 ` Hanjun Guo 2024-04-23 12:06 ` Hanjun Guo 2024-04-26 11:48 ` Jonathan Cameron 2024-04-26 11:48 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 09/16] arm64: acpi: Move get_cpu_for_acpi_id() to a header Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 10:46 ` Jonathan Cameron 2024-04-22 10:46 ` Jonathan Cameron 2024-04-23 12:10 ` Hanjun Guo 2024-04-23 12:10 ` Hanjun Guo 2024-04-18 13:54 ` [PATCH v7 10/16] irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc() Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 10:39 ` Jonathan Cameron 2024-04-22 10:39 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 11/16] irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 10:40 ` Jonathan Cameron 2024-04-22 10:40 ` Jonathan Cameron 2024-04-23 12:01 ` Marc Zyngier 2024-04-23 12:01 ` Marc Zyngier 2024-04-24 12:54 ` Jonathan Cameron 2024-04-24 12:54 ` Jonathan Cameron 2024-04-24 15:33 ` Marc Zyngier 2024-04-24 15:33 ` Marc Zyngier 2024-04-24 16:35 ` Salil Mehta 2024-04-24 16:35 ` Salil Mehta 2024-04-24 17:08 ` Jonathan Cameron 2024-04-24 17:08 ` Jonathan Cameron 2024-04-25 10:23 ` Jonathan Cameron 2024-04-25 10:23 ` Jonathan Cameron 2024-04-25 12:31 ` Jonathan Cameron 2024-04-25 12:31 ` Jonathan Cameron 2024-04-25 15:00 ` Jonathan Cameron 2024-04-25 15:00 ` Jonathan Cameron 2024-04-25 16:55 ` Jonathan Cameron 2024-04-25 16:55 ` Jonathan Cameron 2024-04-26 12:41 ` Marc Zyngier 2024-04-26 12:41 ` Marc Zyngier 2024-04-25 9:28 ` Jonathan Cameron 2024-04-25 9:28 ` Jonathan Cameron 2024-04-25 9:56 ` Jonathan Cameron 2024-04-25 9:56 ` Jonathan Cameron 2024-04-25 10:13 ` Jonathan Cameron 2024-04-25 10:13 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 12/16] arm64: psci: Ignore DENIED CPUs Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-22 10:44 ` Jonathan Cameron 2024-04-22 10:44 ` Jonathan Cameron 2024-04-26 9:36 ` Gavin Shan 2024-04-26 9:36 ` Gavin Shan 2024-04-26 9:57 ` Jonathan Cameron 2024-04-26 9:57 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 13/16] arm64: arch_register_cpu() variant to check if an ACPI handle is now available Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 14/16] arm64: Kconfig: Enable hotplug CPU on arm64 if ACPI_PROCESSOR is enabled Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-24 17:24 ` Jonathan Cameron 2024-04-24 17:24 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 15/16] arm64: document virtual CPU hotplug's expectations Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-18 13:54 ` [PATCH v7 16/16] cpumask: Add enabled cpumask for present CPUs that can be brought online Jonathan Cameron 2024-04-18 13:54 ` Jonathan Cameron 2024-04-18 19:50 ` [PATCH v7 00/16] ACPI/arm64: add support for virtual cpu hotplug Rafael J. Wysocki 2024-04-18 19:50 ` Rafael J. Wysocki 2024-04-22 19:16 ` Rafael J. Wysocki 2024-04-22 19:16 ` Rafael J. Wysocki 2024-04-19 15:39 ` Miguel Luis 2024-04-19 15:39 ` Miguel Luis
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=20240418135412.14730-7-Jonathan.Cameron@huawei.com \ --to=jonathan.cameron@huawei.com \ --cc=bp@alien8.de \ --cc=catalin.marinas@arm.com \ --cc=dave.hansen@linux.intel.com \ --cc=james.morse@arm.com \ --cc=jean-philippe@linaro.org \ --cc=jianyong.wu@arm.com \ --cc=justin.he@arm.com \ --cc=kvmarm@lists.linux.dev \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linuxarm@huawei.com \ --cc=loongarch@lists.linux.dev \ --cc=miguel.luis@oracle.com \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=rafael@kernel.org \ --cc=salil.mehta@huawei.com \ --cc=tglx@linutronix.de \ --cc=will@kernel.org \ --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.