Patchwork x86: fix vsmp booting with phys_pkg_id changing

login
register
mail settings
Submitter Yinghai Lu
Date Aug. 25, 2009, 8:44 p.m.
Message ID <4A944D3C.5030100@kernel.org>
Download mbox | patch
Permalink /patch/43806/
State New, archived
Headers show

Comments

Yinghai Lu - Aug. 25, 2009, 8:44 p.m.
2.6.31-rc7 does not boot on vSMPowered systems. 

[    8.501108] CPU31: Thermal monitoring enabled (TM1)
[    8.501127] CPU 31 MCA banks SHD:2 SHD:3 SHD:5 SHD:6 SHD:8
[    8.650254] CPU31: Intel(R) Xeon(R) CPU           E5540  @ 2.53GHz stepping 04
[    8.710324] Brought up 32 CPUs
[    8.713916] Total of 32 processors activated (162314.96 BogoMIPS).
[    8.721489] ERROR: parent span is not a superset of domain->span
[    8.727686] ERROR: domain->groups does not contain CPU0
[    8.733091] ERROR: groups don't span domain->span
[    8.737975] ERROR: domain->cpu_power not set
[    8.742416]

bisected to
|
| commit 2759c3287de27266e06f1f4e82cbd2d65f6a044c
| x86: don't call read_apic_id if !cpu_has_apic
|

need to use apic id in phys_pkg_id for vsmp...

Reported-and-Tested-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 arch/x86/kernel/apic/probe_64.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Ingo Molnar - Aug. 26, 2009, 8:08 a.m.
* Yinghai Lu <yinghai@kernel.org> wrote:

> 2.6.31-rc7 does not boot on vSMPowered systems. 
> 
> [    8.501108] CPU31: Thermal monitoring enabled (TM1)
> [    8.501127] CPU 31 MCA banks SHD:2 SHD:3 SHD:5 SHD:6 SHD:8
> [    8.650254] CPU31: Intel(R) Xeon(R) CPU           E5540  @ 2.53GHz stepping 04
> [    8.710324] Brought up 32 CPUs
> [    8.713916] Total of 32 processors activated (162314.96 BogoMIPS).
> [    8.721489] ERROR: parent span is not a superset of domain->span
> [    8.727686] ERROR: domain->groups does not contain CPU0
> [    8.733091] ERROR: groups don't span domain->span
> [    8.737975] ERROR: domain->cpu_power not set
> [    8.742416]
> 
> bisected to
> |
> | commit 2759c3287de27266e06f1f4e82cbd2d65f6a044c
> | x86: don't call read_apic_id if !cpu_has_apic
> |
> 
> need to use apic id in phys_pkg_id for vsmp...
> 
> Reported-and-Tested-by: Ravikiran Thirumalai <kiran@scalex86.org>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> 
> ---
>  arch/x86/kernel/apic/probe_64.c |   10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> Index: linux-2.6/arch/x86/kernel/apic/probe_64.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/apic/probe_64.c
> +++ linux-2.6/arch/x86/kernel/apic/probe_64.c
> @@ -44,6 +44,11 @@ static struct apic *apic_probe[] __initd
>  	NULL,
>  };
>  
> +static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
> +{
> +	return hard_smp_processor_id() >> index_msb;
> +}
> +
>  /*
>   * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
>   */
> @@ -69,6 +74,11 @@ void __init default_setup_apic_routing(v
>  		printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
>  	}
>  
> +	if (is_vsmp_box()) {
> +		/* need to update phys_pkg_id */
> +		apic->phys_pkg_id = apicid_phys_pkg_id;
> +	}

Ok, this looks like a rather straightforward quirk - and vSMP is 
indeed special in that it sets up overlapping APIC ids. It's also 
the smaller patch with basically zero cross section to other 
systems, so a lot more -rc7 worthy.

So i've applied it to x86/urgent (with small edits to the 
changelog). Any objections from anyone?

Note, should any other, real hardware show problems with , we might 
still have to consider reverting the original change in 2759c32. 
It's borderline.

Btw., the code is still not fully clean. For example this bit in 
generic_identify():

#ifdef CONFIG_X86_32
# ifdef CONFIG_X86_HT
                c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
# else
                c->apicid = c->initial_apicid;
# endif
#endif

and in another place we have:

#ifdef CONFIG_X86_64
        c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
#endif

This ifdeffery could probably be removed and we could call 
->phys_pkg_id() all the time, right?

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch

Index: linux-2.6/arch/x86/kernel/apic/probe_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic/probe_64.c
+++ linux-2.6/arch/x86/kernel/apic/probe_64.c
@@ -44,6 +44,11 @@  static struct apic *apic_probe[] __initd
 	NULL,
 };
 
+static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
+{
+	return hard_smp_processor_id() >> index_msb;
+}
+
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
  */
@@ -69,6 +74,11 @@  void __init default_setup_apic_routing(v
 		printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
 	}
 
+	if (is_vsmp_box()) {
+		/* need to update phys_pkg_id */
+		apic->phys_pkg_id = apicid_phys_pkg_id;
+	}
+
 	/*
 	 * Now that apic routing model is selected, configure the
 	 * fault handling for intr remapping.