[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 021/104] virtiofsd: Poll kick_fd for queue
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH 021/104] virtiofsd: Poll kick_fd for queue |
Date: |
Thu, 12 Dec 2019 16:37:41 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
In the queue thread poll the kick_fd we're passed.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
tools/virtiofsd/fuse_virtio.c | 40 ++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 94f9db76df..7118def1eb 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/eventfd.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
@@ -100,13 +101,50 @@ static void fv_panic(VuDev *dev, const char *err)
exit(EXIT_FAILURE);
}
+/* Thread function for individual queues, created when a queue is 'started' */
static void *fv_queue_thread(void *opaque)
{
struct fv_QueueInfo *qi = opaque;
fuse_log(FUSE_LOG_INFO, "%s: Start for queue %d kick_fd %d\n", __func__,
qi->qidx, qi->kick_fd);
while (1) {
- /* TODO */
+ struct pollfd pf[1];
+ pf[0].fd = qi->kick_fd;
+ pf[0].events = POLLIN;
+ pf[0].revents = 0;
+
+ fuse_log(FUSE_LOG_DEBUG, "%s: Waiting for Queue %d event\n", __func__,
+ qi->qidx);
+ int poll_res = ppoll(pf, 1, NULL, NULL);
+
+ if (poll_res == -1) {
+ if (errno == EINTR) {
+ fuse_log(FUSE_LOG_INFO, "%s: ppoll interrupted, going
around\n",
+ __func__);
+ continue;
+ }
+ fuse_log(FUSE_LOG_ERR, "fv_queue_thread ppoll: %m\n");
+ break;
+ }
+ assert(poll_res == 1);
+ if (pf[0].revents & (POLLERR | POLLHUP | POLLNVAL)) {
+ fuse_log(FUSE_LOG_ERR, "%s: Unexpected poll revents %x Queue %d\n",
+ __func__, pf[0].revents, qi->qidx);
+ break;
+ }
+ assert(pf[0].revents & POLLIN);
+ fuse_log(FUSE_LOG_DEBUG, "%s: Got queue event on Queue %d\n", __func__,
+ qi->qidx);
+
+ eventfd_t evalue;
+ if (eventfd_read(qi->kick_fd, &evalue)) {
+ fuse_log(FUSE_LOG_ERR, "Eventfd_read for queue: %m\n");
+ break;
+ }
+ if (qi->virtio_dev->se->debug) {
+ fprintf(stderr, "%s: Queue %d gave evalue: %zx\n", __func__,
+ qi->qidx, (size_t)evalue);
+ }
}
return NULL;
--
2.23.0
- [PATCH 013/104] virtiofsd: Make fsync work even if only inode is passed in, (continued)
- [PATCH 013/104] virtiofsd: Make fsync work even if only inode is passed in, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 014/104] virtiofsd: Add options for virtio, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 015/104] virtiofsd: add -o source=PATH to help output, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 017/104] virtiofsd: Start wiring up vhost-user, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 016/104] virtiofsd: Open vhost connection instead of mounting, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 010/104] virtiofsd: Fix fuse_daemonize ignored return values, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 001/104] virtiofsd: Pull in upstream headers, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 012/104] virtiofsd: Trim out compatibility code, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 019/104] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 018/104] virtiofsd: Add main virtio loop, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 021/104] virtiofsd: Poll kick_fd for queue,
Dr. David Alan Gilbert (git) <=
- [PATCH 020/104] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 007/104] virtiofsd: Format imported files to qemu style, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 025/104] virtiofsd: Add Makefile wiring for virtiofsd contrib, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 024/104] virtiofsd: Keep track of replies, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 026/104] virtiofsd: Fast path for virtio read, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 027/104] virtiofsd: add --fd=FDNUM fd passing option, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 022/104] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 023/104] virtiofsd: Send replies to messages, Dr. David Alan Gilbert (git), 2019/12/12