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: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index c31006f0f37f..fd7cd6f29b68 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -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");