The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     8b37357a78d7fa13d88ea822b35b40137da1c85e
Gitweb:        https://git.kernel.org/tip/8b37357a78d7fa13d88ea822b35b40137da1c85e
Author:        Petr Vaněk <arkamar@atlas.cz>
AuthorDate:    Mon, 07 Apr 2025 15:24:27 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 07 Apr 2025 16:35:21 +02:00

x86/acpi: Don't limit CPUs to 1 for Xen PV guests due to disabled ACPI

Xen disables ACPI for PV guests in DomU, which causes acpi_mps_check() to
return 1 when CONFIG_X86_MPPARSE is not set. As a result, the local APIC is
disabled and the guest is later limited to a single vCPU, despite being
configured with more.

This regression was introduced in version 6.9 in commit 7c0edad3643f
("x86/cpu/topology: Rework possible CPU management"), which added an
early check that limits CPUs to 1 if apic_is_disabled.

Update the acpi_mps_check() logic to return 0 early when running as a Xen
PV guest in DomU, preventing APIC from being disabled in this specific case
and restoring correct multi-vCPU behaviour.

Fixes: 7c0edad3643f ("x86/cpu/topology: Rework possible CPU management")
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250407132445.6732-2-arkamar@atlas.cz
---
 arch/x86/kernel/acpi/boot.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index dae6a73..9fa321a 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -23,6 +23,8 @@
 #include <linux/serial_core.h>
 #include <linux/pgtable.h>
 
+#include <xen/xen.h>
+
 #include <asm/e820/api.h>
 #include <asm/irqdomain.h>
 #include <asm/pci_x86.h>
@@ -1729,6 +1731,15 @@ int __init acpi_mps_check(void)
 {
 #if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_X86_MPPARSE)
 /* mptable code is not built-in*/
+
+	/*
+	 * Xen disables ACPI in PV DomU guests but it still emulates APIC and
+	 * supports SMP. Returning early here ensures that APIC is not disabled
+	 * unnecessarily and the guest is not limited to a single vCPU.
+	 */
+	if (xen_pv_domain() && !xen_initial_domain())
+		return 0;
+
 	if (acpi_disabled || acpi_noirq) {
 		pr_warn("MPS support code is not built-in, using acpi=off or acpi=noirq or pci=noacpi may have problem\n");
 		return 1;

On Mon, Apr 07, 2025 at 02:44:29PM -0000, tip-bot2 for Petr Vaněk wrote:
> The following commit has been merged into the x86/urgent branch of tip:
> 
> Commit-ID:     8b37357a78d7fa13d88ea822b35b40137da1c85e
> Gitweb:        https://git.kernel.org/tip/8b37357a78d7fa13d88ea822b35b40137da1c85e
> Author:        Petr Vaněk <arkamar@atlas.cz>
> AuthorDate:    Mon, 07 Apr 2025 15:24:27 +02:00
> Committer:     Thomas Gleixner <tglx@linutronix.de>
> CommitterDate: Mon, 07 Apr 2025 16:35:21 +02:00
> 
> x86/acpi: Don't limit CPUs to 1 for Xen PV guests due to disabled ACPI

Thank you for accepting the patch.

Out of curiosity, why did you remove the Cc: stable@vger.kernel.org
trailer? I thought it should be backported as it is a regression.

Thanks,
Petr

On Tue, Apr 08 2025 at 08:19, Petr Vaněk wrote:
> On Mon, Apr 07, 2025 at 02:44:29PM -0000, tip-bot2 for Petr Vaněk wrote:
>> The following commit has been merged into the x86/urgent branch of tip:
>> 
>> Commit-ID:     8b37357a78d7fa13d88ea822b35b40137da1c85e
>> Gitweb:        https://git.kernel.org/tip/8b37357a78d7fa13d88ea822b35b40137da1c85e
>> Author:        Petr Vaněk <arkamar@atlas.cz>
>> AuthorDate:    Mon, 07 Apr 2025 15:24:27 +02:00
>> Committer:     Thomas Gleixner <tglx@linutronix.de>
>> CommitterDate: Mon, 07 Apr 2025 16:35:21 +02:00
>> 
>> x86/acpi: Don't limit CPUs to 1 for Xen PV guests due to disabled ACPI
>
> Thank you for accepting the patch.
>
> Out of curiosity, why did you remove the Cc: stable@vger.kernel.org
> trailer? I thought it should be backported as it is a regression.

Accidentally. Ooops.

The stable bot should pick it up nevertheless because of the Fixes tag
once it hit Linus tree. If it does not after a week or so, please send a
backport request to the stable folks.

Thanks,

        tglx