Skip to content

Commit a6a198b

Browse files
Boris OstrovskyDavid Vrabel
authored andcommitted
xen/x86: Update topology map for PV VCPUs
Early during boot topology_update_package_map() computes logical_pkg_ids for all present processors. Later, when processors are brought up, identify_cpu() updates these values based on phys_pkg_id which is a function of initial_apicid. On PV guests the latter may point to a non-existing node, causing logical_pkg_ids to be set to -1. Intel's RAPL uses logical_pkg_id (as topology_logical_package_id()) to index its arrays and therefore in this case will point to index 65535 (since logical_pkg_id is a u16). This could lead to either a crash or may actually access random memory location. As a workaround, we recompute topology during CPU bringup to reset logical_pkg_id to a valid value. (The reason for initial_apicid being bogus is because it is initial_apicid of the processor from which the guest is launched. This value is CPUID(1).EBX[31:24]) Signed-off-by: Boris Ostrovsky <[email protected]> Cc: [email protected] Signed-off-by: David Vrabel <[email protected]>
1 parent 565fdc6 commit a6a198b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/x86/xen/smp.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ static void cpu_bringup(void)
8787
cpu_data(cpu).x86_max_cores = 1;
8888
set_cpu_sibling_map(cpu);
8989

90+
/*
91+
* identify_cpu() may have set logical_pkg_id to -1 due
92+
* to incorrect phys_proc_id. Let's re-comupte it.
93+
*/
94+
topology_update_package_map(apic->cpu_present_to_apicid(cpu), cpu);
95+
9096
xen_setup_cpu_clockevents();
9197

9298
notify_cpu_starting(cpu);

0 commit comments

Comments
 (0)