qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 41/62] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback
Date: Thu,  2 Mar 2023 13:30:08 +0100	[thread overview]
Message-ID: <20230302123029.153265-42-pbonzini@redhat.com> (raw)
In-Reply-To: <20230302123029.153265-1-pbonzini@redhat.com>

From: David Woodhouse <dwmw@amazon.co.uk>

The guest is permitted to specify an arbitrary domain/bus/device/function
and INTX pin from which the callback IRQ shall appear to have come.

In QEMU we can only easily do this for devices that actually exist, and
even that requires us "knowing" that it's a PCMachine in order to find
the PCI root bus — although that's OK really because it's always true.

We also don't get to get notified of INTX routing changes, because we
can't do that as a passive observer; if we try to register a notifier
it will overwrite any existing notifier callback on the device.

But in practice, guests using PCI_INTX will only ever use pin A on the
Xen platform device, and won't swizzle the INTX routing after they set
it up. So this is just fine.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
 hw/i386/kvm/xen_evtchn.c  | 80 ++++++++++++++++++++++++++++++++-------
 target/i386/kvm/xen-emu.c | 34 +++++++++++++++++
 2 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 6b0bdba65df3..f39b751ff999 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -28,6 +28,8 @@
 #include "hw/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/i386/x86.h"
+#include "hw/i386/pc.h"
+#include "hw/pci/pci.h"
 #include "hw/irq.h"
 
 #include "xen_evtchn.h"
@@ -101,6 +103,7 @@ struct XenEvtchnState {
 
     uint64_t callback_param;
     bool evtchn_in_kernel;
+    uint32_t callback_gsi;
 
     QEMUBH *gsi_bh;
 
@@ -217,11 +220,41 @@ static void xen_evtchn_register_types(void)
 
 type_init(xen_evtchn_register_types)
 
+static int set_callback_pci_intx(XenEvtchnState *s, uint64_t param)
+{
+    PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
+    uint8_t pin = param & 3;
+    uint8_t devfn = (param >> 8) & 0xff;
+    uint16_t bus = (param >> 16) & 0xffff;
+    uint16_t domain = (param >> 32) & 0xffff;
+    PCIDevice *pdev;
+    PCIINTxRoute r;
+
+    if (domain || !pcms) {
+        return 0;
+    }
+
+    pdev = pci_find_device(pcms->bus, bus, devfn);
+    if (!pdev) {
+        return 0;
+    }
+
+    r = pci_device_route_intx_to_irq(pdev, pin);
+    if (r.mode != PCI_INTX_ENABLED) {
+        return 0;
+    }
+
+    /*
+     * Hm, can we be notified of INTX routing changes? Not without
+     * *owning* the device and being allowed to overwrite its own
+     * ->intx_routing_notifier, AFAICT. So let's not.
+     */
+    return r.irq;
+}
+
 void xen_evtchn_set_callback_level(int level)
 {
     XenEvtchnState *s = xen_evtchn_singleton;
-    uint32_t param;
-
     if (!s) {
         return;
     }
@@ -260,18 +293,12 @@ void xen_evtchn_set_callback_level(int level)
         return;
     }
 
-    param = (uint32_t)s->callback_param;
-
-    switch (s->callback_param >> CALLBACK_VIA_TYPE_SHIFT) {
-    case HVM_PARAM_CALLBACK_TYPE_GSI:
-        if (param < IOAPIC_NUM_PINS) {
-            qemu_set_irq(s->gsis[param], level);
-            if (level) {
-                /* Ensure the vCPU polls for deassertion */
-                kvm_xen_set_callback_asserted();
-            }
+    if (s->callback_gsi && s->callback_gsi < IOAPIC_NUM_PINS) {
+        qemu_set_irq(s->gsis[s->callback_gsi], level);
+        if (level) {
+            /* Ensure the vCPU polls for deassertion */
+            kvm_xen_set_callback_asserted();
         }
-        break;
     }
 }
 
@@ -283,15 +310,22 @@ int xen_evtchn_set_callback_param(uint64_t param)
         .u.vector = 0,
     };
     bool in_kernel = false;
+    uint32_t gsi = 0;
+    int type = param >> CALLBACK_VIA_TYPE_SHIFT;
     int ret;
 
     if (!s) {
         return -ENOTSUP;
     }
 
+    /*
+     * We need the BQL because set_callback_pci_intx() may call into PCI code,
+     * and because we may need to manipulate the old and new GSI levels.
+     */
+    assert(qemu_mutex_iothread_locked());
     qemu_mutex_lock(&s->port_lock);
 
-    switch (param >> CALLBACK_VIA_TYPE_SHIFT) {
+    switch (type) {
     case HVM_PARAM_CALLBACK_TYPE_VECTOR: {
         xa.u.vector = (uint8_t)param,
 
@@ -299,10 +333,17 @@ int xen_evtchn_set_callback_param(uint64_t param)
         if (!ret && kvm_xen_has_cap(EVTCHN_SEND)) {
             in_kernel = true;
         }
+        gsi = 0;
         break;
     }
 
+    case HVM_PARAM_CALLBACK_TYPE_PCI_INTX:
+        gsi = set_callback_pci_intx(s, param);
+        ret = gsi ? 0 : -EINVAL;
+        break;
+
     case HVM_PARAM_CALLBACK_TYPE_GSI:
+        gsi = (uint32_t)param;
         ret = 0;
         break;
 
@@ -320,6 +361,17 @@ int xen_evtchn_set_callback_param(uint64_t param)
         }
         s->callback_param = param;
         s->evtchn_in_kernel = in_kernel;
+
+        if (gsi != s->callback_gsi) {
+            struct vcpu_info *vi = kvm_xen_get_vcpu_info_hva(0);
+
+            xen_evtchn_set_callback_level(0);
+            s->callback_gsi = gsi;
+
+            if (gsi && vi && vi->evtchn_upcall_pending) {
+                kvm_xen_inject_vcpu_callback_vector(0, type);
+            }
+        }
     }
 
     qemu_mutex_unlock(&s->port_lock);
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index b52617df5490..9e22c9fa025f 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -131,6 +131,38 @@ int kvm_xen_init(KVMState *s, uint32_t hypercall_msr)
         return ret;
     }
 
+    /* If called a second time, don't repeat the rest of the setup. */
+    if (s->xen_caps) {
+        return 0;
+    }
+
+    /*
+     * Event channel delivery via GSI/PCI_INTX needs to poll the vcpu_info
+     * of vCPU0 to deassert the IRQ when ->evtchn_upcall_pending is cleared.
+     *
+     * In the kernel, there's a notifier hook on the PIC/IOAPIC which allows
+     * such things to be polled at precisely the right time. We *could* do
+     * it nicely in the kernel: check vcpu_info[0]->evtchn_upcall_pending at
+     * the moment the IRQ is acked, and see if it should be reasserted.
+     *
+     * But the in-kernel irqchip is deprecated, so we're unlikely to add
+     * that support in the kernel. Insist on using the split irqchip mode
+     * instead.
+     *
+     * This leaves us polling for the level going low in QEMU, which lacks
+     * the appropriate hooks in its PIC/IOAPIC code. Even VFIO is sending a
+     * spurious 'ack' to an INTX IRQ every time there's any MMIO access to
+     * the device (for which it has to unmap the device and trap access, for
+     * some period after an IRQ!!). In the Xen case, we do it on exit from
+     * KVM_RUN, if the flag is set to say that the GSI is currently asserted.
+     * Which is kind of icky, but less so than the VFIO one. I may fix them
+     * both later...
+     */
+    if (!kvm_kernel_irqchip_split()) {
+        error_report("kvm: Xen support requires kernel-irqchip=split");
+        return -EINVAL;
+    }
+
     s->xen_caps = xen_caps;
     return 0;
 }
@@ -684,7 +716,9 @@ static bool handle_set_param(struct kvm_xen_exit *exit, X86CPU *cpu,
 
     switch (hp.index) {
     case HVM_PARAM_CALLBACK_IRQ:
+        qemu_mutex_lock_iothread();
         err = xen_evtchn_set_callback_param(hp.value);
+        qemu_mutex_unlock_iothread();
         xen_set_long_mode(exit->u.hcall.longmode);
         break;
     default:
-- 
2.39.1



  parent reply	other threads:[~2023-03-02 12:53 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 ` [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 ` Paolo Bonzini [this message]
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-42-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).