From: Jagannathan Raman <jag.raman@oracle.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, mst@redhat.com, f4bug@amsat.org,
pbonzini@redhat.com, marcandre.lureau@redhat.com,
thuth@redhat.com, bleal@redhat.com, berrange@redhat.com,
eduardo@habkost.net, marcel.apfelbaum@gmail.com,
eblake@redhat.com, armbru@redhat.com, quintela@redhat.com,
dgilbert@redhat.com, imammedo@redhat.com, peterx@redhat.com,
john.levon@nutanix.com, thanos.makatos@nutanix.com,
elena.ufimtseva@oracle.com, john.g.johnson@oracle.com,
kanth.ghatraju@oracle.com, jag.raman@oracle.com
Subject: [PATCH v9 10/17] vfio-user: run vfio-user context
Date: Tue, 3 May 2022 10:16:51 -0400 [thread overview]
Message-ID: <7350f4813b73af783965b758ecf39d0a6a76db53.1651586203.git.jag.raman@oracle.com> (raw)
In-Reply-To: <cover.1651586203.git.jag.raman@oracle.com>
Setup a handler to run vfio-user context. The context is driven by
messages to the file descriptor associated with it - get the fd for
the context and hook up the handler with it
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
qapi/misc.json | 30 +++++++++++
hw/remote/vfio-user-obj.c | 102 +++++++++++++++++++++++++++++++++++++-
2 files changed, 131 insertions(+), 1 deletion(-)
diff --git a/qapi/misc.json b/qapi/misc.json
index b83cc39029..fa49f2876a 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -553,3 +553,33 @@
##
{ 'event': 'RTC_CHANGE',
'data': { 'offset': 'int', 'qom-path': 'str' } }
+
+##
+# @VFU_CLIENT_HANGUP:
+#
+# Emitted when the client of a TYPE_VFIO_USER_SERVER closes the
+# communication channel
+#
+# @vfu-id: ID of the TYPE_VFIO_USER_SERVER object
+#
+# @vfu-qom-path: path to the TYPE_VFIO_USER_SERVER object in the QOM tree
+#
+# @dev-id: ID of attached PCI device
+#
+# @dev-qom-path: path to attached PCI device in the QOM tree
+#
+# Since: 7.1
+#
+# Example:
+#
+# <- { "event": "VFU_CLIENT_HANGUP",
+# "data": { "vfu-id": "vfu1",
+# "vfu-qom-path": "/objects/vfu1",
+# "dev-id": "sas1",
+# "dev-qom-path": "/machine/peripheral/sas1" },
+# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
+#
+##
+{ 'event': 'VFU_CLIENT_HANGUP',
+ 'data': { 'vfu-id': 'str', 'vfu-qom-path': 'str',
+ 'dev-id': 'str', 'dev-qom-path': 'str' } }
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 3ca6aa2b45..3a4c6a9fa0 100644
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -27,6 +27,9 @@
*
* device - id of a device on the server, a required option. PCI devices
* alone are supported presently.
+ *
+ * notes - x-vfio-user-server could block IO and monitor during the
+ * initialization phase.
*/
#include "qemu/osdep.h"
@@ -40,11 +43,14 @@
#include "hw/remote/machine.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-sockets.h"
+#include "qapi/qapi-events-misc.h"
#include "qemu/notify.h"
+#include "qemu/thread.h"
#include "sysemu/sysemu.h"
#include "libvfio-user.h"
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
+#include "qemu/timer.h"
#define TYPE_VFU_OBJECT "x-vfio-user-server"
OBJECT_DECLARE_TYPE(VfuObject, VfuObjectClass, VFU_OBJECT)
@@ -86,6 +92,8 @@ struct VfuObject {
PCIDevice *pci_dev;
Error *unplug_blocker;
+
+ int vfu_poll_fd;
};
static void vfu_object_init_ctx(VfuObject *o, Error **errp);
@@ -164,6 +172,76 @@ static void vfu_object_set_device(Object *obj, const char *str, Error **errp)
vfu_object_init_ctx(o, errp);
}
+static void vfu_object_ctx_run(void *opaque)
+{
+ VfuObject *o = opaque;
+ const char *vfu_id;
+ char *vfu_path, *pci_dev_path;
+ int ret = -1;
+
+ while (ret != 0) {
+ ret = vfu_run_ctx(o->vfu_ctx);
+ if (ret < 0) {
+ if (errno == EINTR) {
+ continue;
+ } else if (errno == ENOTCONN) {
+ vfu_id = object_get_canonical_path_component(OBJECT(o));
+ vfu_path = object_get_canonical_path(OBJECT(o));
+ g_assert(o->pci_dev);
+ pci_dev_path = object_get_canonical_path(OBJECT(o->pci_dev));
+ qapi_event_send_vfu_client_hangup(vfu_id, vfu_path,
+ o->device, pci_dev_path);
+ qemu_set_fd_handler(o->vfu_poll_fd, NULL, NULL, NULL);
+ o->vfu_poll_fd = -1;
+ object_unparent(OBJECT(o));
+ g_free(vfu_path);
+ g_free(pci_dev_path);
+ break;
+ } else {
+ VFU_OBJECT_ERROR(o, "vfu: Failed to run device %s - %s",
+ o->device, strerror(errno));
+ break;
+ }
+ }
+ }
+}
+
+static void vfu_object_attach_ctx(void *opaque)
+{
+ VfuObject *o = opaque;
+ GPollFD pfds[1];
+ int ret;
+
+ qemu_set_fd_handler(o->vfu_poll_fd, NULL, NULL, NULL);
+
+ pfds[0].fd = o->vfu_poll_fd;
+ pfds[0].events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+
+retry_attach:
+ ret = vfu_attach_ctx(o->vfu_ctx);
+ if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
+ /**
+ * vfu_object_attach_ctx can block QEMU's main loop
+ * during attach - the monitor and other IO
+ * could be unresponsive during this time.
+ */
+ (void)qemu_poll_ns(pfds, 1, 500 * (int64_t)SCALE_MS);
+ goto retry_attach;
+ } else if (ret < 0) {
+ VFU_OBJECT_ERROR(o, "vfu: Failed to attach device %s to context - %s",
+ o->device, strerror(errno));
+ return;
+ }
+
+ o->vfu_poll_fd = vfu_get_poll_fd(o->vfu_ctx);
+ if (o->vfu_poll_fd < 0) {
+ VFU_OBJECT_ERROR(o, "vfu: Failed to get poll fd %s", o->device);
+ return;
+ }
+
+ qemu_set_fd_handler(o->vfu_poll_fd, vfu_object_ctx_run, NULL, o);
+}
+
/*
* TYPE_VFU_OBJECT depends on the availability of the 'socket' and 'device'
* properties. It also depends on devices instantiated in QEMU. These
@@ -202,7 +280,8 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
return;
}
- o->vfu_ctx = vfu_create_ctx(VFU_TRANS_SOCK, o->socket->u.q_unix.path, 0,
+ o->vfu_ctx = vfu_create_ctx(VFU_TRANS_SOCK, o->socket->u.q_unix.path,
+ LIBVFIO_USER_FLAG_ATTACH_NB,
o, VFU_DEV_TYPE_PCI);
if (o->vfu_ctx == NULL) {
error_setg(errp, "vfu: Failed to create context - %s", strerror(errno));
@@ -241,6 +320,21 @@ static void vfu_object_init_ctx(VfuObject *o, Error **errp)
TYPE_VFU_OBJECT, o->device);
qdev_add_unplug_blocker(DEVICE(o->pci_dev), o->unplug_blocker);
+ ret = vfu_realize_ctx(o->vfu_ctx);
+ if (ret < 0) {
+ error_setg(errp, "vfu: Failed to realize device %s- %s",
+ o->device, strerror(errno));
+ goto fail;
+ }
+
+ o->vfu_poll_fd = vfu_get_poll_fd(o->vfu_ctx);
+ if (o->vfu_poll_fd < 0) {
+ error_setg(errp, "vfu: Failed to get poll fd %s", o->device);
+ goto fail;
+ }
+
+ qemu_set_fd_handler(o->vfu_poll_fd, vfu_object_attach_ctx, NULL, o);
+
return;
fail:
@@ -275,6 +369,7 @@ static void vfu_object_init(Object *obj)
qemu_add_machine_init_done_notifier(&o->machine_done);
}
+ o->vfu_poll_fd = -1;
}
static void vfu_object_finalize(Object *obj)
@@ -288,6 +383,11 @@ static void vfu_object_finalize(Object *obj)
o->socket = NULL;
+ if (o->vfu_poll_fd != -1) {
+ qemu_set_fd_handler(o->vfu_poll_fd, NULL, NULL, NULL);
+ o->vfu_poll_fd = -1;
+ }
+
if (o->vfu_ctx) {
vfu_destroy_ctx(o->vfu_ctx);
o->vfu_ctx = NULL;
--
2.20.1
next prev parent reply other threads:[~2022-05-03 14:22 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 14:16 [PATCH v9 00/17] vfio-user server in QEMU Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 01/17] tests/avocado: Specify target VM argument to helper routines Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 02/17] qdev: unplug blocker for devices Jagannathan Raman
2022-05-04 11:13 ` Markus Armbruster
2022-05-04 14:00 ` Jag Raman
2022-05-03 14:16 ` [PATCH v9 03/17] remote/machine: add HotplugHandler for remote machine Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 04/17] remote/machine: add vfio-user property Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 05/17] configure: require cmake 3.19 or newer Jagannathan Raman
2022-05-05 15:31 ` Stefan Hajnoczi
2022-05-03 14:16 ` [PATCH v9 06/17] vfio-user: build library Jagannathan Raman
2022-05-05 15:39 ` Stefan Hajnoczi
2022-05-05 15:41 ` Daniel P. Berrangé
2022-05-05 16:17 ` Peter Maydell
2022-05-10 13:22 ` Daniel P. Berrangé
2022-05-10 16:19 ` Jag Raman
2022-05-03 14:16 ` [PATCH v9 07/17] vfio-user: define vfio-user-server object Jagannathan Raman
2022-05-04 11:45 ` Markus Armbruster
2022-05-04 15:24 ` Jag Raman
2022-05-05 5:52 ` Markus Armbruster
2022-05-05 15:14 ` Stefan Hajnoczi
2022-05-05 15:22 ` Markus Armbruster
2022-05-05 15:37 ` Jag Raman
2022-05-05 15:41 ` Stefan Hajnoczi
2022-05-03 14:16 ` [PATCH v9 08/17] vfio-user: instantiate vfio-user context Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 09/17] vfio-user: find and init PCI device Jagannathan Raman
2022-05-03 14:16 ` Jagannathan Raman [this message]
2022-05-04 11:42 ` [PATCH v9 10/17] vfio-user: run vfio-user context Markus Armbruster
2022-05-04 15:22 ` Jag Raman
2022-05-05 7:44 ` Markus Armbruster
2022-05-05 13:39 ` Jag Raman
2022-05-05 14:42 ` Markus Armbruster
2022-05-05 15:36 ` Jag Raman
2022-05-06 5:44 ` Markus Armbruster
2022-05-07 18:48 ` Jag Raman
2022-05-03 14:16 ` [PATCH v9 11/17] vfio-user: handle PCI config space accesses Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 12/17] vfio-user: IOMMU support for remote device Jagannathan Raman
2022-05-05 16:12 ` Stefan Hajnoczi
2022-05-03 14:16 ` [PATCH v9 13/17] vfio-user: handle DMA mappings Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 14/17] vfio-user: handle PCI BAR accesses Jagannathan Raman
2022-05-05 15:43 ` Stefan Hajnoczi
2022-05-03 14:16 ` [PATCH v9 15/17] vfio-user: handle device interrupts Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 16/17] vfio-user: handle reset of remote device Jagannathan Raman
2022-05-03 14:16 ` [PATCH v9 17/17] vfio-user: avocado tests for vfio-user Jagannathan Raman
2022-05-05 16:04 ` Stefan Hajnoczi
2022-05-05 17:33 ` Jag Raman
2022-05-04 11:37 ` [PATCH v9 00/17] vfio-user server in QEMU Markus Armbruster
2022-05-04 14:26 ` Jag Raman
2022-05-04 15:03 ` Markus Armbruster
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=7350f4813b73af783965b758ecf39d0a6a76db53.1651586203.git.jag.raman@oracle.com \
--to=jag.raman@oracle.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=elena.ufimtseva@oracle.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=john.g.johnson@oracle.com \
--cc=john.levon@nutanix.com \
--cc=kanth.ghatraju@oracle.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=thanos.makatos@nutanix.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).