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 31/62] hw/xen: Implement EVTCHNOP_unmask
Date: Thu, 2 Mar 2023 13:29:58 +0100 [thread overview]
Message-ID: <20230302123029.153265-32-pbonzini@redhat.com> (raw)
In-Reply-To: <20230302123029.153265-1-pbonzini@redhat.com>
From: David Woodhouse <dwmw@amazon.co.uk>
This finally comes with a mechanism for actually injecting events into
the guest vCPU, with all the atomic-test-and-set that's involved in
setting the bit in the shinfo, then the index in the vcpu_info, and
injecting either the lapic vector as MSI, or letting KVM inject the
bare vector.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/kvm/xen_evtchn.c | 175 ++++++++++++++++++++++++++++++++++++++
hw/i386/kvm/xen_evtchn.h | 2 +
target/i386/kvm/xen-emu.c | 12 +++
3 files changed, 189 insertions(+)
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index c57d36b492e0..54707f1f9fe1 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -224,6 +224,13 @@ int xen_evtchn_set_callback_param(uint64_t param)
return ret;
}
+static void inject_callback(XenEvtchnState *s, uint32_t vcpu)
+{
+ int type = s->callback_param >> CALLBACK_VIA_TYPE_SHIFT;
+
+ kvm_xen_inject_vcpu_callback_vector(vcpu, type);
+}
+
static bool valid_port(evtchn_port_t port)
{
if (!port) {
@@ -294,6 +301,152 @@ int xen_evtchn_status_op(struct evtchn_status *status)
return 0;
}
+/*
+ * Never thought I'd hear myself say this, but C++ templates would be
+ * kind of nice here.
+ *
+ * template<class T> static int do_unmask_port(T *shinfo, ...);
+ */
+static int do_unmask_port_lm(XenEvtchnState *s, evtchn_port_t port,
+ bool do_unmask, struct shared_info *shinfo,
+ struct vcpu_info *vcpu_info)
+{
+ const int bits_per_word = BITS_PER_BYTE * sizeof(shinfo->evtchn_pending[0]);
+ typeof(shinfo->evtchn_pending[0]) mask;
+ int idx = port / bits_per_word;
+ int offset = port % bits_per_word;
+
+ mask = 1UL << offset;
+
+ if (idx >= bits_per_word) {
+ return -EINVAL;
+ }
+
+ if (do_unmask) {
+ /*
+ * If this is a true unmask operation, clear the mask bit. If
+ * it was already unmasked, we have nothing further to do.
+ */
+ if (!((qatomic_fetch_and(&shinfo->evtchn_mask[idx], ~mask) & mask))) {
+ return 0;
+ }
+ } else {
+ /*
+ * This is a pseudo-unmask for affinity changes. We don't
+ * change the mask bit, and if it's *masked* we have nothing
+ * else to do.
+ */
+ if (qatomic_fetch_or(&shinfo->evtchn_mask[idx], 0) & mask) {
+ return 0;
+ }
+ }
+
+ /* If the event was not pending, we're done. */
+ if (!(qatomic_fetch_or(&shinfo->evtchn_pending[idx], 0) & mask)) {
+ return 0;
+ }
+
+ /* Now on to the vcpu_info evtchn_pending_sel index... */
+ mask = 1UL << idx;
+
+ /* If a port in this word was already pending for this vCPU, all done. */
+ if (qatomic_fetch_or(&vcpu_info->evtchn_pending_sel, mask) & mask) {
+ return 0;
+ }
+
+ /* Set evtchn_upcall_pending for this vCPU */
+ if (qatomic_fetch_or(&vcpu_info->evtchn_upcall_pending, 1)) {
+ return 0;
+ }
+
+ inject_callback(s, s->port_table[port].vcpu);
+
+ return 0;
+}
+
+static int do_unmask_port_compat(XenEvtchnState *s, evtchn_port_t port,
+ bool do_unmask,
+ struct compat_shared_info *shinfo,
+ struct compat_vcpu_info *vcpu_info)
+{
+ const int bits_per_word = BITS_PER_BYTE * sizeof(shinfo->evtchn_pending[0]);
+ typeof(shinfo->evtchn_pending[0]) mask;
+ int idx = port / bits_per_word;
+ int offset = port % bits_per_word;
+
+ mask = 1UL << offset;
+
+ if (idx >= bits_per_word) {
+ return -EINVAL;
+ }
+
+ if (do_unmask) {
+ /*
+ * If this is a true unmask operation, clear the mask bit. If
+ * it was already unmasked, we have nothing further to do.
+ */
+ if (!((qatomic_fetch_and(&shinfo->evtchn_mask[idx], ~mask) & mask))) {
+ return 0;
+ }
+ } else {
+ /*
+ * This is a pseudo-unmask for affinity changes. We don't
+ * change the mask bit, and if it's *masked* we have nothing
+ * else to do.
+ */
+ if (qatomic_fetch_or(&shinfo->evtchn_mask[idx], 0) & mask) {
+ return 0;
+ }
+ }
+
+ /* If the event was not pending, we're done. */
+ if (!(qatomic_fetch_or(&shinfo->evtchn_pending[idx], 0) & mask)) {
+ return 0;
+ }
+
+ /* Now on to the vcpu_info evtchn_pending_sel index... */
+ mask = 1UL << idx;
+
+ /* If a port in this word was already pending for this vCPU, all done. */
+ if (qatomic_fetch_or(&vcpu_info->evtchn_pending_sel, mask) & mask) {
+ return 0;
+ }
+
+ /* Set evtchn_upcall_pending for this vCPU */
+ if (qatomic_fetch_or(&vcpu_info->evtchn_upcall_pending, 1)) {
+ return 0;
+ }
+
+ inject_callback(s, s->port_table[port].vcpu);
+
+ return 0;
+}
+
+static int unmask_port(XenEvtchnState *s, evtchn_port_t port, bool do_unmask)
+{
+ void *vcpu_info, *shinfo;
+
+ if (s->port_table[port].type == EVTCHNSTAT_closed) {
+ return -EINVAL;
+ }
+
+ shinfo = xen_overlay_get_shinfo_ptr();
+ if (!shinfo) {
+ return -ENOTSUP;
+ }
+
+ vcpu_info = kvm_xen_get_vcpu_info_hva(s->port_table[port].vcpu);
+ if (!vcpu_info) {
+ return -EINVAL;
+ }
+
+ if (xen_is_long_mode()) {
+ return do_unmask_port_lm(s, port, do_unmask, shinfo, vcpu_info);
+ } else {
+ return do_unmask_port_compat(s, port, do_unmask, shinfo, vcpu_info);
+ }
+}
+
static int clear_port_pending(XenEvtchnState *s, evtchn_port_t port)
{
void *p = xen_overlay_get_shinfo_ptr();
@@ -380,3 +533,25 @@ int xen_evtchn_close_op(struct evtchn_close *close)
return ret;
}
+
+int xen_evtchn_unmask_op(struct evtchn_unmask *unmask)
+{
+ XenEvtchnState *s = xen_evtchn_singleton;
+ int ret;
+
+ if (!s) {
+ return -ENOTSUP;
+ }
+
+ if (!valid_port(unmask->port)) {
+ return -EINVAL;
+ }
+
+ qemu_mutex_lock(&s->port_lock);
+
+ ret = unmask_port(s, unmask->port, true);
+
+ qemu_mutex_unlock(&s->port_lock);
+
+ return ret;
+}
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index cb3924941a57..69c6b0d743ae 100644
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -17,7 +17,9 @@ int xen_evtchn_set_callback_param(uint64_t param);
struct evtchn_status;
struct evtchn_close;
+struct evtchn_unmask;
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);
#endif /* QEMU_XEN_EVTCHN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index fab7d6b6a914..884e1c9c11d1 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -817,6 +817,18 @@ static bool kvm_xen_hcall_evtchn_op(struct kvm_xen_exit *exit, X86CPU *cpu,
err = xen_evtchn_close_op(&close);
break;
}
+ case EVTCHNOP_unmask: {
+ struct evtchn_unmask unmask;
+
+ qemu_build_assert(sizeof(unmask) == 4);
+ if (kvm_copy_from_gva(cs, arg, &unmask, sizeof(unmask))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_evtchn_unmask_op(&unmask);
+ break;
+ }
default:
return false;
}
--
2.39.1
next prev parent reply other threads:[~2023-03-02 12:51 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 ` [PULL 27/62] hw/xen: Add xen_evtchn device for event channel emulation Paolo Bonzini
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 ` Paolo Bonzini [this message]
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-32-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).