Commit ad5475f9 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by David Vrabel
Browse files

x86/xen: use xen_vcpu_id mapping for HYPERVISOR_vcpu_op 



HYPERVISOR_vcpu_op() passes Linux's idea of vCPU id as a parameter
while Xen's idea is expected. In some cases these ideas diverge so we
need to do remapping.

Convert all callers of HYPERVISOR_vcpu_op() to use xen_vcpu_nr().

Leave xen_fill_possible_map() and xen_filter_cpu_maps() intact as
they're only being called by PV guests before perpu areas are
initialized. While the issue could be solved by switching to
early_percpu for xen_vcpu_id I think it's not worth it: PV guests will
probably never get to the point where their idea of vCPU id diverges
from Xen's.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 88e957d6

arch/arm/xen/enlighten.c

+2 −1
Original line number Diff line number Diff line
@@ -177,7 +177,8 @@ static void xen_percpu_init(void) 
	info.mfn = virt_to_gfn(vcpup);

	info.offset = xen_offset_in_page(vcpup);



	err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info);

	err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, xen_vcpu_nr(cpu),

				 &info);

	BUG_ON(err);

	per_cpu(xen_vcpu, cpu) = vcpup;

arch/x86/xen/enlighten.c

+6 −4
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ static void xen_vcpu_setup(int cpu) 
	   hypervisor has no unregister variant and this hypercall does not

	   allow to over-write info.mfn and info.offset.

	 */

	err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, cpu, &info);

	err = HYPERVISOR_vcpu_op(VCPUOP_register_vcpu_info, xen_vcpu_nr(cpu),

				 &info);



	if (err) {

		printk(KERN_DEBUG "register_vcpu_info failed: err=%d\n", err);
@@ -252,10 +253,11 @@ void xen_vcpu_restore(void) 


	for_each_possible_cpu(cpu) {

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

		bool is_up = HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL);

		bool is_up = HYPERVISOR_vcpu_op(VCPUOP_is_up, xen_vcpu_nr(cpu),

						NULL);



		if (other_cpu && is_up &&

		    HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL))

		    HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(cpu), NULL))

			BUG();



		xen_setup_runstate_info(cpu);
@@ -264,7 +266,7 @@ void xen_vcpu_restore(void) 
			xen_vcpu_setup(cpu);



		if (other_cpu && is_up &&

		    HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL))

		    HYPERVISOR_vcpu_op(VCPUOP_up, xen_vcpu_nr(cpu), NULL))

			BUG();

	}

}

arch/x86/xen/irq.c

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ static void xen_safe_halt(void) 
static void xen_halt(void)

{

	if (irqs_disabled())

		HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);

		HYPERVISOR_vcpu_op(VCPUOP_down,

				   xen_vcpu_nr(smp_processor_id()), NULL);

	else

		xen_safe_halt();

}

arch/x86/xen/smp.c

+6 −5
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
#endif

	ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);

	ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir));

	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt))

	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, xen_vcpu_nr(cpu), ctxt))

		BUG();



	kfree(ctxt);
@@ -492,7 +492,7 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle) 
	if (rc)

		return rc;



	rc = HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL);

	rc = HYPERVISOR_vcpu_op(VCPUOP_up, xen_vcpu_nr(cpu), NULL);

	BUG_ON(rc);



	while (cpu_report_state(cpu) != CPU_ONLINE)
@@ -520,7 +520,8 @@ static int xen_cpu_disable(void) 


static void xen_cpu_die(unsigned int cpu)

{

	while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {

	while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up,

						     xen_vcpu_nr(cpu), NULL)) {

		__set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(HZ/10);

	}
@@ -536,7 +537,7 @@ static void xen_cpu_die(unsigned int cpu) 
static void xen_play_dead(void) /* used only with HOTPLUG_CPU */

{

	play_dead_common();

	HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);

	HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(smp_processor_id()), NULL);

	cpu_bringup();

	/*

	 * commit 4b0c0f294 (tick: Cleanup NOHZ per cpu data on cpu down)
@@ -576,7 +577,7 @@ static void stop_self(void *v) 


	set_cpu_online(cpu, false);



	HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL);

	HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(cpu), NULL);

	BUG();

}

arch/x86/xen/time.c

+12 −6
Original line number Diff line number Diff line
@@ -223,8 +223,10 @@ static int xen_vcpuop_shutdown(struct clock_event_device *evt) 
{

	int cpu = smp_processor_id();



	if (HYPERVISOR_vcpu_op(VCPUOP_stop_singleshot_timer, cpu, NULL) ||

	    HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))

	if (HYPERVISOR_vcpu_op(VCPUOP_stop_singleshot_timer, xen_vcpu_nr(cpu),

			       NULL) ||

	    HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu),

			       NULL))

		BUG();



	return 0;
@@ -234,7 +236,8 @@ static int xen_vcpuop_set_oneshot(struct clock_event_device *evt) 
{

	int cpu = smp_processor_id();



	if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))

	if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu),

			       NULL))

		BUG();



	return 0;
@@ -253,7 +256,8 @@ static int xen_vcpuop_set_next_event(unsigned long delta, 
	/* Get an event anyway, even if the timeout is already expired */

	single.flags = 0;



	ret = HYPERVISOR_vcpu_op(VCPUOP_set_singleshot_timer, cpu, &single);

	ret = HYPERVISOR_vcpu_op(VCPUOP_set_singleshot_timer, xen_vcpu_nr(cpu),

				 &single);

	BUG_ON(ret != 0);



	return ret;
@@ -352,7 +356,8 @@ void xen_timer_resume(void) 
		return;



	for_each_online_cpu(cpu) {

		if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))

		if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer,

				       xen_vcpu_nr(cpu), NULL))

			BUG();

	}

}
@@ -372,7 +377,8 @@ static void __init xen_time_init(void) 


	clocksource_register_hz(&xen_clocksource, NSEC_PER_SEC);



	if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) {

	if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, xen_vcpu_nr(cpu),

			       NULL) == 0) {

		/* Successfully turned off 100Hz tick, so we have the

		   vcpuop-based timer interface */

		printk(KERN_DEBUG "Xen: using vcpuop timer interface\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE