From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Woodhouse <dwmw@amazon.co.uk>, Paul Durrant <paul@xen.org>
Subject: [PULL 27/62] hw/xen: Add xen_evtchn device for event channel emulation
Date: Thu, 2 Mar 2023 13:29:54 +0100 [thread overview]
Message-ID: <20230302123029.153265-28-pbonzini@redhat.com> (raw)
In-Reply-To: <20230302123029.153265-1-pbonzini@redhat.com>
From: David Woodhouse <dwmw@amazon.co.uk>
Include basic support for setting HVM_PARAM_CALLBACK_IRQ to the global
vector method HVM_PARAM_CALLBACK_TYPE_VECTOR, which is handled in-kernel
by raising the vector whenever the vCPU's vcpu_info->evtchn_upcall_pending
flag is set.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/kvm/meson.build | 5 +-
hw/i386/kvm/xen_evtchn.c | 155 ++++++++++++++++++++++++++++++++++++++
hw/i386/kvm/xen_evtchn.h | 18 +++++
hw/i386/pc.c | 2 +
target/i386/kvm/xen-emu.c | 15 ++++
5 files changed, 194 insertions(+), 1 deletion(-)
create mode 100644 hw/i386/kvm/xen_evtchn.c
create mode 100644 hw/i386/kvm/xen_evtchn.h
diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
index 6165cbf019d6..cab64df33982 100644
--- a/hw/i386/kvm/meson.build
+++ b/hw/i386/kvm/meson.build
@@ -4,6 +4,9 @@ i386_kvm_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c'))
i386_kvm_ss.add(when: 'CONFIG_I8254', if_true: files('i8254.c'))
i386_kvm_ss.add(when: 'CONFIG_I8259', if_true: files('i8259.c'))
i386_kvm_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c'))
-i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files('xen_overlay.c'))
+i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files(
+ 'xen_overlay.c',
+ 'xen_evtchn.c',
+ ))
i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss)
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
new file mode 100644
index 000000000000..9d6f4076ad44
--- /dev/null
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -0,0 +1,155 @@
+/*
+ * QEMU Xen emulation: Event channel support
+ *
+ * Copyright © 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Authors: David Woodhouse <dwmw2@infradead.org>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/host-utils.h"
+#include "qemu/module.h"
+#include "qemu/main-loop.h"
+#include "qapi/error.h"
+#include "qom/object.h"
+#include "exec/target_page.h"
+#include "exec/address-spaces.h"
+#include "migration/vmstate.h"
+
+#include "hw/sysbus.h"
+#include "hw/xen/xen.h"
+#include "xen_evtchn.h"
+
+#include "sysemu/kvm.h"
+#include "sysemu/kvm_xen.h"
+#include <linux/kvm.h>
+
+#include "hw/xen/interface/memory.h"
+#include "hw/xen/interface/hvm/params.h"
+
+#define TYPE_XEN_EVTCHN "xen-evtchn"
+OBJECT_DECLARE_SIMPLE_TYPE(XenEvtchnState, XEN_EVTCHN)
+
+struct XenEvtchnState {
+ /*< private >*/
+ SysBusDevice busdev;
+ /*< public >*/
+
+ uint64_t callback_param;
+ bool evtchn_in_kernel;
+
+ QemuMutex port_lock;
+};
+
+struct XenEvtchnState *xen_evtchn_singleton;
+
+/* Top bits of callback_param are the type (HVM_PARAM_CALLBACK_TYPE_xxx) */
+#define CALLBACK_VIA_TYPE_SHIFT 56
+
+static int xen_evtchn_post_load(void *opaque, int version_id)
+{
+ XenEvtchnState *s = opaque;
+
+ if (s->callback_param) {
+ xen_evtchn_set_callback_param(s->callback_param);
+ }
+
+ return 0;
+}
+
+static bool xen_evtchn_is_needed(void *opaque)
+{
+ return xen_mode == XEN_EMULATE;
+}
+
+static const VMStateDescription xen_evtchn_vmstate = {
+ .name = "xen_evtchn",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = xen_evtchn_is_needed,
+ .post_load = xen_evtchn_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT64(callback_param, XenEvtchnState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void xen_evtchn_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->vmsd = &xen_evtchn_vmstate;
+}
+
+static const TypeInfo xen_evtchn_info = {
+ .name = TYPE_XEN_EVTCHN,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(XenEvtchnState),
+ .class_init = xen_evtchn_class_init,
+};
+
+void xen_evtchn_create(void)
+{
+ XenEvtchnState *s = XEN_EVTCHN(sysbus_create_simple(TYPE_XEN_EVTCHN,
+ -1, NULL));
+ xen_evtchn_singleton = s;
+
+ qemu_mutex_init(&s->port_lock);
+}
+
+static void xen_evtchn_register_types(void)
+{
+ type_register_static(&xen_evtchn_info);
+}
+
+type_init(xen_evtchn_register_types)
+
+int xen_evtchn_set_callback_param(uint64_t param)
+{
+ XenEvtchnState *s = xen_evtchn_singleton;
+ struct kvm_xen_hvm_attr xa = {
+ .type = KVM_XEN_ATTR_TYPE_UPCALL_VECTOR,
+ .u.vector = 0,
+ };
+ bool in_kernel = false;
+ int ret;
+
+ if (!s) {
+ return -ENOTSUP;
+ }
+
+ qemu_mutex_lock(&s->port_lock);
+
+ switch (param >> CALLBACK_VIA_TYPE_SHIFT) {
+ case HVM_PARAM_CALLBACK_TYPE_VECTOR: {
+ xa.u.vector = (uint8_t)param,
+
+ ret = kvm_vm_ioctl(kvm_state, KVM_XEN_HVM_SET_ATTR, &xa);
+ if (!ret && kvm_xen_has_cap(EVTCHN_SEND)) {
+ in_kernel = true;
+ }
+ break;
+ }
+ default:
+ /* Xen doesn't return error even if you set something bogus */
+ ret = 0;
+ break;
+ }
+
+ if (!ret) {
+ /* If vector delivery was turned *off* then tell the kernel */
+ if ((s->callback_param >> CALLBACK_VIA_TYPE_SHIFT) ==
+ HVM_PARAM_CALLBACK_TYPE_VECTOR && !xa.u.vector) {
+ kvm_vm_ioctl(kvm_state, KVM_XEN_HVM_SET_ATTR, &xa);
+ }
+ s->callback_param = param;
+ s->evtchn_in_kernel = in_kernel;
+ }
+
+ qemu_mutex_unlock(&s->port_lock);
+
+ return ret;
+}
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
new file mode 100644
index 000000000000..c9b7f9d11f10
--- /dev/null
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -0,0 +1,18 @@
+/*
+ * QEMU Xen emulation: Event channel support
+ *
+ * Copyright © 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Authors: David Woodhouse <dwmw2@infradead.org>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef QEMU_XEN_EVTCHN_H
+#define QEMU_XEN_EVTCHN_H
+
+void xen_evtchn_create(void);
+int xen_evtchn_set_callback_param(uint64_t param);
+
+#endif /* QEMU_XEN_EVTCHN_H */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index a316a01b1594..f38e3f1be84a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -91,6 +91,7 @@
#include "hw/virtio/virtio-pmem-pci.h"
#include "hw/virtio/virtio-mem-pci.h"
#include "hw/i386/kvm/xen_overlay.h"
+#include "hw/i386/kvm/xen_evtchn.h"
#include "hw/mem/memory-device.h"
#include "sysemu/replay.h"
#include "target/i386/cpu.h"
@@ -1852,6 +1853,7 @@ int pc_machine_kvm_type(MachineState *machine, const char *kvm_type)
#ifdef CONFIG_XEN_EMU
if (xen_mode == XEN_EMULATE) {
xen_overlay_create();
+ xen_evtchn_create();
}
#endif
return 0;
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index ce858ac63ce1..435c51f625a1 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -22,6 +22,7 @@
#include "sysemu/runstate.h"
#include "hw/i386/kvm/xen_overlay.h"
+#include "hw/i386/kvm/xen_evtchn.h"
#include "hw/xen/interface/version.h"
#include "hw/xen/interface/sched.h"
@@ -510,6 +511,10 @@ static bool handle_set_param(struct kvm_xen_exit *exit, X86CPU *cpu,
}
switch (hp.index) {
+ case HVM_PARAM_CALLBACK_IRQ:
+ err = xen_evtchn_set_callback_param(hp.value);
+ xen_set_long_mode(exit->u.hcall.longmode);
+ break;
default:
return false;
}
@@ -719,6 +724,16 @@ int kvm_xen_soft_reset(void)
trace_kvm_xen_soft_reset();
+ /*
+ * Zero is the reset/startup state for HVM_PARAM_CALLBACK_IRQ. Strictly,
+ * it maps to HVM_PARAM_CALLBACK_TYPE_GSI with GSI#0, but Xen refuses to
+ * to deliver to the timer interrupt and treats that as 'disabled'.
+ */
+ err = xen_evtchn_set_callback_param(0);
+ if (err) {
+ return err;
+ }
+
CPU_FOREACH(cpu) {
async_run_on_cpu(cpu, do_vcpu_soft_reset, RUN_ON_CPU_NULL);
}
--
2.39.1
next prev parent reply other threads:[~2023-03-02 12:57 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 12:29 [PULL 00/62] i386, misc changes for QEMU 8.0 soft freeze Paolo Bonzini
2023-03-02 12:29 ` [PULL 01/62] include: import Xen public headers to hw/xen/interface Paolo Bonzini
2023-03-02 12:29 ` [PULL 02/62] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation Paolo Bonzini
2023-03-02 12:29 ` [PULL 03/62] xen: Add XEN_DISABLED mode and make it default Paolo Bonzini
2023-03-02 12:29 ` [PULL 04/62] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support Paolo Bonzini
2023-03-02 12:29 ` [PULL 05/62] i386/kvm: handle Xen HVM cpuid leaves Paolo Bonzini
2023-03-02 12:29 ` [PULL 06/62] i386/kvm: Set Xen vCPU ID in KVM Paolo Bonzini
2023-03-02 12:29 ` [PULL 07/62] xen-platform: exclude vfio-pci from the PCI platform unplug Paolo Bonzini
2023-03-02 12:29 ` [PULL 08/62] xen-platform: allow its creation with XEN_EMULATE mode Paolo Bonzini
2023-03-02 12:29 ` [PULL 09/62] i386/xen: handle guest hypercalls Paolo Bonzini
2023-03-02 12:29 ` [PULL 10/62] i386/xen: implement HYPERVISOR_xen_version Paolo Bonzini
2023-03-02 12:29 ` [PULL 11/62] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown Paolo Bonzini
2023-03-02 12:29 ` [PULL 12/62] i386/xen: Implement SCHEDOP_poll and SCHEDOP_yield Paolo Bonzini
2023-03-02 12:29 ` [PULL 13/62] hw/xen: Add xen_overlay device for emulating shared xenheap pages Paolo Bonzini
2023-03-02 12:29 ` [PULL 14/62] xen: Permit --xen-domid argument when accel is KVM Paolo Bonzini
2023-03-02 12:29 ` [PULL 15/62] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode Paolo Bonzini
2023-03-02 12:29 ` [PULL 16/62] i386/xen: manage and save/restore Xen guest long_mode setting Paolo Bonzini
2023-03-02 12:29 ` [PULL 17/62] i386/xen: implement HYPERVISOR_memory_op Paolo Bonzini
2023-03-02 12:29 ` [PULL 18/62] i386/xen: implement XENMEM_add_to_physmap_batch Paolo Bonzini
2023-03-02 12:29 ` [PULL 19/62] i386/xen: implement HYPERVISOR_hvm_op Paolo Bonzini
2023-03-02 12:29 ` [PULL 20/62] i386/xen: implement HYPERVISOR_vcpu_op Paolo Bonzini
2023-03-02 12:29 ` [PULL 21/62] i386/xen: handle VCPUOP_register_vcpu_info Paolo Bonzini
2023-03-02 12:29 ` [PULL 22/62] i386/xen: handle VCPUOP_register_vcpu_time_info Paolo Bonzini
2023-03-02 12:29 ` [PULL 23/62] i386/xen: handle VCPUOP_register_runstate_memory_area Paolo Bonzini
2023-03-02 12:29 ` [PULL 24/62] i386/xen: implement HYPERVISOR_event_channel_op Paolo Bonzini
2023-03-02 12:29 ` [PULL 25/62] i386/xen: implement HVMOP_set_evtchn_upcall_vector Paolo Bonzini
2023-03-02 12:29 ` [PULL 26/62] i386/xen: implement HVMOP_set_param Paolo Bonzini
2023-03-02 12:29 ` Paolo Bonzini [this message]
2023-03-02 12:29 ` [PULL 28/62] i386/xen: Add support for Xen event channel delivery to vCPU Paolo Bonzini
2023-03-02 12:29 ` [PULL 29/62] hw/xen: Implement EVTCHNOP_status Paolo Bonzini
2023-03-02 12:29 ` [PULL 30/62] hw/xen: Implement EVTCHNOP_close Paolo Bonzini
2023-03-02 12:29 ` [PULL 31/62] hw/xen: Implement EVTCHNOP_unmask Paolo Bonzini
2023-03-02 12:29 ` [PULL 32/62] hw/xen: Implement EVTCHNOP_bind_virq Paolo Bonzini
2023-05-09 14:55 ` Peter Maydell
2023-05-22 18:52 ` [PATCH] i386/xen: consistent locking around Xen singleshot timers David Woodhouse
2023-05-23 13:46 ` Paul Durrant
2023-06-02 16:58 ` Peter Maydell
2023-07-04 15:49 ` David Woodhouse
2023-07-04 15:51 ` [PATCH v2] " David Woodhouse
2023-07-06 16:26 ` Paul Durrant
2023-03-02 12:30 ` [PULL 33/62] hw/xen: Implement EVTCHNOP_bind_ipi Paolo Bonzini
2023-03-02 12:30 ` [PULL 34/62] hw/xen: Implement EVTCHNOP_send Paolo Bonzini
2023-03-02 12:30 ` [PULL 35/62] hw/xen: Implement EVTCHNOP_alloc_unbound Paolo Bonzini
2023-03-02 12:30 ` [PULL 36/62] hw/xen: Implement EVTCHNOP_bind_interdomain Paolo Bonzini
2023-03-02 12:30 ` [PULL 37/62] hw/xen: Implement EVTCHNOP_bind_vcpu Paolo Bonzini
2023-03-02 12:30 ` [PULL 38/62] hw/xen: Implement EVTCHNOP_reset Paolo Bonzini
2023-03-02 12:30 ` [PULL 39/62] i386/xen: add monitor commands to test event injection Paolo Bonzini
2023-03-02 12:30 ` [PULL 40/62] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback Paolo Bonzini
2023-03-02 12:30 ` [PULL 41/62] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback Paolo Bonzini
2023-03-02 12:30 ` [PULL 42/62] kvm/i386: Add xen-gnttab-max-frames property Paolo Bonzini
2023-03-02 12:30 ` [PULL 43/62] hw/xen: Add xen_gnttab device for grant table emulation Paolo Bonzini
2023-03-02 12:30 ` [PULL 44/62] hw/xen: Support mapping grant frames Paolo Bonzini
2023-03-02 12:30 ` [PULL 45/62] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson Paolo Bonzini
2023-03-02 12:30 ` [PULL 46/62] hw/xen: Implement GNTTABOP_query_size Paolo Bonzini
2023-03-02 12:30 ` [PULL 47/62] i386/xen: handle PV timer hypercalls Paolo Bonzini
2023-03-02 12:30 ` [PULL 48/62] i386/xen: Reserve Xen special pages for console, xenstore rings Paolo Bonzini
2023-03-02 12:30 ` [PULL 49/62] i386/xen: handle HVMOP_get_param Paolo Bonzini
2023-03-02 12:30 ` [PULL 50/62] hw/xen: Add backend implementation of interdomain event channel support Paolo Bonzini
2023-03-02 12:30 ` [PULL 51/62] hw/xen: Add xen_xenstore device for xenstore emulation Paolo Bonzini
2023-03-02 12:30 ` [PULL 52/62] hw/xen: Add basic ring handling to xenstore Paolo Bonzini
2023-03-02 12:30 ` [PULL 53/62] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests Paolo Bonzini
2023-03-02 12:30 ` [PULL 54/62] i386/xen: Implement HYPERVISOR_physdev_op Paolo Bonzini
2023-03-02 12:30 ` [PULL 55/62] hw/xen: Implement emulated PIRQ hypercall support Paolo Bonzini
2023-03-02 12:30 ` [PULL 56/62] hw/xen: Support GSI mapping to PIRQ Paolo Bonzini
2023-06-23 14:48 ` Peter Maydell
2023-07-04 15:12 ` [PATCH] i386/xen: fix off-by-one in xen_evtchn_set_gsi() Woodhouse, David via
2023-07-17 17:51 ` Peter Maydell
2023-07-17 21:39 ` [PATCH-for-8.1] " Philippe Mathieu-Daudé
2023-03-02 12:30 ` [PULL 57/62] hw/xen: Support MSI mapping to PIRQ Paolo Bonzini
2023-04-06 15:48 ` Peter Maydell
2023-04-06 16:24 ` Woodhouse, David via
2023-06-23 13:27 ` Peter Maydell
2023-07-04 17:28 ` David Woodhouse
2023-12-19 13:36 ` Peter Maydell
2024-07-25 14:12 ` Peter Maydell
2023-03-02 12:30 ` [PULL 58/62] kvm/i386: Add xen-evtchn-max-pirq property Paolo Bonzini
2023-03-02 12:30 ` [PULL 59/62] i386/xen: Document Xen HVM emulation Paolo Bonzini
2023-03-02 12:30 ` [PULL 60/62] hw/xen: Subsume xen_be_register_common() into xen_be_init() Paolo Bonzini
2023-03-02 12:30 ` [PULL 61/62] qapi: Add 'acpi' field to 'query-machines' output Paolo Bonzini
2023-03-02 12:30 ` [PULL 62/62] Makefile: qemu-bundle is a directory Paolo Bonzini
2023-03-03 11:03 ` [PULL 00/62] i386, misc changes for QEMU 8.0 soft freeze Peter Maydell
2023-03-03 13:44 ` David Woodhouse
2023-03-03 13:46 ` Peter Maydell
2023-03-03 14:16 ` David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230302123029.153265-28-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=dwmw@amazon.co.uk \
--cc=paul@xen.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).