[PATCH 2/2] x86, apic: Disable BSP if boot cpu is AP

[Borislav Petkov]

On Thu, Aug 29, 2013 at 06:28:04PM +0900, HATAYAMA Daisuke wrote:
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 66cab35..fd969d1 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -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

I don't think we disable the BSP just so that we save memory and rather
because we hang in the kdump kernel otherwise, right?

> +	 * use (N-1)-cpus.
> +	 */
> +	if (isbsp && !boot_cpu_is_bsp) {

This variable naming looks confusing, IMHO. It would probably be more
understandable if 'isbsp' was called 'boot_cpu' to denote that this is
the CPU we're booting on currently. The comment above it then explains
that it is an AP and it might also refer to the issue why we're doing
that.

> +		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);

Visible comment, so needs a bit of correcting:

	"ACPI: We're not booting on the BSP; BSP %d/0x%x ignored."

> +
> +		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
>  	 */

Thanks.

-- 
Regards/Gruss,
Boris.