[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v15 45/60] i386/xen: Implement HYPERVISOR_grant_table_op and GNTT
From: |
David Woodhouse |
Subject: |
[PATCH v15 45/60] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson |
Date: |
Wed, 1 Mar 2023 13:52:08 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/kvm/xen_gnttab.c | 31 ++++++++++++++++++++
hw/i386/kvm/xen_gnttab.h | 5 ++++
target/i386/kvm/xen-emu.c | 60 +++++++++++++++++++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c
index 72e87aea6a..b54a94e2bd 100644
--- a/hw/i386/kvm/xen_gnttab.c
+++ b/hw/i386/kvm/xen_gnttab.c
@@ -180,3 +180,34 @@ int xen_gnttab_map_page(uint64_t idx, uint64_t gfn)
return 0;
}
+int xen_gnttab_set_version_op(struct gnttab_set_version *set)
+{
+ int ret;
+
+ switch (set->version) {
+ case 1:
+ ret = 0;
+ break;
+
+ case 2:
+ /* Behave as before set_version was introduced. */
+ ret = -ENOSYS;
+ break;
+
+ default:
+ ret = -EINVAL;
+ }
+
+ set->version = 1;
+ return ret;
+}
+
+int xen_gnttab_get_version_op(struct gnttab_get_version *get)
+{
+ if (get->dom != DOMID_SELF && get->dom != xen_domid) {
+ return -ESRCH;
+ }
+
+ get->version = 1;
+ return 0;
+}
diff --git a/hw/i386/kvm/xen_gnttab.h b/hw/i386/kvm/xen_gnttab.h
index a7caa94c83..79579677ba 100644
--- a/hw/i386/kvm/xen_gnttab.h
+++ b/hw/i386/kvm/xen_gnttab.h
@@ -15,4 +15,9 @@
void xen_gnttab_create(void);
int xen_gnttab_map_page(uint64_t idx, uint64_t gfn);
+struct gnttab_set_version;
+struct gnttab_get_version;
+int xen_gnttab_set_version_op(struct gnttab_set_version *set);
+int xen_gnttab_get_version_op(struct gnttab_get_version *get);
+
#endif /* QEMU_XEN_GNTTAB_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index 6f9b7a5cb9..d49b6117f1 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -34,6 +34,7 @@
#include "hw/xen/interface/hvm/params.h"
#include "hw/xen/interface/vcpu.h"
#include "hw/xen/interface/event_channel.h"
+#include "hw/xen/interface/grant_table.h"
#include "xen-compat.h"
@@ -1169,6 +1170,61 @@ static bool kvm_xen_hcall_sched_op(struct kvm_xen_exit
*exit, X86CPU *cpu,
return true;
}
+static bool kvm_xen_hcall_gnttab_op(struct kvm_xen_exit *exit, X86CPU *cpu,
+ int cmd, uint64_t arg, int count)
+{
+ CPUState *cs = CPU(cpu);
+ int err;
+
+ switch (cmd) {
+ case GNTTABOP_set_version: {
+ struct gnttab_set_version set;
+
+ qemu_build_assert(sizeof(set) == 4);
+ if (kvm_copy_from_gva(cs, arg, &set, sizeof(set))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_gnttab_set_version_op(&set);
+ if (!err && kvm_copy_to_gva(cs, arg, &set, sizeof(set))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case GNTTABOP_get_version: {
+ struct gnttab_get_version get;
+
+ qemu_build_assert(sizeof(get) == 8);
+ if (kvm_copy_from_gva(cs, arg, &get, sizeof(get))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_gnttab_get_version_op(&get);
+ if (!err && kvm_copy_to_gva(cs, arg, &get, sizeof(get))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case GNTTABOP_query_size:
+ case GNTTABOP_setup_table:
+ case GNTTABOP_copy:
+ case GNTTABOP_map_grant_ref:
+ case GNTTABOP_unmap_grant_ref:
+ case GNTTABOP_swap_grant_ref:
+ return false;
+
+ default:
+ /* Xen explicitly returns -ENOSYS to HVM guests for all others */
+ err = -ENOSYS;
+ break;
+ }
+
+ exit->u.hcall.result = err;
+ return true;
+}
+
static bool do_kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit)
{
uint16_t code = exit->u.hcall.input;
@@ -1179,6 +1235,10 @@ static bool do_kvm_xen_handle_exit(X86CPU *cpu, struct
kvm_xen_exit *exit)
}
switch (code) {
+ case __HYPERVISOR_grant_table_op:
+ return kvm_xen_hcall_gnttab_op(exit, cpu, exit->u.hcall.params[0],
+ exit->u.hcall.params[1],
+ exit->u.hcall.params[2]);
case __HYPERVISOR_sched_op:
return kvm_xen_hcall_sched_op(exit, cpu, exit->u.hcall.params[0],
exit->u.hcall.params[1]);
--
2.39.0
- [PATCH v15 14/60] xen: Permit --xen-domid argument when accel is KVM, (continued)
- [PATCH v15 14/60] xen: Permit --xen-domid argument when accel is KVM, David Woodhouse, 2023/03/01
- [PATCH v15 05/60] i386/kvm: handle Xen HVM cpuid leaves, David Woodhouse, 2023/03/01
- [PATCH v15 18/60] i386/xen: implement XENMEM_add_to_physmap_batch, David Woodhouse, 2023/03/01
- [PATCH v15 53/60] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests, David Woodhouse, 2023/03/01
- [PATCH v15 02/60] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation, David Woodhouse, 2023/03/01
- [PATCH v15 44/60] hw/xen: Support mapping grant frames, David Woodhouse, 2023/03/01
- [PATCH v15 38/60] hw/xen: Implement EVTCHNOP_reset, David Woodhouse, 2023/03/01
- [PATCH v15 50/60] hw/xen: Add backend implementation of interdomain event channel support, David Woodhouse, 2023/03/01
- [PATCH v15 39/60] i386/xen: add monitor commands to test event injection, David Woodhouse, 2023/03/01
- [PATCH v15 51/60] hw/xen: Add xen_xenstore device for xenstore emulation, David Woodhouse, 2023/03/01
- [PATCH v15 45/60] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson,
David Woodhouse <=
- [PATCH v15 52/60] hw/xen: Add basic ring handling to xenstore, David Woodhouse, 2023/03/01
- [PATCH v15 42/60] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2023/03/01
- [PATCH v15 49/60] i386/xen: handle HVMOP_get_param, David Woodhouse, 2023/03/01
- [PATCH v15 32/60] hw/xen: Implement EVTCHNOP_bind_virq, David Woodhouse, 2023/03/01
- [PATCH v15 41/60] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback, David Woodhouse, 2023/03/01
- [PATCH v15 54/60] i386/xen: Implement HYPERVISOR_physdev_op, David Woodhouse, 2023/03/01
- [PATCH v15 16/60] i386/xen: manage and save/restore Xen guest long_mode setting, David Woodhouse, 2023/03/01
- [PATCH v15 24/60] i386/xen: implement HYPERVISOR_event_channel_op, David Woodhouse, 2023/03/01
- [PATCH v15 06/60] i386/kvm: Set Xen vCPU ID in KVM, David Woodhouse, 2023/03/01
- [PATCH v15 56/60] hw/xen: Support GSI mapping to PIRQ, David Woodhouse, 2023/03/01