mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtiofsd: Keep track of replies

Browse Source 
Keep track of whether we sent a reply to a request; this is a bit
paranoid but it means:
  a) We should always recycle an element even if there was an error
     in the request
  b) Never try and send two replies on one queue element

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2018-06-21 10:38:03 +01:00
parent df57ba919e
commit 2f65e69a7f
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/virtiofsd/fuse_virtio.c
View File

@ -44,6 +44,7 @@ struct fv_QueueInfo {
/* The element for the command currently being processed */ /* The element for the command currently being processed */
VuVirtqElement *qe; VuVirtqElement *qe;
bool reply_sent;
}; };
/* /*
@ -178,6 +179,7 @@ int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch,
{ {
VuVirtqElement *elem; VuVirtqElement *elem;
VuVirtq *q; VuVirtq *q;
int ret = 0;
assert(count >= 1); assert(count >= 1);
assert(iov[0].iov_len >= sizeof(struct fuse_out_header)); assert(iov[0].iov_len >= sizeof(struct fuse_out_header));
@ -191,6 +193,7 @@ int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch,
assert(out->unique); assert(out->unique);
/* For virtio we always have ch */ /* For virtio we always have ch */
assert(ch); assert(ch);
assert(!ch->qi->reply_sent);
elem = ch->qi->qe; elem = ch->qi->qe;
q = &ch->qi->virtio_dev->dev.vq[ch->qi->qidx]; q = &ch->qi->virtio_dev->dev.vq[ch->qi->qidx];
@ -208,19 +211,23 @@ int virtio_send_msg(struct fuse_session *se, struct fuse_chan *ch,
if (in_len < sizeof(struct fuse_out_header)) { if (in_len < sizeof(struct fuse_out_header)) {
fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n", fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n",
__func__, elem->index); __func__, elem->index);
return -E2BIG; ret = -E2BIG;
goto err;
} }
if (in_len < tosend_len) { if (in_len < tosend_len) {
fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len %zd\n", fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len %zd\n",
__func__, elem->index, tosend_len); __func__, elem->index, tosend_len);
return -E2BIG; ret = -E2BIG;
goto err;
} }
copy_iov(iov, count, in_sg, in_num, tosend_len); copy_iov(iov, count, in_sg, in_num, tosend_len);
vu_queue_push(&se->virtio_dev->dev, q, elem, tosend_len); vu_queue_push(&se->virtio_dev->dev, q, elem, tosend_len);
vu_queue_notify(&se->virtio_dev->dev, q); vu_queue_notify(&se->virtio_dev->dev, q);
ch->qi->reply_sent = true;
return 0; err:
return ret;
} }
/* Thread function for individual queues, created when a queue is 'started' */ /* Thread function for individual queues, created when a queue is 'started' */
@ -296,6 +303,9 @@ static void *fv_queue_thread(void *opaque)
break; break;
} }
qi->qe = elem;
qi->reply_sent = false;
if (!fbuf.mem) { if (!fbuf.mem) {
fbuf.mem = malloc(se->bufsize); fbuf.mem = malloc(se->bufsize);
assert(fbuf.mem); assert(fbuf.mem);
@ -331,6 +341,13 @@ static void *fv_queue_thread(void *opaque)
/* TODO: Add checks for fuse_session_exited */ /* TODO: Add checks for fuse_session_exited */
fuse_session_process_buf_int(se, &fbuf, &ch); fuse_session_process_buf_int(se, &fbuf, &ch);
if (!qi->reply_sent) {
fuse_log(FUSE_LOG_DEBUG, "%s: elem %d no reply sent\n",
__func__, elem->index);
/* I think we've still got to recycle the element */
vu_queue_push(dev, q, elem, 0);
vu_queue_notify(dev, q);
}
qi->qe = NULL; qi->qe = NULL;
free(elem); free(elem);
elem = NULL; elem = NULL;