qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 36/59] hw/xen: Implement EVTCHNOP_bind_interdomain
Date: Thu, 16 Feb 2023 06:24:21 +0000	[thread overview]
Message-ID: <20230216062444.2129371-37-dwmw2@infradead.org> (raw)
In-Reply-To: <20230216062444.2129371-1-dwmw2@infradead.org>

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

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
 hw/i386/kvm/xen_evtchn.c  | 78 +++++++++++++++++++++++++++++++++++++++
 hw/i386/kvm/xen_evtchn.h  |  2 +
 target/i386/kvm/xen-emu.c | 16 ++++++++
 3 files changed, 96 insertions(+)

diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 9dc5a98d94..3e6f7afcbc 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -720,6 +720,23 @@ static int close_port(XenEvtchnState *s, evtchn_port_t port)
         }
         break;
 
+    case EVTCHNSTAT_interdomain:
+        if (p->type_val & PORT_INFO_TYPEVAL_REMOTE_QEMU) {
+            /* Not yet implemented. This can't happen! */
+        } else {
+            /* Loopback interdomain */
+            XenEvtchnPort *rp = &s->port_table[p->type_val];
+            if (!valid_port(p->type_val) || rp->type_val != port ||
+                rp->type != EVTCHNSTAT_interdomain) {
+                error_report("Inconsistent state for interdomain unbind");
+            } else {
+                /* Set the other end back to unbound */
+                rp->type = EVTCHNSTAT_unbound;
+                rp->type_val = 0;
+            }
+        }
+        break;
+
     default:
         break;
     }
@@ -835,6 +852,67 @@ int xen_evtchn_bind_ipi_op(struct evtchn_bind_ipi *ipi)
     return ret;
 }
 
+int xen_evtchn_bind_interdomain_op(struct evtchn_bind_interdomain *interdomain)
+{
+    XenEvtchnState *s = xen_evtchn_singleton;
+    uint16_t type_val;
+    int ret;
+
+    if (!s) {
+        return -ENOTSUP;
+    }
+
+    if (interdomain->remote_dom == DOMID_QEMU) {
+        type_val = PORT_INFO_TYPEVAL_REMOTE_QEMU;
+    } else if (interdomain->remote_dom == DOMID_SELF ||
+               interdomain->remote_dom == xen_domid) {
+        type_val = 0;
+    } else {
+        return -ESRCH;
+    }
+
+    if (!valid_port(interdomain->remote_port)) {
+        return -EINVAL;
+    }
+
+    qemu_mutex_lock(&s->port_lock);
+
+    /* The newly allocated port starts out as unbound */
+    ret = allocate_port(s, 0, EVTCHNSTAT_unbound, type_val,
+                        &interdomain->local_port);
+    if (ret) {
+        goto out;
+    }
+
+    if (interdomain->remote_dom == DOMID_QEMU) {
+        /* We haven't hooked up QEMU's PV drivers to this yet */
+        ret = -ENOSYS;
+    } else {
+        /* Loopback */
+        XenEvtchnPort *rp = &s->port_table[interdomain->remote_port];
+        XenEvtchnPort *lp = &s->port_table[interdomain->local_port];
+
+        if (rp->type == EVTCHNSTAT_unbound && rp->type_val == 0) {
+            /* It's a match! */
+            rp->type = EVTCHNSTAT_interdomain;
+            rp->type_val = interdomain->local_port;
+
+            lp->type = EVTCHNSTAT_interdomain;
+            lp->type_val = interdomain->remote_port;
+        } else {
+            ret = -EINVAL;
+        }
+    }
+
+    if (ret) {
+        free_port(s, interdomain->local_port);
+    }
+ out:
+    qemu_mutex_unlock(&s->port_lock);
+
+    return ret;
+
+}
 int xen_evtchn_alloc_unbound_op(struct evtchn_alloc_unbound *alloc)
 {
     XenEvtchnState *s = xen_evtchn_singleton;
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index fc080138e3..1ebc7580eb 100644
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -22,6 +22,7 @@ struct evtchn_bind_virq;
 struct evtchn_bind_ipi;
 struct evtchn_send;
 struct evtchn_alloc_unbound;
+struct evtchn_bind_interdomain;
 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);
@@ -29,5 +30,6 @@ int xen_evtchn_bind_virq_op(struct evtchn_bind_virq *virq);
 int xen_evtchn_bind_ipi_op(struct evtchn_bind_ipi *ipi);
 int xen_evtchn_send_op(struct evtchn_send *send);
 int xen_evtchn_alloc_unbound_op(struct evtchn_alloc_unbound *alloc);
+int xen_evtchn_bind_interdomain_op(struct evtchn_bind_interdomain *interdomain);
 
 #endif /* QEMU_XEN_EVTCHN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index e186dec9a9..a07d1d39f3 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -933,6 +933,22 @@ static bool kvm_xen_hcall_evtchn_op(struct kvm_xen_exit *exit, X86CPU *cpu,
         }
         break;
     }
+    case EVTCHNOP_bind_interdomain: {
+        struct evtchn_bind_interdomain interdomain;
+
+        qemu_build_assert(sizeof(interdomain) == 12);
+        if (kvm_copy_from_gva(cs, arg, &interdomain, sizeof(interdomain))) {
+            err = -EFAULT;
+            break;
+        }
+
+        err = xen_evtchn_bind_interdomain_op(&interdomain);
+        if (!err &&
+            kvm_copy_to_gva(cs, arg, &interdomain, sizeof(interdomain))) {
+            err = -EFAULT;
+        }
+        break;
+    }
     default:
         return false;
     }
-- 
2.39.0



  parent reply	other threads:[~2023-02-16  6:31 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 ` David Woodhouse [this message]
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 ` [PATCH v11 41/59] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback David Woodhouse
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-37-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).