Yinghai Lu
d8c7eb34c2
x86: Don't use current_cpu_data in x2apic phys_pkg_id
One system has socket 1 come up as BSP.
kexeced kernel reports BSP as:
[ 1.524550] Initializing cgroup subsys cpuacct
[ 1.536064] initial_apicid:20
[ 1.537135] ht_mask_width:1
[ 1.538128] core_select_mask:f
[ 1.539126] core_plus_mask_width:5
[ 1.558479] CPU: Physical Processor ID: 0
[ 1.559501] CPU: Processor Core ID: 0
[ 1.560539] CPU: L1 I cache: 32K, L1 D cache: 32K
[ 1.579098] CPU: L2 cache: 256K
[ 1.580085] CPU: L3 cache: 24576K
[ 1.581108] CPU 0/0x20 -> Node 0
[ 1.596193] CPU 0 microcode level: 0xffff0008
It doesn't have correct physical processor id and will get an
error:
[ 38.840859] CPU0 attaching sched-domain:
[ 38.848287] domain 0: span 0,8,72 level SIBLING
[ 38.851151] groups: 0 8 72
[ 38.858137] domain 1: span 0,8-15,72-79 level MC
[ 38.868944] groups: 0,8,72 9,73 10,74 11,75 12,76 13,77 14,78 15,79
[ 38.881383] ERROR: parent span is not a superset of domain->span
[ 38.890724] domain 2: span 0-7,64-71 level CPU
[ 38.899237] ERROR: domain->groups does not contain CPU0
[ 38.909229] groups: 8-15,72-79
[ 38.912547] ERROR: groups don't span domain->span
[ 38.919665] domain 3: span 0-127 level NODE
[ 38.930739] groups: 0-7,64-71 8-15,72-79 16-23,80-87 24-31,88-95 32-39,96-103 40-47,104-111 48-55,112-119 56-63,120-127
it turns out: we can not use current_cpu_data in phys_pgd_id
for x2apic.
identify_boot_cpu() is called by check_bugs() before
smp_prepare_cpus() and till smp_prepare_cpus() current_cpu_data
for bsp is assigned with boot_cpu_data.
Just make phys_pkg_id for x2apic is aligned to xapic.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <4A6ADD0D.10002@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
2009-08-04 16:22:44 +02:00 |
| .. |
|
apic.c
|
x86: Remove unused variable disable_x2apic
|
2009-07-03 14:34:27 +02:00 |
|
apic_flat_64.c
|
x86: don't call read_apic_id if !cpu_has_apic
|
2009-05-18 08:43:25 +02:00 |
|
bigsmp_32.c
|
cpumask: use new cpumask functions throughout x86
|
2009-03-13 14:49:54 +10:30 |
|
es7000_32.c
|
x86: Fix false positive section mismatch in es7000_32.c
|
2009-07-13 11:03:26 +02:00 |
|
io_apic.c
|
x86/pci: insert ioapic resource before assigning unassigned resources
|
2009-07-10 13:03:14 -07:00 |
|
ipi.c
|
x86, apic: move APIC drivers to arch/x86/kernel/apic/*
|
2009-02-17 18:17:36 +01:00 |
|
Makefile
|
x86, apic: separate 32-bit setup functionality out of apic_32.c
|
2009-02-17 23:12:48 +01:00 |
|
nmi.c
|
Merge branch 'linus' into x86/mce3
|
2009-06-11 23:31:52 +02:00 |
|
numaq_32.c
|
x86, apic: Fix false positive section mismatch in numaq_32.c
|
2009-07-13 11:03:27 +02:00 |
|
probe_32.c
|
x86: Remove duplicated #include's
|
2009-06-17 19:02:35 +02:00 |
|
probe_64.c
|
x86: x2apic, IR: Clean up X86_X2APIC and INTR_REMAP config checks
|
2009-04-21 09:08:25 +02:00 |
|
summit_32.c
|
x86: Remove duplicated #include's
|
2009-06-17 19:02:35 +02:00 |
|
x2apic_cluster.c
|
x86: Don't use current_cpu_data in x2apic phys_pkg_id
|
2009-08-04 16:22:44 +02:00 |
|
x2apic_phys.c
|
x86: Don't use current_cpu_data in x2apic phys_pkg_id
|
2009-08-04 16:22:44 +02:00 |
|
x2apic_uv_x.c
|
x86, UV: Fix UV apic mode
|
2009-08-04 16:19:14 +02:00 |