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 v8 54/58] i386/xen: Implement HYPERVISOR_physdev_op
Date: Fri, 20 Jan 2023 13:13:39 +0000 [thread overview]
Message-ID: <20230120131343.1441939-55-dwmw2@infradead.org> (raw)
In-Reply-To: <20230120131343.1441939-1-dwmw2@infradead.org>
From: David Woodhouse <dwmw@amazon.co.uk>
Just hook up the basic hypercalls to stubs in xen_evtchn.c for now.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/i386/kvm/xen_evtchn.c | 25 ++++++++
hw/i386/kvm/xen_evtchn.h | 11 ++++
target/i386/kvm/xen-compat.h | 19 ++++++
target/i386/kvm/xen-emu.c | 118 +++++++++++++++++++++++++++++++++++
4 files changed, 173 insertions(+)
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 2b12469815..8cff78ddcb 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -1346,6 +1346,31 @@ int xen_evtchn_set_port(uint16_t port)
return ret;
}
+int xen_physdev_map_pirq(struct physdev_map_pirq *map)
+{
+ return -ENOTSUP;
+}
+
+int xen_physdev_unmap_pirq(struct physdev_unmap_pirq *unmap)
+{
+ return -ENOTSUP;
+}
+
+int xen_physdev_eoi_pirq(struct physdev_eoi *eoi)
+{
+ return -ENOTSUP;
+}
+
+int xen_physdev_query_pirq(struct physdev_irq_status_query *query)
+{
+ return -ENOTSUP;
+}
+
+int xen_physdev_get_free_pirq(struct physdev_get_free_pirq *get)
+{
+ return -ENOTSUP;
+}
+
struct xenevtchn_handle *xen_be_evtchn_open(void)
{
struct xenevtchn_handle *xc = g_new0(struct xenevtchn_handle, 1);
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index 5a71ffb753..352c875976 100644
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -62,4 +62,15 @@ 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);
+struct physdev_map_pirq;
+struct physdev_unmap_pirq;
+struct physdev_eoi;
+struct physdev_irq_status_query;
+struct physdev_get_free_pirq;
+int xen_physdev_map_pirq(struct physdev_map_pirq *map);
+int xen_physdev_unmap_pirq(struct physdev_unmap_pirq *unmap);
+int xen_physdev_eoi_pirq(struct physdev_eoi *eoi);
+int xen_physdev_query_pirq(struct physdev_irq_status_query *query);
+int xen_physdev_get_free_pirq(struct physdev_get_free_pirq *get);
+
#endif /* QEMU_XEN_EVTCHN_H */
diff --git a/target/i386/kvm/xen-compat.h b/target/i386/kvm/xen-compat.h
index ff5d20e901..e86ffc7644 100644
--- a/target/i386/kvm/xen-compat.h
+++ b/target/i386/kvm/xen-compat.h
@@ -48,4 +48,23 @@ struct compat_xen_add_to_physmap_batch {
COMPAT_HANDLE(int) errs;
};
+struct compat_physdev_map_pirq {
+ domid_t domid;
+ uint16_t pad;
+ /* IN */
+ int type;
+ /* IN (ignored for ..._MULTI_MSI) */
+ int index;
+ /* IN or OUT */
+ int pirq;
+ /* IN - high 16 bits hold segment for ..._MSI_SEG and ..._MULTI_MSI */
+ int bus;
+ /* IN */
+ int devfn;
+ /* IN (also OUT for ..._MULTI_MSI) */
+ int entry_nr;
+ /* IN */
+ uint64_t table_base;
+} __attribute__((packed));
+
#endif /* QEMU_I386_XEN_COMPAT_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index aa99dde630..85a2276390 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -1510,6 +1510,121 @@ static bool kvm_xen_hcall_gnttab_op(struct kvm_xen_exit *exit, X86CPU *cpu,
return true;
}
+static bool kvm_xen_hcall_physdev_op(struct kvm_xen_exit *exit, X86CPU *cpu,
+ int cmd, uint64_t arg)
+{
+ CPUState *cs = CPU(cpu);
+ int err;
+
+ switch (cmd) {
+ case PHYSDEVOP_map_pirq: {
+ struct physdev_map_pirq map;
+
+ if (hypercall_compat32(exit->u.hcall.longmode)) {
+ struct compat_physdev_map_pirq *map32 = (void *)↦
+
+ if (kvm_copy_from_gva(cs, arg, map32, sizeof(*map32))) {
+ return -EFAULT;
+ }
+
+ /*
+ * The only thing that's different is the alignment of the
+ * uint64_t table_base at the end, which gets padding to make
+ * it 64-bit aligned in the 64-bit version.
+ */
+ qemu_build_assert(sizeof(*map32) == 36);
+ qemu_build_assert(offsetof(struct physdev_map_pirq, entry_nr) ==
+ offsetof(struct compat_physdev_map_pirq, entry_nr));
+ memmove(&map.table_base, &map32->table_base, sizeof(map.table_base));
+ } else {
+ if (kvm_copy_from_gva(cs, arg, &map, sizeof(map))) {
+ err = -EFAULT;
+ break;
+ }
+ }
+ err = xen_physdev_map_pirq(&map);
+ /*
+ * Since table_base is an IN parameter and won't be changed, just
+ * copy the size of the compat structure back to the guest.
+ */
+ if (!err && kvm_copy_to_gva(cs, arg, &map,
+ sizeof(struct compat_physdev_map_pirq))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case PHYSDEVOP_unmap_pirq: {
+ struct physdev_unmap_pirq unmap;
+
+ qemu_build_assert(sizeof(unmap) == 8);
+ if (kvm_copy_from_gva(cs, arg, &unmap, sizeof(unmap))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_physdev_unmap_pirq(&unmap);
+ if (!err && kvm_copy_to_gva(cs, arg, &unmap, sizeof(unmap))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case PHYSDEVOP_eoi: {
+ struct physdev_eoi eoi;
+
+ qemu_build_assert(sizeof(eoi) == 4);
+ if (kvm_copy_from_gva(cs, arg, &eoi, sizeof(eoi))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_physdev_eoi_pirq(&eoi);
+ if (!err && kvm_copy_to_gva(cs, arg, &eoi, sizeof(eoi))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case PHYSDEVOP_irq_status_query: {
+ struct physdev_irq_status_query query;
+
+ qemu_build_assert(sizeof(query) == 8);
+ if (kvm_copy_from_gva(cs, arg, &query, sizeof(query))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_physdev_query_pirq(&query);
+ if (!err && kvm_copy_to_gva(cs, arg, &query, sizeof(query))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case PHYSDEVOP_get_free_pirq: {
+ struct physdev_get_free_pirq get;
+
+ qemu_build_assert(sizeof(get) == 8);
+ if (kvm_copy_from_gva(cs, arg, &get, sizeof(get))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_physdev_get_free_pirq(&get);
+ if (!err && kvm_copy_to_gva(cs, arg, &get, sizeof(get))) {
+ err = -EFAULT;
+ }
+ break;
+ }
+ case PHYSDEVOP_pirq_eoi_gmfn_v2: // FreeBSD 13 makes this hypercall
+ err = -ENOSYS;
+ break;
+
+ default:
+ return false;
+ }
+
+ exit->u.hcall.result = err;
+ return true;
+}
+
static bool do_kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit)
{
uint16_t code = exit->u.hcall.input;
@@ -1544,6 +1659,9 @@ static bool do_kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit)
case __HYPERVISOR_memory_op:
return kvm_xen_hcall_memory_op(exit, cpu, exit->u.hcall.params[0],
exit->u.hcall.params[1]);
+ case __HYPERVISOR_physdev_op:
+ return kvm_xen_hcall_physdev_op(exit, cpu, exit->u.hcall.params[0],
+ exit->u.hcall.params[1]);
case __HYPERVISOR_xen_version:
return kvm_xen_hcall_xen_version(exit, cpu, exit->u.hcall.params[0],
exit->u.hcall.params[1]);
--
2.39.0
next prev parent reply other threads:[~2023-01-20 13:16 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 13:12 [PATCH 00/58] Xen HVM support under KVM David Woodhouse
2023-01-20 13:12 ` [PATCH v8 01/58] include: import Xen public headers to include/standard-headers/ David Woodhouse
2023-01-20 13:12 ` [PATCH v8 02/58] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation David Woodhouse
2023-01-20 13:12 ` [PATCH v8 03/58] xen: Add XEN_DISABLED mode and make it default David Woodhouse
2023-01-20 13:12 ` [PATCH v8 04/58] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support David Woodhouse
2023-01-20 13:12 ` [PATCH v8 05/58] i386/kvm: handle Xen HVM cpuid leaves David Woodhouse
2023-01-20 13:12 ` [PATCH v8 06/58] i386/hvm: Set Xen vCPU ID in KVM David Woodhouse
2023-01-20 13:12 ` [PATCH v8 07/58] xen-platform: exclude vfio-pci from the PCI platform unplug David Woodhouse
2023-01-20 13:12 ` [PATCH v8 08/58] xen-platform: allow its creation with XEN_EMULATE mode David Woodhouse
2023-01-20 13:12 ` [PATCH v8 09/58] i386/xen: handle guest hypercalls David Woodhouse
2023-01-20 13:12 ` [PATCH v8 10/58] i386/xen: implement HYPERVISOR_xen_version David Woodhouse
2023-01-20 13:12 ` [PATCH v8 11/58] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown David Woodhouse
2023-01-20 13:12 ` [PATCH v8 12/58] i386/xen: Implement SCHEDOP_poll and SCHEDOP_yield David Woodhouse
2023-01-20 13:12 ` [PATCH v8 13/58] hw/xen: Add xen_overlay device for emulating shared xenheap pages David Woodhouse
2023-01-20 13:12 ` [PATCH v8 14/58] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode David Woodhouse
2023-01-20 13:13 ` [PATCH v8 15/58] i386/xen: manage and save/restore Xen guest long_mode setting David Woodhouse
2023-01-20 13:13 ` [PATCH v8 16/58] i386/xen: implement HYPERVISOR_memory_op David Woodhouse
2023-01-20 13:13 ` [PATCH v8 17/58] i386/xen: implement XENMEM_add_to_physmap_batch David Woodhouse
2023-01-20 13:13 ` [PATCH v8 18/58] i386/xen: implement HYPERVISOR_hvm_op David Woodhouse
2023-01-20 13:13 ` [PATCH v8 19/58] i386/xen: implement HYPERVISOR_vcpu_op David Woodhouse
2023-01-20 13:13 ` [PATCH v8 20/58] i386/xen: handle VCPUOP_register_vcpu_info David Woodhouse
2023-01-20 13:13 ` [PATCH v8 21/58] i386/xen: handle VCPUOP_register_vcpu_time_info David Woodhouse
2023-01-20 13:13 ` [PATCH v8 22/58] i386/xen: handle VCPUOP_register_runstate_memory_area David Woodhouse
2023-01-20 13:13 ` [PATCH v8 23/58] i386/xen: implement HYPERVISOR_event_channel_op David Woodhouse
2023-01-20 13:13 ` [PATCH v8 24/58] i386/xen: implement HVMOP_set_evtchn_upcall_vector David Woodhouse
2023-01-20 13:13 ` [PATCH v8 25/58] i386/xen: implement HVMOP_set_param David Woodhouse
2023-01-20 13:13 ` [PATCH v8 26/58] hw/xen: Add xen_evtchn device for event channel emulation David Woodhouse
2023-01-27 8:59 ` Paul Durrant
2023-01-20 13:13 ` [PATCH v8 27/58] i386/xen: Add support for Xen event channel delivery to vCPU David Woodhouse
2023-01-20 13:13 ` [PATCH v8 28/58] hw/xen: Implement EVTCHNOP_status David Woodhouse
2023-01-27 9:03 ` Paul Durrant
2023-01-20 13:13 ` [PATCH v8 29/58] hw/xen: Implement EVTCHNOP_close David Woodhouse
2023-01-20 13:13 ` [PATCH v8 30/58] hw/xen: Implement EVTCHNOP_unmask David Woodhouse
2023-01-20 13:13 ` [PATCH v8 31/58] hw/xen: Implement EVTCHNOP_bind_virq David Woodhouse
2023-01-20 13:13 ` [PATCH v8 32/58] hw/xen: Implement EVTCHNOP_bind_ipi David Woodhouse
2023-01-20 13:13 ` [PATCH v8 33/58] hw/xen: Implement EVTCHNOP_send David Woodhouse
2023-01-20 13:13 ` [PATCH v8 34/58] hw/xen: Implement EVTCHNOP_alloc_unbound David Woodhouse
2023-01-20 13:13 ` [PATCH v8 35/58] hw/xen: Implement EVTCHNOP_bind_interdomain David Woodhouse
2023-01-20 13:13 ` [PATCH v8 36/58] hw/xen: Implement EVTCHNOP_bind_vcpu David Woodhouse
2023-01-20 13:13 ` [PATCH v8 37/58] hw/xen: Implement EVTCHNOP_reset David Woodhouse
2023-01-20 13:13 ` [PATCH v8 38/58] i386/xen: add monitor commands to test event injection David Woodhouse
2023-01-20 13:13 ` [PATCH v8 39/58] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback David Woodhouse
2023-01-20 13:13 ` [PATCH v8 40/58] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback David Woodhouse
2023-01-20 13:13 ` [PATCH v8 41/58] kvm/i386: Add xen-gnttab-max-frames property David Woodhouse
2023-01-20 13:13 ` [PATCH v8 42/58] hw/xen: Add xen_gnttab device for grant table emulation David Woodhouse
2023-01-20 13:13 ` [PATCH v8 43/58] hw/xen: Support mapping grant frames David Woodhouse
2023-01-20 13:13 ` [PATCH v8 44/58] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson David Woodhouse
2023-01-20 13:13 ` [PATCH v8 45/58] hw/xen: Implement GNTTABOP_query_size David Woodhouse
2023-01-20 13:13 ` [PATCH v8 46/58] i386/xen: handle PV timer hypercalls David Woodhouse
2023-01-20 13:13 ` [PATCH v8 47/58] i386/xen: Reserve Xen special pages for console, xenstore rings David Woodhouse
2023-01-20 13:13 ` [PATCH v8 48/58] i386/xen: handle HVMOP_get_param David Woodhouse
2023-01-20 13:13 ` [PATCH v8 49/58] hw/xen: Add backend implementation of interdomain event channel support David Woodhouse
2023-01-20 13:13 ` [PATCH v8 50/58] hw/xen: Add xen_xenstore device for xenstore emulation David Woodhouse
2023-01-20 13:13 ` [PATCH v8 51/58] hw/xen: Add basic ring handling to xenstore David Woodhouse
2023-01-20 13:13 ` [PATCH v8 52/58] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests David Woodhouse
2023-01-20 13:13 ` [PATCH v8 53/58] i386/xen: Document Xen HVM emulation David Woodhouse
2023-01-20 13:13 ` David Woodhouse [this message]
2023-01-20 13:13 ` [PATCH v8 55/58] hw/xen: Implement emulated PIRQ hypercall support David Woodhouse
2023-01-20 13:13 ` [PATCH v8 56/58] hw/xen: Support GSI mapping to PIRQ David Woodhouse
2023-01-20 13:13 ` [PATCH v8 57/58] hw/xen: Support MSI " David Woodhouse
2023-01-20 13:13 ` [PATCH v8 58/58] kvm/i386: Add xen-evtchn-max-pirq property 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=20230120131343.1441939-55-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).