cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-virtiofsd-prevent-fv_queue_thread-vs-virtio_loop-rac.patch

902636
From 69c6a829f8136a8c95ccdf480f2fd0173d64b6ec Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:02:05 +0100
902636
Subject: [PATCH 094/116] virtiofsd: prevent fv_queue_thread() vs virtio_loop()
902636
 races
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-91-dgilbert@redhat.com>
902636
Patchwork-id: 93544
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 090/112] virtiofsd: prevent fv_queue_thread() vs virtio_loop() races
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: Stefan Hajnoczi <stefanha@redhat.com>
902636
902636
We call into libvhost-user from the virtqueue handler thread and the
902636
vhost-user message processing thread without a lock.  There is nothing
902636
protecting the virtqueue handler thread if the vhost-user message
902636
processing thread changes the virtqueue or memory table while it is
902636
running.
902636
902636
This patch introduces a read-write lock.  Virtqueue handler threads are
902636
readers.  The vhost-user message processing thread is a writer.  This
902636
will allow concurrency for multiqueue in the future while protecting
902636
against fv_queue_thread() vs virtio_loop() races.
902636
902636
Note that the critical sections could be made smaller but it would be
902636
more invasive and require libvhost-user changes.  Let's start simple and
902636
improve performance later, if necessary.  Another option would be an
902636
RCU-style approach with lighter-weight primitives.
902636
902636
Signed-off-by: Stefan Hajnoczi <stefanha@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 e7b337326d594b71b07cd6dbb332c49c122c80a4)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/fuse_virtio.c | 34 +++++++++++++++++++++++++++++++++-
902636
 1 file changed, 33 insertions(+), 1 deletion(-)
902636
902636
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
902636
index fb8d6d1..f6242f9 100644
902636
--- a/tools/virtiofsd/fuse_virtio.c
902636
+++ b/tools/virtiofsd/fuse_virtio.c
902636
@@ -59,6 +59,18 @@ struct fv_VuDev {
902636
     struct fuse_session *se;
902636
 
902636
     /*
902636
+     * Either handle virtqueues or vhost-user protocol messages.  Don't do
902636
+     * both at the same time since that could lead to race conditions if
902636
+     * virtqueues or memory tables change while another thread is accessing
902636
+     * them.
902636
+     *
902636
+     * The assumptions are:
902636
+     * 1. fv_queue_thread() reads/writes to virtqueues and only reads VuDev.
902636
+     * 2. virtio_loop() reads/writes virtqueues and VuDev.
902636
+     */
902636
+    pthread_rwlock_t vu_dispatch_rwlock;
902636
+
902636
+    /*
902636
      * The following pair of fields are only accessed in the main
902636
      * virtio_loop
902636
      */
902636
@@ -415,6 +427,8 @@ static void *fv_queue_thread(void *opaque)
902636
              qi->qidx, qi->kick_fd);
902636
     while (1) {
902636
         struct pollfd pf[2];
902636
+        int ret;
902636
+
902636
         pf[0].fd = qi->kick_fd;
902636
         pf[0].events = POLLIN;
902636
         pf[0].revents = 0;
902636
@@ -461,6 +475,9 @@ static void *fv_queue_thread(void *opaque)
902636
             fuse_log(FUSE_LOG_ERR, "Eventfd_read for queue: %m\n");
902636
             break;
902636
         }
902636
+        /* Mutual exclusion with virtio_loop() */
902636
+        ret = pthread_rwlock_rdlock(&qi->virtio_dev->vu_dispatch_rwlock);
902636
+        assert(ret == 0); /* there is no possible error case */
902636
         /* out is from guest, in is too guest */
902636
         unsigned int in_bytes, out_bytes;
902636
         vu_queue_get_avail_bytes(dev, q, &in_bytes, &out_bytes, ~0, ~0);
902636
@@ -469,6 +486,7 @@ static void *fv_queue_thread(void *opaque)
902636
                  "%s: Queue %d gave evalue: %zx available: in: %u out: %u\n",
902636
                  __func__, qi->qidx, (size_t)evalue, in_bytes, out_bytes);
902636
 
902636
+
902636
         while (1) {
902636
             bool allocated_bufv = false;
902636
             struct fuse_bufvec bufv;
902636
@@ -597,6 +615,8 @@ static void *fv_queue_thread(void *opaque)
902636
             free(elem);
902636
             elem = NULL;
902636
         }
902636
+
902636
+        pthread_rwlock_unlock(&qi->virtio_dev->vu_dispatch_rwlock);
902636
     }
902636
 out:
902636
     pthread_mutex_destroy(&ch.lock);
902636
@@ -711,6 +731,8 @@ int virtio_loop(struct fuse_session *se)
902636
 
902636
     while (!fuse_session_exited(se)) {
902636
         struct pollfd pf[1];
902636
+        bool ok;
902636
+        int ret;
902636
         pf[0].fd = se->vu_socketfd;
902636
         pf[0].events = POLLIN;
902636
         pf[0].revents = 0;
902636
@@ -735,7 +757,15 @@ int virtio_loop(struct fuse_session *se)
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
+        /* Mutual exclusion with fv_queue_thread() */
902636
+        ret = pthread_rwlock_wrlock(&se->virtio_dev->vu_dispatch_rwlock);
902636
+        assert(ret == 0); /* there is no possible error case */
902636
+
902636
+        ok = vu_dispatch(&se->virtio_dev->dev);
902636
+
902636
+        pthread_rwlock_unlock(&se->virtio_dev->vu_dispatch_rwlock);
902636
+
902636
+        if (!ok) {
902636
             fuse_log(FUSE_LOG_ERR, "%s: vu_dispatch failed\n", __func__);
902636
             break;
902636
         }
902636
@@ -877,6 +907,7 @@ int virtio_session_mount(struct fuse_session *se)
902636
 
902636
     se->vu_socketfd = data_sock;
902636
     se->virtio_dev->se = se;
902636
+    pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL);
902636
     vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, fv_set_watch,
902636
             fv_remove_watch, &fv_iface);
902636
 
902636
@@ -892,6 +923,7 @@ void virtio_session_close(struct fuse_session *se)
902636
     }
902636
 
902636
     free(se->virtio_dev->qi);
902636
+    pthread_rwlock_destroy(&se->virtio_dev->vu_dispatch_rwlock);
902636
     free(se->virtio_dev);
902636
     se->virtio_dev = NULL;
902636
 }
902636
-- 
902636
1.8.3.1
902636