Commit 9c7a7942 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: restore vcpu_info mapping 



If we're using vcpu_info mapping, then make sure its restored on all
processors before relasing them from stop_machine.

The only complication is that if this fails, we can't continue because
we've already made assumptions that the mapping is available (baked in
calls to the _direct versions of the functions, for example).

Fortunately this can only happen with a 32-bit hypervisor, which may
possibly run out of mapping space.  On a 64-bit hypervisor, this is a
non-issue.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e2426cf8

arch/x86/xen/enlighten.c

+29 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info; 
 */

static int have_vcpu_info_placement = 1;



static void __init xen_vcpu_setup(int cpu)

static void xen_vcpu_setup(int cpu)

{

	struct vcpu_register_vcpu_info info;

	int err;
@@ -136,6 +136,34 @@ static void __init xen_vcpu_setup(int cpu) 
	}

}



/*

 * On restore, set the vcpu placement up again.

 * If it fails, then we're in a bad state, since

 * we can't back out from using it...

 */

void xen_vcpu_restore(void)

{

	if (have_vcpu_info_placement) {

		int cpu;



		for_each_online_cpu(cpu) {

			bool other_cpu = (cpu != smp_processor_id());



			if (other_cpu &&

			    HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL))

				BUG();



			xen_vcpu_setup(cpu);



			if (other_cpu &&

			    HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))

				BUG();

		}



		BUG_ON(!have_vcpu_info_placement);

	}

}



static void __init xen_banner(void)

{

	printk(KERN_INFO "Booting paravirtualized kernel on %s\n",

arch/x86/xen/suspend.c

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ void xen_pre_suspend(void) 


void xen_post_suspend(int suspend_cancelled)

{

	xen_setup_shared_info();



	if (suspend_cancelled) {

		xen_start_info->store_mfn =

			pfn_to_mfn(xen_start_info->store_mfn);
@@ -35,8 +37,8 @@ void xen_post_suspend(int suspend_cancelled) 
#ifdef CONFIG_SMP

		xen_cpu_initialized_map = cpu_online_map;

#endif

		xen_vcpu_restore();

	}



	xen_setup_shared_info();

}

arch/x86/xen/xen-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ char * __init xen_memory_setup(void); 
void __init xen_arch_setup(void);

void __init xen_init_IRQ(void);

void xen_enable_sysenter(void);

void xen_vcpu_restore(void);



void __init xen_build_dynamic_phys_to_machine(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE