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>
This commit is contained in:

zatwierdzone przez
David Vrabel

rodzic
88e957d6e4
commit
ad5475f9fa
@@ -1211,7 +1211,8 @@ void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector)
|
||||
|
||||
#ifdef CONFIG_X86
|
||||
if (unlikely(vector == XEN_NMI_VECTOR)) {
|
||||
int rc = HYPERVISOR_vcpu_op(VCPUOP_send_nmi, cpu, NULL);
|
||||
int rc = HYPERVISOR_vcpu_op(VCPUOP_send_nmi, xen_vcpu_nr(cpu),
|
||||
NULL);
|
||||
if (rc < 0)
|
||||
printk(KERN_WARNING "Sending nmi to CPU%d failed (rc:%d)\n", cpu, rc);
|
||||
return;
|
||||
|
@@ -95,7 +95,7 @@ void xen_setup_runstate_info(int cpu)
|
||||
area.addr.v = &per_cpu(xen_runstate, cpu);
|
||||
|
||||
if (HYPERVISOR_vcpu_op(VCPUOP_register_runstate_memory_area,
|
||||
cpu, &area))
|
||||
xen_vcpu_nr(cpu), &area))
|
||||
BUG();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user