cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 6f413d8b76ff38e5bc01f36515ca71d7fd6e6144 Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:00:58 +0100
902636
Subject: [PATCH 027/116] virtiofsd: Add main virtio loop
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-24-dgilbert@redhat.com>
902636
Patchwork-id: 93475
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 023/112] virtiofsd: Add main virtio loop
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
Processes incoming requests on the vhost-user fd.
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 204d8ae57b3c57098642c79b3c03d42495149c09)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/fuse_virtio.c | 42 +++++++++++++++++++++++++++++++++++++++---
902636
 1 file changed, 39 insertions(+), 3 deletions(-)
902636
902636
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
902636
index 2ae3c76..1928a20 100644
902636
--- a/tools/virtiofsd/fuse_virtio.c
902636
+++ b/tools/virtiofsd/fuse_virtio.c
902636
@@ -11,12 +11,14 @@
902636
  * See the file COPYING.LIB
902636
  */
902636
 
902636
+#include "fuse_virtio.h"
902636
 #include "fuse_i.h"
902636
 #include "standard-headers/linux/fuse.h"
902636
 #include "fuse_misc.h"
902636
 #include "fuse_opt.h"
902636
-#include "fuse_virtio.h"
902636
 
902636
+#include <assert.h>
902636
+#include <errno.h>
902636
 #include <stdint.h>
902636
 #include <stdio.h>
902636
 #include <stdlib.h>
902636
@@ -80,15 +82,49 @@ static const VuDevIface fv_iface = {
902636
     .queue_is_processed_in_order = fv_queue_order,
902636
 };
902636
 
902636
+/*
902636
+ * Main loop; this mostly deals with events on the vhost-user
902636
+ * socket itself, and not actual fuse data.
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
+    while (!fuse_session_exited(se)) {
902636
+        struct pollfd pf[1];
902636
+        pf[0].fd = se->vu_socketfd;
902636
+        pf[0].events = POLLIN;
902636
+        pf[0].revents = 0;
902636
+
902636
+        fuse_log(FUSE_LOG_DEBUG, "%s: Waiting for VU event\n", __func__);
902636
+        int poll_res = ppoll(pf, 1, NULL, NULL);
902636
+
902636
+        if (poll_res == -1) {
902636
+            if (errno == EINTR) {
902636
+                fuse_log(FUSE_LOG_INFO, "%s: ppoll interrupted, going around\n",
902636
+                         __func__);
902636
+                continue;
902636
+            }
902636
+            fuse_log(FUSE_LOG_ERR, "virtio_loop ppoll: %m\n");
902636
+            break;
902636
+        }
902636
+        assert(poll_res == 1);
902636
+        if (pf[0].revents & (POLLERR | POLLHUP | POLLNVAL)) {
902636
+            fuse_log(FUSE_LOG_ERR, "%s: Unexpected poll revents %x\n", __func__,
902636
+                     pf[0].revents);
902636
+            break;
902636
+        }
902636
+        assert(pf[0].revents & POLLIN);
902636
+        fuse_log(FUSE_LOG_DEBUG, "%s: Got VU event\n", __func__);
902636
+        if (!vu_dispatch(&se->virtio_dev->dev)) {
902636
+            fuse_log(FUSE_LOG_ERR, "%s: vu_dispatch failed\n", __func__);
902636
+            break;
902636
+        }
902636
     }
902636
 
902636
     fuse_log(FUSE_LOG_INFO, "%s: Exit\n", __func__);
902636
+
902636
+    return 0;
902636
 }
902636
 
902636
 int virtio_session_mount(struct fuse_session *se)
902636
-- 
902636
1.8.3.1
902636