[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 38/47] hw/xen: Implement EVTCHNOP_reset
From: |
David Woodhouse |
Subject: |
[RFC PATCH v4 38/47] hw/xen: Implement EVTCHNOP_reset |
Date: |
Wed, 21 Dec 2022 01:06:14 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/i386/kvm/xen_evtchn.c | 29 +++++++++++++++++++++++++++++
hw/i386/kvm/xen_evtchn.h | 3 +++
target/i386/kvm/xen-emu.c | 17 +++++++++++++++++
3 files changed, 49 insertions(+)
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index cb82f9d234..a394f124e9 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -715,6 +715,35 @@ static int close_port(XenEvtchnState *s, evtchn_port_t
port)
return 0;
}
+int xen_evtchn_soft_reset(void)
+{
+ XenEvtchnState *s = xen_evtchn_singleton;
+ int i;
+
+ if (!s) {
+ return -ENOTSUP;
+ }
+
+ qemu_mutex_lock(&s->port_lock);
+
+ for (i = 0; i < s->nr_ports; i++) {
+ close_port(s, i);
+ }
+
+ qemu_mutex_unlock(&s->port_lock);
+
+ return 0;
+}
+
+int xen_evtchn_reset_op(struct evtchn_reset *reset)
+{
+ if (reset->dom != DOMID_SELF && reset->dom != xen_domid) {
+ return -ESRCH;
+ }
+
+ return xen_evtchn_soft_reset();
+}
+
int xen_evtchn_close_op(struct evtchn_close *close)
{
XenEvtchnState *s = xen_evtchn_singleton;
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index 486b031c82..5d3e03553f 100644
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -13,6 +13,7 @@
#define QEMU_XEN_EVTCHN_H
void xen_evtchn_create(void);
+int xen_evtchn_soft_reset(void);
int xen_evtchn_set_callback_param(uint64_t param);
struct evtchn_status;
@@ -24,6 +25,7 @@ struct evtchn_send;
struct evtchn_alloc_unbound;
struct evtchn_bind_interdomain;
struct evtchn_bind_vcpu;
+struct evtchn_reset;
int xen_evtchn_status_op(struct evtchn_status *status);
int xen_evtchn_close_op(struct evtchn_close *close);
int xen_evtchn_unmask_op(struct evtchn_unmask *unmask);
@@ -33,5 +35,6 @@ int xen_evtchn_send_op(struct evtchn_send *send);
int xen_evtchn_alloc_unbound_op(struct evtchn_alloc_unbound *alloc);
int xen_evtchn_bind_interdomain_op(struct evtchn_bind_interdomain
*interdomain);
int xen_evtchn_bind_vcpu_op(struct evtchn_bind_vcpu *vcpu);
+int xen_evtchn_reset_op(struct evtchn_reset *reset);
#endif /* QEMU_XEN_EVTCHN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index 0d036d4162..1473235e7c 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -946,6 +946,18 @@ static bool kvm_xen_hcall_evtchn_op(struct kvm_xen_exit
*exit, X86CPU *cpu,
err = xen_evtchn_bind_vcpu_op(&vcpu);
break;
}
+ case EVTCHNOP_reset: {
+ struct evtchn_reset reset;
+
+ qemu_build_assert(sizeof(reset) == 2);
+ if (kvm_copy_from_gva(cs, arg, &reset, sizeof(reset))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_evtchn_reset_op(&reset);
+ break;
+ }
default:
return false;
}
@@ -959,6 +971,11 @@ static int kvm_xen_soft_reset(void)
CPUState *cpu;
int err;
+ err = xen_evtchn_soft_reset();
+ if (err) {
+ return err;
+ }
+
err = xen_evtchn_set_callback_param(0);
if (err) {
return err;
--
2.35.3
- [RFC PATCH v4 09/47] hw/xen_backend: refactor xen_be_init(), (continued)
- [RFC PATCH v4 09/47] hw/xen_backend: refactor xen_be_init(), David Woodhouse, 2022/12/20
- [RFC PATCH v4 04/47] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2022/12/20
- [RFC PATCH v4 23/47] i386/xen: handle VCPUOP_register_runstate_memory_area, David Woodhouse, 2022/12/20
- [RFC PATCH v4 16/47] i386/xen: manage and save/restore Xen guest long_mode setting, David Woodhouse, 2022/12/20
- [RFC PATCH v4 26/47] i386/xen: implement HVMOP_set_param, David Woodhouse, 2022/12/20
- [RFC PATCH v4 17/47] i386/xen: implement HYPERVISOR_memory_op, David Woodhouse, 2022/12/20
- [RFC PATCH v4 08/47] xen-platform: allow its creation with XEN_EMULATE mode, David Woodhouse, 2022/12/20
- [RFC PATCH v4 32/47] hw/xen: Implement EVTCHNOP_bind_virq, David Woodhouse, 2022/12/20
- [RFC PATCH v4 29/47] hw/xen: Implement EVTCHNOP_status, David Woodhouse, 2022/12/20
- [RFC PATCH v4 45/47] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, David Woodhouse, 2022/12/20
- [RFC PATCH v4 38/47] hw/xen: Implement EVTCHNOP_reset,
David Woodhouse <=