yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 020f593031b0b54e4c35faffea489b700aed6a72 Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:00:57 +0100
902636
Subject: [PATCH 026/116] virtiofsd: Start wiring up vhost-user
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200127190227.40942-23-dgilbert@redhat.com>
902636
Patchwork-id: 93477
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 022/112] virtiofsd: Start wiring up vhost-user
902636
Bugzilla: 1694164
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
902636
Listen on our unix socket for the connection from QEMU, when we get it
902636
initialise vhost-user and dive into our own loop variant (currently
902636
dummy).
902636
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit f6f3573c6f271af5ded63ce28589a113f7205c72)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/fuse_i.h         |  4 ++
902636
 tools/virtiofsd/fuse_lowlevel.c  |  5 +++
902636
 tools/virtiofsd/fuse_lowlevel.h  |  7 ++++
902636
 tools/virtiofsd/fuse_virtio.c    | 87 +++++++++++++++++++++++++++++++++++++++-
902636
 tools/virtiofsd/fuse_virtio.h    |  2 +
902636
 tools/virtiofsd/passthrough_ll.c |  7 +---
902636
 6 files changed, 106 insertions(+), 6 deletions(-)
902636
902636
diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h
902636
index 82d6ac7..ec04449 100644
902636
--- a/tools/virtiofsd/fuse_i.h
902636
+++ b/tools/virtiofsd/fuse_i.h
902636
@@ -13,6 +13,8 @@
902636
 #include "fuse.h"
902636
 #include "fuse_lowlevel.h"
902636
 
902636
+struct fv_VuDev;
902636
+
902636
 struct fuse_req {
902636
     struct fuse_session *se;
902636
     uint64_t unique;
902636
@@ -65,6 +67,8 @@ struct fuse_session {
902636
     size_t bufsize;
902636
     int error;
902636
     char *vu_socket_path;
902636
+    int   vu_socketfd;
902636
+    struct fv_VuDev *virtio_dev;
902636
 };
902636
 
902636
 struct fuse_chan {
902636
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
902636
index 5df124e..af09fa2 100644
902636
--- a/tools/virtiofsd/fuse_lowlevel.c
902636
+++ b/tools/virtiofsd/fuse_lowlevel.c
902636
@@ -2242,6 +2242,11 @@ void fuse_session_unmount(struct fuse_session *se)
902636
 {
902636
 }
902636
 
902636
+int fuse_lowlevel_is_virtio(struct fuse_session *se)
902636
+{
902636
+    return se->vu_socket_path != NULL;
902636
+}
902636
+
902636
 #ifdef linux
902636
 int fuse_req_getgroups(fuse_req_t req, int size, gid_t list[])
902636
 {
902636
diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h
902636
index 2fa225d..f6b3470 100644
902636
--- a/tools/virtiofsd/fuse_lowlevel.h
902636
+++ b/tools/virtiofsd/fuse_lowlevel.h
902636
@@ -1755,6 +1755,13 @@ void fuse_req_interrupt_func(fuse_req_t req, fuse_interrupt_func_t func,
902636
  */
902636
 int fuse_req_interrupted(fuse_req_t req);
902636
 
902636
+/**
902636
+ * Check if the session is connected via virtio
902636
+ *
902636
+ * @param se session object
902636
+ * @return 1 if the session is a virtio session
902636
+ */
902636
+int fuse_lowlevel_is_virtio(struct fuse_session *se);
902636
 
902636
 /*
902636
  * Inquiry functions
902636
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
902636
index cbef6ff..2ae3c76 100644
902636
--- a/tools/virtiofsd/fuse_virtio.c
902636
+++ b/tools/virtiofsd/fuse_virtio.c
902636
@@ -19,18 +19,78 @@
902636
 
902636
 #include <stdint.h>
902636
 #include <stdio.h>
902636
+#include <stdlib.h>
902636
 #include <string.h>
902636
 #include <sys/socket.h>
902636
 #include <sys/types.h>
902636
 #include <sys/un.h>
902636
 #include <unistd.h>
902636
 
902636
+#include "contrib/libvhost-user/libvhost-user.h"
902636
+
902636
+/*
902636
+ * We pass the dev element into libvhost-user
902636
+ * and then use it to get back to the outer
902636
+ * container for other data.
902636
+ */
902636
+struct fv_VuDev {
902636
+    VuDev dev;
902636
+    struct fuse_session *se;
902636
+};
902636
+
902636
 /* From spec */
902636
 struct virtio_fs_config {
902636
     char tag[36];
902636
     uint32_t num_queues;
902636
 };
902636
 
902636
+/*
902636
+ * Callback from libvhost-user if there's a new fd we're supposed to listen
902636
+ * to, typically a queue kick?
902636
+ */
902636
+static void fv_set_watch(VuDev *dev, int fd, int condition, vu_watch_cb cb,
902636
+                         void *data)
902636
+{
902636
+    fuse_log(FUSE_LOG_WARNING, "%s: TODO! fd=%d\n", __func__, fd);
902636
+}
902636
+
902636
+/*
902636
+ * Callback from libvhost-user if we're no longer supposed to listen on an fd
902636
+ */
902636
+static void fv_remove_watch(VuDev *dev, int fd)
902636
+{
902636
+    fuse_log(FUSE_LOG_WARNING, "%s: TODO! fd=%d\n", __func__, fd);
902636
+}
902636
+
902636
+/* Callback from libvhost-user to panic */
902636
+static void fv_panic(VuDev *dev, const char *err)
902636
+{
902636
+    fuse_log(FUSE_LOG_ERR, "%s: libvhost-user: %s\n", __func__, err);
902636
+    /* TODO: Allow reconnects?? */
902636
+    exit(EXIT_FAILURE);
902636
+}
902636
+
902636
+static bool fv_queue_order(VuDev *dev, int qidx)
902636
+{
902636
+    return false;
902636
+}
902636
+
902636
+static const VuDevIface fv_iface = {
902636
+    /* TODO: Add other callbacks */
902636
+    .queue_is_processed_in_order = fv_queue_order,
902636
+};
902636
+
902636
+int virtio_loop(struct fuse_session *se)
902636
+{
902636
+    fuse_log(FUSE_LOG_INFO, "%s: Entry\n", __func__);
902636
+
902636
+    while (1) {
902636
+        /* TODO: Add stuffing */
902636
+    }
902636
+
902636
+    fuse_log(FUSE_LOG_INFO, "%s: Exit\n", __func__);
902636
+}
902636
+
902636
 int virtio_session_mount(struct fuse_session *se)
902636
 {
902636
     struct sockaddr_un un;
902636
@@ -75,5 +135,30 @@ int virtio_session_mount(struct fuse_session *se)
902636
         return -1;
902636
     }
902636
 
902636
-    return -1;
902636
+    fuse_log(FUSE_LOG_INFO, "%s: Waiting for vhost-user socket connection...\n",
902636
+             __func__);
902636
+    int data_sock = accept(listen_sock, NULL, NULL);
902636
+    if (data_sock == -1) {
902636
+        fuse_log(FUSE_LOG_ERR, "vhost socket accept: %m\n");
902636
+        close(listen_sock);
902636
+        return -1;
902636
+    }
902636
+    close(listen_sock);
902636
+    fuse_log(FUSE_LOG_INFO, "%s: Received vhost-user socket connection\n",
902636
+             __func__);
902636
+
902636
+    /* TODO: Some cleanup/deallocation! */
902636
+    se->virtio_dev = calloc(sizeof(struct fv_VuDev), 1);
902636
+    if (!se->virtio_dev) {
902636
+        fuse_log(FUSE_LOG_ERR, "%s: virtio_dev calloc failed\n", __func__);
902636
+        close(data_sock);
902636
+        return -1;
902636
+    }
902636
+
902636
+    se->vu_socketfd = data_sock;
902636
+    se->virtio_dev->se = se;
902636
+    vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, fv_set_watch,
902636
+            fv_remove_watch, &fv_iface);
902636
+
902636
+    return 0;
902636
 }
902636
diff --git a/tools/virtiofsd/fuse_virtio.h b/tools/virtiofsd/fuse_virtio.h
902636
index 8f2edb6..23026d6 100644
902636
--- a/tools/virtiofsd/fuse_virtio.h
902636
+++ b/tools/virtiofsd/fuse_virtio.h
902636
@@ -20,4 +20,6 @@ struct fuse_session;
902636
 
902636
 int virtio_session_mount(struct fuse_session *se);
902636
 
902636
+int virtio_loop(struct fuse_session *se);
902636
+
902636
 #endif
902636
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
902636
index fc9b264..037c5d7 100644
902636
--- a/tools/virtiofsd/passthrough_ll.c
902636
+++ b/tools/virtiofsd/passthrough_ll.c
902636
@@ -36,6 +36,7 @@
902636
  */
902636
 
902636
 #include "qemu/osdep.h"
902636
+#include "fuse_virtio.h"
902636
 #include "fuse_lowlevel.h"
902636
 #include <assert.h>
902636
 #include <dirent.h>
902636
@@ -1395,11 +1396,7 @@ int main(int argc, char *argv[])
902636
     fuse_daemonize(opts.foreground);
902636
 
902636
     /* Block until ctrl+c or fusermount -u */
902636
-    if (opts.singlethread) {
902636
-        ret = fuse_session_loop(se);
902636
-    } else {
902636
-        ret = fuse_session_loop_mt(se, opts.clone_fd);
902636
-    }
902636
+    ret = virtio_loop(se);
902636
 
902636
     fuse_session_unmount(se);
902636
 err_out3:
902636
-- 
902636
1.8.3.1
902636