x86/mpparse, kexec: Fix kdump/kexec kernel panic with MPTABLE and x2apic
Subsystems (3)
cover x86/mpparse, kexec: Fix kdump/kexec kernel panic with MPTABLE and x2apic
From: Kairui Song <[email protected]>
Following kernel panic is observed when doing kdump/kexec on qemu-kvm VMs that uses MPTABLE, not ACPI MADT, and supports x2apic:
Intel MultiProcessor Specification v1.4
MPTABLE: OEM ID: BOCHSCPU
MPTABLE: Product ID: 0.1
MPTABLE: APIC at: 0xFEE00000
BUG: unable to handle page fault for address: ffffffffff5fc020 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 25e15067 P4D 25e15067 PUD 25e17067 PMD 25e18067 PTE 0 Oops: 0000 [#1] SMP NOPTI CPU: 0 PID: 0 Comm: swapper Not tainted 5.14.10-300.fc35.x86_64 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1.fc35 04/01/2014 RIP: 0010:native_apic_mem_read+0x2/0x10 Code: 14 25 20 cd e3 82 c3 90 bf 30 08 00 00 ff 14 25 18 cd e3 82 c3 cc cc cc 89 ff 89 b7 00 c0 5f ff c3 0f 1f 80 00 00 00 00 89 ff <8b> 87 00 c0 5f ff c3 0f 1f 80 00 00 00 0 RSP: 0000:ffffffff82e03e18 EFLAGS: 00010046 RAX: ffffffff81064840 RBX: ffffffffff240b6c RCX: ffffffff82f17428 RDX: c0000000ffffdfff RSI: 00000000ffffdfff RDI: 0000000000000020 RBP: ffff888023200000 R08: 0000000000000000 R09: ffffffff82e03c50 R10: ffffffff82e03c48 R11: ffffffff82f47468 R12: ffffffffff240b40 R13: ffffffffff200b30 R14: 0000000000000000 R15: 00000000000000d4 FS: 0000000000000000(0000) GS:ffffffff8365b000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffff5fc020 CR3: 0000000025e10000 CR4: 00000000000006b0 Call Trace: ? read_apic_id+0x15/0x30 ? register_lapic_address+0x76/0x97 ? default_get_smp_config+0x28b/0x42d ? dmi_check_system+0x1c/0x60 ? acpi_boot_init+0x1d/0x4c3 ? setup_arch+0xb37/0xc2a ? slab_is_available+0x5/0x10 ? start_kernel+0x61/0x980 ? load_ucode_bsp+0x4c/0xcd ? secondary_startup_64_no_verify+0xc2/0xcb Modules linked in: CR2: ffffffffff5fc020 random: get_random_bytes called from oops_exit+0x35/0x60 with crng_init=0 ---[ end trace c9e569df3bdbefd3 ]---
It turns out MPTABLE doesn't play well with pre-enabled x2apic mode, this series extend the apic driver interface and let MPTABLE parse probe the driver properly.
This can be easily reproduced with qemu-kvm, use -no-acpi and enable x2apic, so x2apic with MPTABLE will be in use, then trigger kdump/kexec.
Kairui Song (2):
x86, apic: add a more generic early_probe x86/mpparse, kexec: probe apic driver early for x2apic
arch/x86/include/asm/apic.h | 6 ++++++ arch/x86/kernel/apic/probe_64.c | 16 ++++++++++++++++ arch/x86/kernel/apic/x2apic_cluster.c | 8 +++++++- arch/x86/kernel/apic/x2apic_phys.c | 8 +++++++- arch/x86/kernel/mpparse.c | 4 +++- 5 files changed, 39 insertions(+), 3 deletions(-)
Signature · 7 lines
2.35.2 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 1/2 x86/apic: add a more generic early_probe
From: Kairui Song <[email protected]>
There is only one early apic driver probe method: acpi_madt_oem_check, which is used by ACPI MADT init path only.
Some apic drivers' early probe doesn't need ACPI info. Even when probed from ACPI subsystem, the ACPI info is simply ignored. So add a more generic early_probe method, which can be used by MPTABLE parse later.
--- arch/x86/include/asm/apic.h | 6 ++++++ arch/x86/kernel/apic/probe_64.c | 16 ++++++++++++++++ arch/x86/kernel/apic/x2apic_cluster.c | 8 +++++++- arch/x86/kernel/apic/x2apic_phys.c | 8 +++++++- 4 files changed, 36 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +6 -0
@@ -310,6 +310,7 @@ struct apic {/* Probe, setup and smpboot functions */ int (*probe)(void ); +int (*early_probe)(void );int (*acpi_madt_oem_check)(char *oem_id,char *oem_table_id);int (*apic_id_valid)(u32 apicid);int (*apic_id_registered)(void );
@@ -498,6 +499,11 @@ extern void acpi_wake_cpu_handler_update(wakeup_cpu_handler handler);extern int default_apic_id_valid (u32 apicid);extern int default_acpi_madt_oem_check (char *,char *);extern void default_setup_apic_routing (void ); +#ifdef CONFIG_X86_64 +extern void apic_early_probe (void ); +#else +static inline void apic_early_probe (void ) { } +#endif extern u32 apic_default_calc_apicid (unsigned int cpu);extern u32 apic_flat_calc_apicid (unsigned int cpu);
arch/x86/kernel/apic/probe_64.c +16 -0
@@ -13,6 +13,22 @@#include "local.h" +void __init apic_early_probe (void ) +{ +struct apic **drv; + +for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) { +if ((*drv)->early_probe && (*drv)->early_probe ()) { +if (apic != *drv) { + apic = *drv; +pr_info ("Switched to APIC driver %s.\n" , + apic->name); + } +break ; + } + } +} +/* * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. */
arch/x86/kernel/apic/x2apic_cluster.c +7 -1
@@ -26,11 +26,16 @@ static DEFINE_PER_CPU(cpumask_var_t, ipi_mask); static DEFINE_PER_CPU_READ_MOSTLY(struct cluster_mask *, cluster_masks);static struct cluster_mask *cluster_hotplug_mask; -static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int x2apic_early_probe (void ) {return x2apic_enabled (); } +static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +{ +return x2apic_early_probe (); +} +static void x2apic_send_IPI (int cpu,int vector) {u32 dest = x86_cpu_to_logical_apicid[cpu];
@@ -197,6 +202,7 @@ static struct apic apic_x2apic_cluster __ro_after_init = { .name = "cluster x2apic", .probe = x2apic_cluster_probe, + .early_probe = x2apic_early_probe, .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, .apic_id_valid = x2apic_apic_id_valid, .apic_id_registered = x2apic_apic_id_registered,
arch/x86/kernel/apic/x2apic_phys.c +7 -1
@@ -34,11 +34,16 @@ static bool x2apic_fadt_phys(void)return false; } -static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int x2apic_early_probe (void ) {return x2apic_enabled () && (x2apic_phys ||x2apic_fadt_phys ()); } +static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +{ +return x2apic_early_probe (); +} +static void x2apic_send_IPI (int cpu,int vector) {u32 dest =per_cpu (x86_cpu_to_apicid, cpu);
@@ -156,6 +161,7 @@ static struct apic apic_x2apic_phys __ro_after_init = { .name = "physical x2apic", .probe = x2apic_phys_probe, + .early_probe = x2apic_early_probe, .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, .apic_id_valid = x2apic_apic_id_valid, .apic_id_registered = x2apic_apic_id_registered,
Signature · 7 lines
2.35.2 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 2/2 x86/mpparse, kexec: probe apic driver early for x2apic
In reply to Kairui SongFrom: Kairui Song <[email protected]>
Following kernel panic is observed when doing kdump/kexec on virtual machines that uses MPTABLE, not ACPI MADT, and supports x2apic:
Intel MultiProcessor Specification v1.4
MPTABLE: OEM ID: BOCHSCPU
MPTABLE: Product ID: 0.1
MPTABLE: APIC at: 0xFEE00000
BUG: unable to handle page fault for address: ffffffffff5fc020 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 25e15067 P4D 25e15067 PUD 25e17067 PMD 25e18067 PTE 0 Oops: 0000 [#1] SMP NOPTI CPU: 0 PID: 0 Comm: swapper Not tainted 5.14.10-300.fc35.x86_64 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1.fc35 04/01/2014 RIP: 0010:native_apic_mem_read+0x2/0x10 Code: 14 25 20 cd e3 82 c3 90 bf 30 08 00 00 ff 14 25 18 cd e3 82 c3 cc cc cc 89 ff 89 b7 00 c0 5f ff c3 0f 1f 80 00 00 00 00 89 ff <8b> 87 00 c0 5f ff c3 0f 1f 80 00 00 00 0 RSP: 0000:ffffffff82e03e18 EFLAGS: 00010046 RAX: ffffffff81064840 RBX: ffffffffff240b6c RCX: ffffffff82f17428 RDX: c0000000ffffdfff RSI: 00000000ffffdfff RDI: 0000000000000020 RBP: ffff888023200000 R08: 0000000000000000 R09: ffffffff82e03c50 R10: ffffffff82e03c48 R11: ffffffff82f47468 R12: ffffffffff240b40 R13: ffffffffff200b30 R14: 0000000000000000 R15: 00000000000000d4 FS: 0000000000000000(0000) GS:ffffffff8365b000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffff5fc020 CR3: 0000000025e10000 CR4: 00000000000006b0 Call Trace: ? read_apic_id+0x15/0x30 ? register_lapic_address+0x76/0x97 ? default_get_smp_config+0x28b/0x42d ? dmi_check_system+0x1c/0x60 ? acpi_boot_init+0x1d/0x4c3 ? setup_arch+0xb37/0xc2a ? slab_is_available+0x5/0x10 ? start_kernel+0x61/0x980 ? load_ucode_bsp+0x4c/0xcd ? secondary_startup_64_no_verify+0xc2/0xcb Modules linked in: CR2: ffffffffff5fc020 random: get_random_bytes called from oops_exit+0x35/0x60 with crng_init=0 ---[ end trace c9e569df3bdbefd3 ]---
The panic happens within following init code:setup_arch()
....
check_x2apic() <-- x2apic is enabled by first kernel before kexec,
this set x2apic_mode = 1, make sure later probes will recognize pre-enabled x2apic.
....
acpi_boot_init(); <-- If ACPI MADT is in use, this will switch apic driver
to x2apic, but it will do nothing with MPTABLE.
x86_dtb_init();
get_smp_config();
default_get_smp_config(); <-- MPTABLE setup.
check_physptr();
smp_read_mpc();
register_lapic_address(); <-- * panic here * init_apic_mappings();
....
The problem here is MPTABLE setup calls register_lapic_address(), which is still using apic_flat driver, and access the apic MMIO interface. But the address is never mapped for pre-enabled x2apic, since commit 0450193bffed6 ("x86, x2apic: Don't map lapic addr for preenabled x2apic systems"), then it panics.
Simply map it won't work either, in x2apic mode the MMIO interface is not usable (Intel SDM Volume 3A 10.12.2), later setups will still fail with other errors. So it needs do a proper apic driver probe and switch to x2apic driver to perform MSR operation instead.
Such issue is currently only seen with kdump/kexec, kernel enabled the x2apic in first kernel and kept it enabled to 2nd kernel.
This can be easily reproduced with qemu-kvm, use -no-acpi and enable x2apic, so x2apic with MPTABLE will be in use, then trigger kdump/kexec.
--- arch/x86/kernel/mpparse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/mpparse.c +3 -1
@@ -202,8 +202,10 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)return 0 ;/* Initialize the lapic mapping */ -if (!acpi_lapic) +if (!acpi_lapic) { +apic_early_probe ();register_lapic_address (mpc->lapic); + }if (early)return 1 ;
Signature · 7 lines
2.35.2 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec