From: Vitaly Kuznetsov Date: Thu, 30 Jun 2016 15:56:43 +0000 (+0200) Subject: xen/pvhvm: run xen_vcpu_setup() for the boot CPU X-Git-Tag: v4.1.12-92~55^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a9806836c6cad0a39fcdecce048f497fa689cd5;p=users%2Fjedix%2Flinux-maple.git xen/pvhvm: run xen_vcpu_setup() for the boot CPU Historically we didn't call VCPUOP_register_vcpu_info for CPU0 for PVHVM guests (while we had it for PV and ARM guests). This is usually fine as we can use vcpu info in the shared_info page but when we try booting on a vCPU with Xen's vCPU id > 31 (e.g. when we try to kdump after crashing on this CPU) we're not able to boot. Switch to always doing VCPUOP_register_vcpu_info for the boot CPU. Signed-off-by: Vitaly Kuznetsov Signed-off-by: David Vrabel (cherry picked from commit ee42d665d3f5db975caf87baf101a57235ddb566) Signed-off-by: Bob Liu Orabug: 24820937 --- diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 706eef560b4f7..1aa26c1c48d99 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -184,7 +184,7 @@ static void clamp_max_cpus(void) #endif } -static void xen_vcpu_setup(int cpu) +void xen_vcpu_setup(int cpu) { struct vcpu_register_vcpu_info info; int err; diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 182f7f6e9a2e8..38ecdee525ebb 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -326,6 +326,13 @@ static void __init xen_smp_prepare_boot_cpu(void) apic_pm_deactivate(); #endif } + + /* + * Setup vcpu_info for boot CPU. + */ + if (xen_hvm_domain()) + xen_vcpu_setup(0); + /* * The alternative logic (which patches the unlock/lock) runs before * the smp bootup up code is activated. Hence we need to set this up diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index e8ae8536c3327..8defcdd4b06d7 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -76,6 +76,7 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id); bool xen_vcpu_stolen(int vcpu); +void xen_vcpu_setup(int cpu); void xen_setup_vcpu_info_placement(void); #ifdef CONFIG_SMP