|
|
902636 |
From bb1f691dc410ce11ac9675ced70e78a3ce2511b0 Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
902636 |
Date: Mon, 27 Jan 2020 19:01:03 +0100
|
|
|
902636 |
Subject: [PATCH 032/116] virtiofsd: Send replies to messages
|
|
|
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-29-dgilbert@redhat.com>
|
|
|
902636 |
Patchwork-id: 93485
|
|
|
902636 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 028/112] virtiofsd: Send replies to messages
|
|
|
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 |
Route fuse out messages back through the same queue elements
|
|
|
902636 |
that had the command that triggered the request.
|
|
|
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 df57ba919ec3edef9cc208d35685095e6e92713e)
|
|
|
902636 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
tools/virtiofsd/fuse_lowlevel.c | 4 ++
|
|
|
902636 |
tools/virtiofsd/fuse_virtio.c | 107 ++++++++++++++++++++++++++++++++++++++
|
|
|
902636 |
tools/virtiofsd/fuse_virtio.h | 4 ++
|
|
|
902636 |
3 files changed, 111 insertions(+), 4 deletions(-)
|
|
|
902636 |
|
|
|
902636 |
diff
|
|
|
902636 |
index af09fa2..380d93b 100644
|
|
|
902636 |
|
|
|
902636 |
|
|
|
902636 |
@@ -171,6 +171,10 @@ static int fuse_send_msg(struct fuse_session *se, struct fuse_chan *ch,
|
|
|
902636 |
}
|
|
|
902636 |
}
|
|
|
902636 |
|
|
|
902636 |
+ if (fuse_lowlevel_is_virtio(se)) {
|
|
|
902636 |
+ return virtio_send_msg(se, ch, iov, count);
|
|
|
902636 |
+ }
|
|
|
902636 |
+
|
|
|
902636 |
abort();
|
|
|
902636 |
return 0;
|
|
|
902636 |
}
|
|
|
902636 |
diff
|
|
|
902636 |
index 3841b20..05d0e29 100644
|
|
|
902636 |
|
|
|
902636 |
|
|
|
902636 |
@@ -41,6 +41,9 @@ struct fv_QueueInfo {
|
|
|
902636 |
|
|
|
902636 |
int qidx;
|
|
|
902636 |
int kick_fd;
|
|
|
902636 |
+
|
|
|
902636 |
+ /* The element for the command currently being processed */
|
|
|
902636 |
+ VuVirtqElement *qe;
|
|
|
902636 |
};
|
|
|
902636 |
|
|
|
902636 |
/*
|
|
|
902636 |
@@ -121,6 +124,105 @@ static void copy_from_iov(struct fuse_buf *buf, size_t out_num,
|
|
|
902636 |
}
|
|
|
902636 |
}
|
|
|
902636 |
|
|
|
902636 |
+/*
|
|
|
902636 |
+ * Copy from one iov to another, the given number of bytes
|
|
|
902636 |
+ * The caller must have checked sizes.
|
|
|
902636 |
+ */
|
|
|
902636 |
+static void copy_iov(struct iovec *src_iov, int src_count,
|
|
|
902636 |
+ struct iovec *dst_iov, int dst_count, size_t to_copy)
|
|
|
902636 |
+{
|
|
|
902636 |
+ size_t dst_offset = 0;
|
|
|
902636 |
+ /* Outer loop copies 'src' elements */
|
|
|
902636 |
+ while (to_copy) {
|
|
|
902636 |
+ assert(src_count);
|
|
|
902636 |
+ size_t src_len = src_iov[0].iov_len;
|
|
|
902636 |
+ size_t src_offset = 0;
|
|
|
902636 |
+
|
|
|
902636 |
+ if (src_len > to_copy) {
|
|
|
902636 |
+ src_len = to_copy;
|
|
|
902636 |
+ }
|
|
|
902636 |
+ /* Inner loop copies contents of one 'src' to maybe multiple dst. */
|
|
|
902636 |
+ while (src_len) {
|
|
|
902636 |
+ assert(dst_count);
|
|
|
902636 |
+ size_t dst_len = dst_iov[0].iov_len - dst_offset;
|
|
|
902636 |
+ if (dst_len > src_len) {
|
|
|
902636 |
+ dst_len = src_len;
|
|
|
902636 |
+ }
|
|
|
902636 |
+
|
|
|
902636 |
+ memcpy(dst_iov[0].iov_base + dst_offset,
|
|
|
902636 |
+ src_iov[0].iov_base + src_offset, dst_len);
|
|
|
902636 |
+ src_len -= dst_len;
|
|
|
902636 |
+ to_copy -= dst_len;
|
|
|
902636 |
+ src_offset += dst_len;
|
|
|
902636 |
+ dst_offset += dst_len;
|
|
|
902636 |
+
|
|
|
902636 |
+ assert(dst_offset <= dst_iov[0].iov_len);
|
|
|
902636 |
+ if (dst_offset == dst_iov[0].iov_len) {
|
|
|
902636 |
+ dst_offset = 0;
|
|
|
902636 |
+ dst_iov++;
|
|
|
902636 |
+ dst_count
|
|
|
902636 |
+ }
|
|
|
902636 |
+ }
|
|
|
902636 |
+ src_iov++;
|
|
|
902636 |
+ src_count
|
|
|
902636 |
+ }
|
|
|
902636 |
+}
|
|
|
902636 |
+
|
|
|
902636 |
+/*
|
|
|
902636 |
+ * Called back by ll whenever it wants to send a reply/message back
|
|
|
902636 |
+ * The 1st element of the iov starts with the fuse_out_header
|
|
|
902636 |
+ * 'unique'==0 means it's a notify message.
|
|
|
902636 |
+ */
|
|
|
902636 |
+int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch,
|
|
|
902636 |
+ struct iovec *iov, int count)
|
|
|
902636 |
+{
|
|
|
902636 |
+ VuVirtqElement *elem;
|
|
|
902636 |
+ VuVirtq *q;
|
|
|
902636 |
+
|
|
|
902636 |
+ assert(count >= 1);
|
|
|
902636 |
+ assert(iov[0].iov_len >= sizeof(struct fuse_out_header));
|
|
|
902636 |
+
|
|
|
902636 |
+ struct fuse_out_header *out = iov[0].iov_base;
|
|
|
902636 |
+ /* TODO: Endianness! */
|
|
|
902636 |
+
|
|
|
902636 |
+ size_t tosend_len = iov_size(iov, count);
|
|
|
902636 |
+
|
|
|
902636 |
+
|
|
|
902636 |
+ assert(out->unique);
|
|
|
902636 |
+ /* For virtio we always have ch */
|
|
|
902636 |
+ assert(ch);
|
|
|
902636 |
+ elem = ch->qi->qe;
|
|
|
902636 |
+ q = &ch->qi->virtio_dev->dev.vq[ch->qi->qidx];
|
|
|
902636 |
+
|
|
|
902636 |
+
|
|
|
902636 |
+ unsigned int in_num = elem->in_num;
|
|
|
902636 |
+ struct iovec *in_sg = elem->in_sg;
|
|
|
902636 |
+ size_t in_len = iov_size(in_sg, in_num);
|
|
|
902636 |
+ fuse_log(FUSE_LOG_DEBUG, "%s: elem %d: with %d in desc of length %zd\n",
|
|
|
902636 |
+ __func__, elem->index, in_num, in_len);
|
|
|
902636 |
+
|
|
|
902636 |
+ /*
|
|
|
902636 |
+ * The elem should have room for a 'fuse_out_header' (out from fuse)
|
|
|
902636 |
+ * plus the data based on the len in the header.
|
|
|
902636 |
+ */
|
|
|
902636 |
+ if (in_len < sizeof(struct fuse_out_header)) {
|
|
|
902636 |
+ fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n",
|
|
|
902636 |
+ __func__, elem->index);
|
|
|
902636 |
+ return -E2BIG;
|
|
|
902636 |
+ }
|
|
|
902636 |
+ if (in_len < tosend_len) {
|
|
|
902636 |
+ fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len %zd\n",
|
|
|
902636 |
+ __func__, elem->index, tosend_len);
|
|
|
902636 |
+ return -E2BIG;
|
|
|
902636 |
+ }
|
|
|
902636 |
+
|
|
|
902636 |
+ copy_iov(iov, count, in_sg, in_num, tosend_len);
|
|
|
902636 |
+ vu_queue_push(&se->virtio_dev->dev, q, elem, tosend_len);
|
|
|
902636 |
+ vu_queue_notify(&se->virtio_dev->dev, q);
|
|
|
902636 |
+
|
|
|
902636 |
+ return 0;
|
|
|
902636 |
+}
|
|
|
902636 |
+
|
|
|
902636 |
/* Thread function for individual queues, created when a queue is 'started' */
|
|
|
902636 |
static void *fv_queue_thread(void *opaque)
|
|
|
902636 |
{
|
|
|
902636 |
@@ -226,13 +328,10 @@ static void *fv_queue_thread(void *opaque)
|
|
|
902636 |
|
|
|
902636 |
|
|
|
902636 |
|
|
|
902636 |
- /* TODO: Fixup fuse_send_msg */
|
|
|
902636 |
/* TODO: Add checks for fuse_session_exited */
|
|
|
902636 |
fuse_session_process_buf_int(se, &fbuf, &ch);
|
|
|
902636 |
|
|
|
902636 |
- /* TODO: vu_queue_push(dev, q, elem, qi->write_count); */
|
|
|
902636 |
- vu_queue_notify(dev, q);
|
|
|
902636 |
-
|
|
|
902636 |
+ qi->qe = NULL;
|
|
|
902636 |
free(elem);
|
|
|
902636 |
elem = NULL;
|
|
|
902636 |
}
|
|
|
902636 |
diff
|
|
|
902636 |
index 23026d6..135a148 100644
|
|
|
902636 |
|
|
|
902636 |
|
|
|
902636 |
@@ -22,4 +22,8 @@ int virtio_session_mount(struct fuse_session *se);
|
|
|
902636 |
|
|
|
902636 |
int virtio_loop(struct fuse_session *se);
|
|
|
902636 |
|
|
|
902636 |
+
|
|
|
902636 |
+int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch,
|
|
|
902636 |
+ struct iovec *iov, int count);
|
|
|
902636 |
+
|
|
|
902636 |
#endif
|
|
|
902636 |
--
|
|
|
902636 |
1.8.3.1
|
|
|
902636 |
|