From: David Woodhouse <dwmw2@infradead.org>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Paul Durrant" <paul@xen.org>,
"Joao Martins" <joao.m.martins@oracle.com>,
"Ankur Arora" <ankur.a.arora@oracle.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Claudio Fontana" <cfontana@suse.de>,
"Julien Grall" <julien@xen.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
armbru@redhat.com
Subject: [PATCH v11 41/59] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback
Date: Thu, 16 Feb 2023 06:24:26 +0000 [thread overview]
Message-ID: <20230216062444.2129371-42-dwmw2@infradead.org> (raw)
In-Reply-To: <20230216062444.2129371-1-dwmw2@infradead.org>
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 ecc93da172..5d5996641d 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 < GSI_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 < GSI_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 e64cd468b8..ec82170261 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;
}
@@ -681,7 +713,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.0
next prev parent reply other threads:[~2023-02-16 6:27 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 6:23 [PATCH v11 00/59] Xen HVM support under KVM David Woodhouse
2023-02-16 6:23 ` [PATCH v11 01/59] include: import Xen public headers to hw/xen/interface David Woodhouse
2023-02-16 6:23 ` [PATCH v11 02/59] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation David Woodhouse
2023-02-16 6:23 ` [PATCH v11 03/59] xen: Add XEN_DISABLED mode and make it default David Woodhouse
2023-02-16 6:23 ` [PATCH v11 04/59] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support David Woodhouse
2023-02-16 6:23 ` [PATCH v11 05/59] i386/kvm: handle Xen HVM cpuid leaves David Woodhouse
2023-02-16 6:23 ` [PATCH v11 06/59] i386/hvm: Set Xen vCPU ID in KVM David Woodhouse
2023-02-16 6:23 ` [PATCH v11 07/59] xen-platform: exclude vfio-pci from the PCI platform unplug David Woodhouse
2023-02-16 6:23 ` [PATCH v11 08/59] xen-platform: allow its creation with XEN_EMULATE mode David Woodhouse
2023-02-16 6:23 ` [PATCH v11 09/59] i386/xen: handle guest hypercalls David Woodhouse
2023-02-20 14:17 ` Paul Durrant
2023-02-16 6:23 ` [PATCH v11 10/59] i386/xen: implement HYPERVISOR_xen_version David Woodhouse
2023-02-16 6:23 ` [PATCH v11 11/59] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown David Woodhouse
2023-02-16 6:23 ` [PATCH v11 12/59] i386/xen: Implement SCHEDOP_poll and SCHEDOP_yield David Woodhouse
2023-02-16 6:23 ` [PATCH v11 13/59] hw/xen: Add xen_overlay device for emulating shared xenheap pages David Woodhouse
2023-02-16 6:23 ` [PATCH v11 14/59] xen: Permit --xen-domid argument when accel is KVM David Woodhouse
2023-02-16 6:24 ` [PATCH v11 15/59] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode David Woodhouse
2023-02-16 6:24 ` [PATCH v11 16/59] i386/xen: manage and save/restore Xen guest long_mode setting David Woodhouse
2023-02-16 6:24 ` [PATCH v11 17/59] i386/xen: implement HYPERVISOR_memory_op David Woodhouse
2023-02-16 6:24 ` [PATCH v11 18/59] i386/xen: implement XENMEM_add_to_physmap_batch David Woodhouse
2023-02-16 6:24 ` [PATCH v11 19/59] i386/xen: implement HYPERVISOR_hvm_op David Woodhouse
2023-02-16 6:24 ` [PATCH v11 20/59] i386/xen: implement HYPERVISOR_vcpu_op David Woodhouse
2023-02-16 6:24 ` [PATCH v11 21/59] i386/xen: handle VCPUOP_register_vcpu_info David Woodhouse
2023-02-16 6:24 ` [PATCH v11 22/59] i386/xen: handle VCPUOP_register_vcpu_time_info David Woodhouse
2023-02-16 6:24 ` [PATCH v11 23/59] i386/xen: handle VCPUOP_register_runstate_memory_area David Woodhouse
2023-02-16 6:24 ` [PATCH v11 24/59] i386/xen: implement HYPERVISOR_event_channel_op David Woodhouse
2023-02-16 6:24 ` [PATCH v11 25/59] i386/xen: implement HVMOP_set_evtchn_upcall_vector David Woodhouse
2023-02-16 6:24 ` [PATCH v11 26/59] i386/xen: implement HVMOP_set_param David Woodhouse
2023-02-16 6:24 ` [PATCH v11 27/59] hw/xen: Add xen_evtchn device for event channel emulation David Woodhouse
2023-02-16 6:24 ` [PATCH v11 28/59] i386/xen: Add support for Xen event channel delivery to vCPU David Woodhouse
2023-02-16 6:24 ` [PATCH v11 29/59] hw/xen: Implement EVTCHNOP_status David Woodhouse
2023-02-16 6:24 ` [PATCH v11 30/59] hw/xen: Implement EVTCHNOP_close David Woodhouse
2023-02-16 6:24 ` [PATCH v11 31/59] hw/xen: Implement EVTCHNOP_unmask David Woodhouse
2023-02-16 6:24 ` [PATCH v11 32/59] hw/xen: Implement EVTCHNOP_bind_virq David Woodhouse
2023-02-16 6:24 ` [PATCH v11 33/59] hw/xen: Implement EVTCHNOP_bind_ipi David Woodhouse
2023-02-16 6:24 ` [PATCH v11 34/59] hw/xen: Implement EVTCHNOP_send David Woodhouse
2023-02-16 6:24 ` [PATCH v11 35/59] hw/xen: Implement EVTCHNOP_alloc_unbound David Woodhouse
2023-02-16 6:24 ` [PATCH v11 36/59] hw/xen: Implement EVTCHNOP_bind_interdomain David Woodhouse
2023-02-16 6:24 ` [PATCH v11 37/59] hw/xen: Implement EVTCHNOP_bind_vcpu David Woodhouse
2023-02-16 6:24 ` [PATCH v11 38/59] hw/xen: Implement EVTCHNOP_reset David Woodhouse
2023-02-16 6:24 ` [PATCH v11 39/59] i386/xen: add monitor commands to test event injection David Woodhouse
2023-02-16 6:24 ` [PATCH v11 40/59] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback David Woodhouse
2023-02-16 6:24 ` David Woodhouse [this message]
2023-02-16 6:24 ` [PATCH v11 42/59] kvm/i386: Add xen-gnttab-max-frames property David Woodhouse
2023-02-16 6:24 ` [PATCH v11 43/59] hw/xen: Add xen_gnttab device for grant table emulation David Woodhouse
2023-02-16 6:24 ` [PATCH v11 44/59] hw/xen: Support mapping grant frames David Woodhouse
2023-02-20 14:20 ` Paul Durrant
2023-02-16 6:24 ` [PATCH v11 45/59] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson David Woodhouse
2023-02-16 6:24 ` [PATCH v11 46/59] hw/xen: Implement GNTTABOP_query_size David Woodhouse
2023-02-16 6:24 ` [PATCH v11 47/59] i386/xen: handle PV timer hypercalls David Woodhouse
2023-02-20 14:29 ` Paul Durrant
2023-02-20 15:49 ` David Woodhouse
2023-02-16 6:24 ` [PATCH v11 48/59] i386/xen: Reserve Xen special pages for console, xenstore rings David Woodhouse
2023-02-16 6:24 ` [PATCH v11 49/59] i386/xen: handle HVMOP_get_param David Woodhouse
2023-02-16 6:24 ` [PATCH v11 50/59] hw/xen: Add backend implementation of interdomain event channel support David Woodhouse
2023-02-16 6:24 ` [PATCH v11 51/59] hw/xen: Add xen_xenstore device for xenstore emulation David Woodhouse
2023-02-16 6:24 ` [PATCH v11 52/59] hw/xen: Add basic ring handling to xenstore David Woodhouse
2023-02-16 6:24 ` [PATCH v11 53/59] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests David Woodhouse
2023-02-16 6:24 ` [PATCH v11 54/59] i386/xen: Implement HYPERVISOR_physdev_op David Woodhouse
2023-02-16 6:24 ` [PATCH v11 55/59] hw/xen: Implement emulated PIRQ hypercall support David Woodhouse
2023-02-16 6:24 ` [PATCH v11 56/59] hw/xen: Support GSI mapping to PIRQ David Woodhouse
2023-02-16 6:24 ` [PATCH v11 57/59] hw/xen: Support MSI " David Woodhouse
2023-02-16 6:24 ` [PATCH v11 58/59] kvm/i386: Add xen-evtchn-max-pirq property David Woodhouse
2023-02-16 6:24 ` [PATCH v11 59/59] i386/xen: Document Xen HVM emulation 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=20230216062444.2129371-42-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=alex.bennee@linaro.org \
--cc=ankur.a.arora@oracle.com \
--cc=armbru@redhat.com \
--cc=cfontana@suse.de \
--cc=dgilbert@redhat.com \
--cc=joao.m.martins@oracle.com \
--cc=julien@xen.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.com \
/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).