x86, apic, kdump: Disable BSP if boot cpu is AP
Subsystems (4)
v3 cover x86, apic, kdump: Disable BSP if boot cpu is AP
This patch set is to allow kdump 2nd kernel to wake up multiple CPUs even if 1st kernel crashs on some AP.
Sorry, this patch set have not include in-source documentation requested by Borislav Petkov yet, but I'll post it later separately, which would be better to focus on documentation reviewing.
ChangeLog
v2 => v3)
- Change default value of boot_cpu_is_bsp to true.
- Before executing rdmsr(MSR_IA32_APICBASE), check if the number of processor family is larger than or equal to 6 in order to avoid invalid opcode exception on processors where MSR_IA32_APICBASE is not supported.
v1 => v2)
- Rebased on top of v3.12-rc5.
- Fix linking time error of boot_cpu_is_bsp_init() in case of CONFIG_LOCAL_APIC disabled by adding empty static inline function instead.
- Fix missing feature check by means of cpu_has_apic macro in boot_cpu_is_bsp_init() before calling rdmsr_safe(MSR_IA32_APICBASE).
NOTE: I've checked local apic-present case only; I don't have any x86 processor without local apic.
- Add __init annotation to boot_cpu_is_bsp_init().
Test
- built with and without CONFIG_LOCAL_APIC
- tested x86_64 in case of acpi and MP table
---
HATAYAMA Daisuke (2):
x86, apic: Add boot_cpu_is_bsp() to check if boot cpu is BSP x86, apic: Disable BSP if boot cpu is AP
arch/x86/include/asm/mpspec.h | 9 ++++++++- arch/x86/kernel/acpi/boot.c | 6 +++++- arch/x86/kernel/apic/apic.c | 35 ++++++++++++++++++++++++++++++++++- arch/x86/kernel/devicetree.c | 1 + arch/x86/kernel/mpparse.c | 15 +++++++++++++-- arch/x86/kernel/setup.c | 2 ++ arch/x86/platform/sfi/sfi.c | 2 +- 7 files changed, 64 insertions(+), 6 deletions(-)
Signature · 2 lines
Thanks. HATAYAMA, Daisuke
PATCH v3 1/2 x86, apic: Add boot_cpu_is_bsp() to check if boot cpu is BSP
Kexec can enter the kdump 2nd kernel on AP if crash happens on AP. To check if boot cpu is BSP, introduce a helper function boot_cpu_is_bsp().
--- arch/x86/include/asm/mpspec.h | 7 +++++++ arch/x86/kernel/apic/apic.c | 17 +++++++++++++++++ arch/x86/kernel/setup.c | 2 ++ 3 files changed, 26 insertions(+)
arch/x86/include/asm/mpspec.h +7 -0
@@ -47,11 +47,18 @@ extern int mp_bus_id_to_type[MAX_MP_BUSSES]; extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);extern unsigned int boot_cpu_physical_apicid; +extern bool boot_cpu_is_bsp;extern unsigned int max_physical_apicid;extern int mpc_default_type;extern unsigned long mp_lapic_addr;#ifdef CONFIG_X86_LOCAL_APIC +extern void boot_cpu_is_bsp_init (void ); +#else +static inline void boot_cpu_is_bsp_init (void ) { }; +#endif + +#ifdef CONFIG_X86_LOCAL_APIC extern int smp_found_config;#else # define smp_found_config 0
arch/x86/kernel/apic/apic.c +17 -0
@@ -64,6 +64,12 @@ unsigned disabled_cpus;unsigned int boot_cpu_physical_apicid =-1U ;/* +* Indicates whether the processor that is doing the boot up, is BSP +* processor or not. +*/ +bool boot_cpu_is_bsp = true; + +/* * The highest APIC ID seen during enumeration. */ unsigned int max_physical_apicid;
@@ -2589,3 +2595,14 @@ static int __init lapic_insert_resource(void)* that is using request_resource */ late_initcall (lapic_insert_resource); + +void __init boot_cpu_is_bsp_init (void ) +{ +u32 l, h; + +if (boot_cpu_data.x86 >=6 && cpu_has_apic) { +rdmsr (MSR_IA32_APICBASE , l, h); +if (!(l &MSR_IA32_APICBASE_BSP )) + boot_cpu_is_bsp = false; + } +}
arch/x86/kernel/setup.c +2 -0
@@ -1166,6 +1166,8 @@ void __init setup_arch(char **cmdline_p)early_quirks (); +boot_cpu_is_bsp_init (); +/* * Read APIC and some other early information from ACPI tables. */
PATCH v3 2/2 x86, apic: Disable BSP if boot cpu is AP
In reply to HATAYAMA DaisukeCurrently, on x86 architecture, if crash happens on AP in the kdump 1st kernel, the 2nd kernel fails to wake up multiple CPUs. The typical behaviour we actually see is immediate system reset or hang.
This comes from the hardware specification that the processor with BSP flag is jumped at BIOS init code when receiving INIT; the behaviour we then see depends on the init code.
This never happens if we use only one cpu in the 2nd kernel. So, we have avoided the issue by the workaround that specifying maxcpus=1 or nr_cpus=1 in kernel parameter of the 2nd kernel.
In order to address the issue, this patch disables BSP if boot cpu is an AP, and thus we don't try to wake up the BSP by sending INIT.
Before this idea we discussed the following two ideas but we cannot adopt them in each reasons:
1. Switch CPU from AP to BSP via IPI NMI at crash in the 1st kernel
This is done in the kdump crash path where logic is in inconsistent state. Any part of memory can be corrupted, including hardware-related table being accessed for example when paging is performed or interruption is performed.
2. Unset BSP flag of the boot cpu in the 1st kernel
Unsetting BSP flag can affect some real world firmware badly. For example, Ma verified that some HP systems fail to reboot under this configuration. See:
http://lkml.indiana.edu/hypermail/linux/kernel/1308.1/03574.html
Due to the idea 1, we have to address the issue in the 2nd kernel on AP. Then, it's impossible to know which CPU is BSP by rdmsr instruction because the CPU is the one we are now trying to wake up. From the same reason, it's also impossible to unset BSP flag of the BSP by wrmsr instruction.
Next, due to the idea 2, BSP is halting in the 1st kernel while keeping BSP flag set (or possibly could be running somewhere in catastrophic state.) In generall, CPUs except for the boot cpu in the 2nd kernel -- the cpu under which crash happened --- can be thought of as remaining in any inconsistent state in the 1st kernel. For APs, it's possible to recover sane state by initiating INIT to them; see 3.7.3 Processor-specific INIT in MultiProcessor specification. However, there's no way for BSP. Therefore, there's no other way to disable BSP.
My motivation is to generate crash dump quickly on the system with huge memory. We can assume such system also has a lot of N-cpus and (N-1)-cpus are still available.
To identify which CPU is BSP, we lookup ACPI table or MP table. One concern is that ACPI guidlines BIOS *should* list the BSP in the first MADT LAPIC entry; not *must*. In this sense, this logic relis on BIOS following ACPI's guideline. On the other hand, we don't need to worry about this in MP table case because it has explit BSP flag.
To avoid any undesirable bahaviour caused by any broken BIOS that doesn't conform to the guideline, it's enough to limit the number of cpus to 1 by specifying maxcpu=1 or nr_cpus=1, as is currently done in default kdump configuration. (But of course, it's problematic in maxcpu=1 case if trying to wake up other cpus later in user space.)
SFI and devicetree doesn't provide BSP information, so there's no functionality change in their codes, only assigning false for all the entries, keeping interface uniform.
--- arch/x86/include/asm/mpspec.h | 2 +- arch/x86/kernel/acpi/boot.c | 6 +++++- arch/x86/kernel/apic/apic.c | 18 +++++++++++++++++- arch/x86/kernel/devicetree.c | 1 + arch/x86/kernel/mpparse.c | 15 +++++++++++++-- arch/x86/platform/sfi/sfi.c | 2 +- 6 files changed, 38 insertions(+), 6 deletions(-)
arch/x86/include/asm/mpspec.h +1 -1
@@ -101,7 +101,7 @@ static inline void early_reserve_e820_mpc_new(void) { }#define default_get_smp_config x86_init_uint_noop#endif -void generic_processor_info (int apicid,int version); +void generic_processor_info (int apicid,bool isbsp,int version);#ifdef CONFIG_ACPI extern void mp_register_ioapic (int id,u32 address,u32 gsi_base); extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
arch/x86/kernel/acpi/boot.c +5 -1
@@ -192,6 +192,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)static void acpi_register_lapic (int id,u8 enabled) {unsigned int ver =0 ; +bool isbsp = false;if (id >=MAX_LOCAL_APIC ) { printk(KERN_INFO PREFIX "skipped apicid that is too big\n");
@@ -206,7 +207,10 @@ static void acpi_register_lapic(int id, u8 enabled)if (boot_cpu_physical_apicid !=-1U ) ver = apic_version[boot_cpu_physical_apicid]; -generic_processor_info (id, ver); +if (!num_processors && !disabled_cpus) + isbsp = true; + +generic_processor_info (id, isbsp, ver); } static int __init
arch/x86/kernel/apic/apic.c +17 -1
@@ -2113,13 +2113,29 @@ void disconnect_bsp_APIC(int virt_wire_setup)apic_write (APIC_LVT1 , value); } -void generic_processor_info (int apicid,int version) +void generic_processor_info (int apicid,bool isbsp,int version) {int cpu, max = nr_cpu_ids;bool boot_cpu_detected =physid_isset (boot_cpu_physical_apicid, phys_cpu_present_map);/* +* If boot cpu is AP, we now don't have any way to initialize +* BSP. To save memory consumed, we disable BSP this case and +* use (N - 1)-cpus. +*/ +if (isbsp && !boot_cpu_is_bsp) { +int thiscpu = num_processors + disabled_cpus; + +pr_warning ("ACPI: The boot cpu is not BSP. " +"The BSP Processor %d/0x%x ignored.\n" , + thiscpu, apicid); + + disabled_cpus++; +return ; + } + +/* * If boot cpu has not been detected yet, then only allow upto * nr_cpu_ids - 1 processors and keep one slot free for boot cpu */
arch/x86/kernel/devicetree.c +1 -0
@@ -182,6 +182,7 @@ static void __init dtb_lapic_setup(void) pic_mode =1 ;register_lapic_address (r.start);generic_processor_info (boot_cpu_physical_apicid, + false,GET_APIC_VERSION (apic_read (APIC_LVR )));#endif }
arch/x86/kernel/mpparse.c +13 -2
@@ -54,6 +54,7 @@ static void __init MP_processor_info(struct mpc_cpu *m) {int apicid;char *bootup_cpu ="" ; +bool isbsp = false;if (!(m->cpuflag &CPU_ENABLED )) { disabled_cpus++;
@@ -64,11 +65,21 @@ static void __init MP_processor_info(struct mpc_cpu *m)if (m->cpuflag &CPU_BOOTPROCESSOR ) { bootup_cpu =" (Bootup-CPU)" ; - boot_cpu_physical_apicid = m->apicid; +/* +* boot cpu cannot be BSP if any crash happens on AP +* and kexec enters the 2nd kernel. +* +* Also, boot_cpu_physical_apicid can be initialized +* before reaching here; for example, in +* register_lapic_address(). +*/ +if (boot_cpu_is_bsp && boot_cpu_physical_apicid ==-1U ) + boot_cpu_physical_apicid = m->apicid; + isbsp = true; }printk (KERN_INFO "Processor #%d%s\n" , m->apicid, bootup_cpu); -generic_processor_info (apicid, m->apicver); +generic_processor_info (apicid, isbsp, m->apicver); }#ifdef CONFIG_X86_IO_APIC
arch/x86/platform/sfi/sfi.c +1 -1
@@ -45,7 +45,7 @@ static void __init mp_sfi_register_lapic(u8 id)pr_info ("registering lapic[%d]\n" , id); -generic_processor_info (id,GET_APIC_VERSION (apic_read (APIC_LVR ))); +generic_processor_info (id, false,GET_APIC_VERSION (apic_read (APIC_LVR ))); }static int __init sfi_parse_cpus (struct sfi_table_header *table)
Quoted 9 lines · HATAYAMA Daisuke
This patch set is to allow kdump 2nd kernel to wake up multiple CPUs even if 1st kernel crashs on some AP.
Sorry, this patch set have not include in-source documentation requested by Borislav Petkov yet, but I'll post it later separately, which would be better to focus on documentation reviewing.
ChangeLog
Quoted 8 lines
v2 => v3)
- Change default value of
boot_cpu_is_bspto true.- Before executing
rdmsr(MSR_IA32_APICBASE), check if the number of processor family is larger than or equal to 6 in order to avoid invalid opcode exception on processors whereMSR_IA32_APICBASEis not supported.
Daisuke,
Thank you for doing this work.
I have back ported these changes to a 2.6.32 based kernel and have tested with nr_cpus=8 and have not seen any problems. The system without these patches wouldn't successfully boot the capture kernel when nr_cpus > 1.
thanks
Jerry Hoemann
Quoted 47 lines
v1 => v2)
- Rebased on top of v3.12-rc5.
- Fix linking time error of
boot_cpu_is_bsp_init()in case ofCONFIG_LOCAL_APICdisabled by adding empty static inline function instead.- Fix missing feature check by means of
cpu_has_apicmacro inboot_cpu_is_bsp_init()before callingrdmsr_safe(MSR_IA32_APICBASE).NOTE: I've checked local apic-present case only; I don't have any x86 processor without local apic.
- Add
__initannotation toboot_cpu_is_bsp_init().Test
- built with and without
CONFIG_LOCAL_APIC
- testedx86_64in case of acpi and MP table---
HATAYAMA Daisuke (2):
x86, apic: Addboot_cpu_is_bsp()to check if boot cpu is BSP x86, apic: Disable BSP if boot cpu is AParch/x86/include/asm/mpspec.h | 9 ++++++++- arch/x86/kernel/acpi/boot.c | 6 +++++- arch/x86/kernel/apic/apic.c | 35 ++++++++++++++++++++++++++++++++++- arch/x86/kernel/devicetree.c | 1 + arch/x86/kernel/mpparse.c | 15 +++++++++++++-- arch/x86/kernel/setup.c | 2 ++ arch/x86/platform/sfi/sfi.c | 2 +- 7 files changed, 64 insertions(+), 6 deletions(-)Signature · 7 lines
Thanks. HATAYAMA, Daisuke _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Signature · 7 lines
----------------------------------------------------------------------------
Jerry Hoemann Software Engineer Hewlett-Packard/MODL
3404 E Harmony Rd. MS 57 phone: (970) 898-1022
Ft. Collins, CO 80528 FAX: (970) 898-XXXX
email: [email protected]
----------------------------------------------------------------------------