yeahuh / rpms / qemu-kvm

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