Skip to content

Commit 2a51fe0

Browse files
praritKAGA-KOKO
authored andcommitted
arch/x86: Handle non enumerated CPU after physical hotplug
When a CPU is physically added to a system then the MADT table is not updated. If subsequently a kdump kernel is started on that physically added CPU then the ACPI enumeration fails to provide the information for this CPU which is now the boot CPU of the kdump kernel. As a consequence, generic_processor_info() is not invoked for that CPU so the number of enumerated processors is 0 and none of the initializations, including the logical package id management, are performed. We have code which relies on the correctness of the logical package map and other information which is initialized via generic_processor_info(). Executing such code will result in undefined behaviour or kernel crashes. This problem applies only to the kdump kernel because a normal kexec will switch to the original boot CPU, which is enumerated in MADT, before jumping into the kexec kernel. The boot code already has a check for num_processors equal 0 in prefill_possible_map(). We can use that check as an indicator that the enumeration of the boot CPU did not happen and invoke generic_processor_info() for it. That initializes the relevant data for the boot CPU and therefore prevents subsequent failure. [ tglx: Refined the code and rewrote the changelog ] Signed-off-by: Prarit Bhargava <[email protected]> Fixes: 1f12e32 ("x86/topology: Create logical package id") Cc: Peter Zijlstra <[email protected]> Cc: Len Brown <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Juergen Gross <[email protected]> Cc: [email protected] Cc: Eric Biederman <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent cfee9ed commit 2a51fe0

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

arch/x86/kernel/smpboot.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,9 +1407,21 @@ __init void prefill_possible_map(void)
14071407
{
14081408
int i, possible;
14091409

1410-
/* no processor from mptable or madt */
1411-
if (!num_processors)
1412-
num_processors = 1;
1410+
/* No boot processor was found in mptable or ACPI MADT */
1411+
if (!num_processors) {
1412+
int apicid = boot_cpu_physical_apicid;
1413+
int cpu = hard_smp_processor_id();
1414+
1415+
pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu);
1416+
1417+
/* Make sure boot cpu is enumerated */
1418+
if (apic->cpu_present_to_apicid(0) == BAD_APICID &&
1419+
apic->apic_id_valid(apicid))
1420+
generic_processor_info(apicid, boot_cpu_apic_version);
1421+
1422+
if (!num_processors)
1423+
num_processors = 1;
1424+
}
14131425

14141426
i = setup_max_cpus ?: 1;
14151427
if (setup_possible_cpus == -1) {

0 commit comments

Comments
 (0)