diff mbox series

[RFC,15/21] i386/xen: handle register_vcpu_info

Message ID 20221205173137.607044-16-dwmw2@infradead.org
State New
Headers show
Series Xen HVM support under KVM | expand

Commit Message

David Woodhouse Dec. 5, 2022, 5:31 p.m. UTC 
From: Joao Martins <joao.m.martins@oracle.com>

Handle the hypercall to set a per vcpu info, as opposed to using
shared_info equivalent. Also, Guests may not call
VCPUOP_register_vcpu_info and will fail in event channel operations if a
proper one isn't set in Qemu.

So derive the hva from shared_info which is where these are located when
guest doesn't seed an additional pointer.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 target/i386/cpu.h        |  1 +
 target/i386/trace-events |  1 +
 target/i386/xen-proto.h  |  4 +++
 target/i386/xen.c        | 72 ++++++++++++++++++++++++++++++++++------
 4 files changed, 68 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 09c0281b8b..db152d6902 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1801,6 +1801,7 @@  typedef struct CPUArchState {
     HVFX86LazyFlags hvf_lflags;
     void *hvf_mmio_buf;
 #endif
+    struct XenCPUState xen_vcpu;
 
     uint64_t mcg_cap;
     uint64_t mcg_ctl;
diff --git a/target/i386/trace-events b/target/i386/trace-events
index 2bf732ee07..1c6c44f291 100644
--- a/target/i386/trace-events
+++ b/target/i386/trace-events
@@ -15,3 +15,4 @@  kvm_sev_attestation_report(const char *mnonce, const char *data) "mnonce %s data
 # target/i386/xen.c
 kvm_xen_hypercall(int cpu, uint8_t cpl, uint64_t input, uint64_t a0, uint64_t a1, uint64_t a2, uint64_t ret) "xen_hypercall: cpu %d cpl %d input %" PRIu64 " a0 0x%" PRIx64 " a1 0x%" PRIx64 " a2 0x%" PRIx64" ret 0x%" PRIu64
 kvm_xen_set_shared_info(uint64_t gfn) "shared info at gfn 0x%" PRIx64
+kvm_xen_set_vcpu_attr(int cpu, int type, uint64_t gpa) "vcpu attr cpu %d type %d gpa 0x%" PRIu64
diff --git a/target/i386/xen-proto.h b/target/i386/xen-proto.h
index c394909f54..8f6ee4c17b 100644
--- a/target/i386/xen-proto.h
+++ b/target/i386/xen-proto.h
@@ -15,5 +15,9 @@  typedef struct XenState {
     struct shared_info *shared_info;
 } XenState;
 
+typedef struct XenCPUState {
+   struct vcpu_info *info;
+} XenCPUState;
+
 #endif
 
diff --git a/target/i386/xen.c b/target/i386/xen.c
index 61c9959981..59aca2ad19 100644
--- a/target/i386/xen.c
+++ b/target/i386/xen.c
@@ -14,6 +14,7 @@ 
 #include "exec/address-spaces.h"
 #include "xen.h"
 #include "trace.h"
+#include "sysemu/sysemu.h"
 
 #include "standard-headers/xen/version.h"
 #include "standard-headers/xen/memory.h"
@@ -133,13 +134,24 @@  static int xen_set_shared_info(CPUState *cs, struct shared_info *shi,
     struct kvm_xen_hvm_attr xhsi;
     XenState *xen = cs->xen_state;
     KVMState *s = cs->kvm_state;
-    int err;
+    XenCPUState *xcpu;
+    CPUState *cpu;
+    int i, err;
 
     xhsi.type = KVM_XEN_ATTR_TYPE_SHARED_INFO;
     xhsi.u.shared_info.gfn = gfn;
     err = kvm_vm_ioctl(s, KVM_XEN_HVM_SET_ATTR, &xhsi);
     trace_kvm_xen_set_shared_info(gfn);
     xen->shared_info = shi;
+
+    for (i = 0; i < XEN_LEGACY_MAX_VCPUS; i++) {
+        cpu = qemu_get_cpu(i);
+        if (cpu) {
+                xcpu = &X86_CPU(cpu)->env.xen_vcpu;
+                xcpu->info = &shi->vcpu_info[cpu->cpu_index];
+        }
+    }
+
     return err;
 }
 
@@ -197,19 +209,57 @@  static int kvm_xen_hcall_hvm_op(struct kvm_xen_exit *exit,
     return HCALL_ERR;
 }
 
-static int kvm_xen_hcall_vcpu_op(struct kvm_xen_exit *exit,
-                                 int cmd, uint64_t arg)
+static int xen_set_vcpu_attr(CPUState *cs, uint16_t type, uint64_t gpa)
+{
+    struct kvm_xen_vcpu_attr xhsi;
+
+    xhsi.type = type;
+    xhsi.u.gpa = gpa;
+
+    trace_kvm_xen_set_vcpu_attr(cs->cpu_index, type, gpa);
+
+    return kvm_vcpu_ioctl(cs, KVM_XEN_VCPU_SET_ATTR, &xhsi);
+}
+
+static int vcpuop_register_vcpu_info(CPUState *cs, CPUState *target,
+                                     uint64_t arg)
 {
+    XenCPUState *xt = &X86_CPU(target)->env.xen_vcpu;
+    struct vcpu_register_vcpu_info *rvi;
+    uint64_t gpa;
+    void *hva;
+
+    rvi = gva_to_hva(cs, arg);
+    if (!rvi) {
+        return -EFAULT;
+    }
+
+    gpa = ((rvi->mfn << PAGE_SHIFT) + rvi->offset);
+    hva = gpa_to_hva(gpa);
+    if (!hva) {
+        return -EFAULT;
+    }
+
+    xt->info = hva;
+    return xen_set_vcpu_attr(target, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, gpa);
+}
+
+static int kvm_xen_hcall_vcpu_op(struct kvm_xen_exit *exit, X86CPU *cpu,
+                                 int cmd, int vcpu_id, uint64_t arg)
+{
+    CPUState *dest = qemu_get_cpu(vcpu_id);
+    CPUState *cs = CPU(cpu);
+    int err = -ENOSYS;
+
     switch (cmd) {
     case VCPUOP_register_vcpu_info: {
-            /* no vcpu info placement for now */
-            exit->u.hcall.result = -ENOSYS;
-            return 0;
+            err = vcpuop_register_vcpu_info(cs, dest, arg);
+            break;
         }
     }
 
-    exit->u.hcall.result = -ENOSYS;
-    return HCALL_ERR;
+    exit->u.hcall.result = err;
+    return err ? HCALL_ERR : 0;
 }
 
 static int __kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit)
@@ -223,8 +273,10 @@  static int __kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit)
 
     switch (code) {
     case __HYPERVISOR_vcpu_op:
-        return kvm_xen_hcall_vcpu_op(exit, exit->u.hcall.params[0],
-                                     exit->u.hcall.params[1]);
+        return kvm_xen_hcall_vcpu_op(exit, cpu,
+                                     exit->u.hcall.params[0],
+                                     exit->u.hcall.params[1],
+                                     exit->u.hcall.params[2]);
     case __HYPERVISOR_hvm_op:
         return kvm_xen_hcall_hvm_op(exit, exit->u.hcall.params[0],
                                     exit->u.hcall.params[1]);