1 files changed, 16 insertions, 21 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 027be91db139..969a85960e9f 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -15,7 +15,6 @@
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
-#include <linux/rcupdate.h>
 #include <linux/file.h>
 #include <linux/slab.h>
 
@@ -346,12 +345,11 @@ static void handle_tx(struct vhost_net *net)
         struct vhost_net_ubuf_ref *uninitialized_var(ubufs);
         bool zcopy, zcopy_used;
 
-        /* TODO: check that we are running from vhost_worker? */
-        sock = rcu_dereference_check(vq->private_data, 1);
+        mutex_lock(&vq->mutex);
+        sock = vq->private_data;
         if (!sock)
-                return;
+                goto out;
 
-        mutex_lock(&vq->mutex);
         vhost_disable_notify(&net->dev, vq);
 
         hdr_size = nvq->vhost_hlen;
@@ -461,7 +459,7 @@ static void handle_tx(struct vhost_net *net)
                         break;
                 }
         }
-
+out:
         mutex_unlock(&vq->mutex);
 }
 
@@ -570,14 +568,14 @@ static void handle_rx(struct vhost_net *net)
         s16 headcount;
         size_t vhost_hlen, sock_hlen;
         size_t vhost_len, sock_len;
-        /* TODO: check that we are running from vhost_worker? */
-        struct socket *sock = rcu_dereference_check(vq->private_data, 1);
-
-        if (!sock)
-                return;
+        struct socket *sock;
 
         mutex_lock(&vq->mutex);
+        sock = vq->private_data;
+        if (!sock)
+                goto out;
         vhost_disable_notify(&net->dev, vq);
+
         vhost_hlen = nvq->vhost_hlen;
         sock_hlen = nvq->sock_hlen;
 
@@ -652,7 +650,7 @@ static void handle_rx(struct vhost_net *net)
                         break;
                 }
         }
-
+out:
         mutex_unlock(&vq->mutex);
 }
 
@@ -750,8 +748,7 @@ static int vhost_net_enable_vq(struct vhost_net *n,
         struct vhost_poll *poll = n->poll + (nvq - n->vqs);
         struct socket *sock;
 
-        sock = rcu_dereference_protected(vq->private_data,
-                                         lockdep_is_held(&vq->mutex));
+        sock = vq->private_data;
         if (!sock)
                 return 0;
 
@@ -764,10 +761,9 @@ static struct socket *vhost_net_stop_vq(struct vhost_net *n,
         struct socket *sock;
 
         mutex_lock(&vq->mutex);
-        sock = rcu_dereference_protected(vq->private_data,
-                                         lockdep_is_held(&vq->mutex));
+        sock = vq->private_data;
         vhost_net_disable_vq(n, vq);
-        rcu_assign_pointer(vq->private_data, NULL);
+        vq->private_data = NULL;
         mutex_unlock(&vq->mutex);
         return sock;
 }
@@ -923,8 +919,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
         }
 
         /* start polling new socket */
-        oldsock = rcu_dereference_protected(vq->private_data,
-                                            lockdep_is_held(&vq->mutex));
+        oldsock = vq->private_data;
         if (sock != oldsock) {
                 ubufs = vhost_net_ubuf_alloc(vq,
                                              sock && vhost_sock_zcopy(sock));
@@ -934,7 +929,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
                 }
 
                 vhost_net_disable_vq(n, vq);
-                rcu_assign_pointer(vq->private_data, sock);
+                vq->private_data = sock;
                 r = vhost_init_used(vq);
                 if (r)
                         goto err_used;
@@ -968,7 +963,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
         return 0;
 
 err_used:
-        rcu_assign_pointer(vq->private_data, oldsock);
+        vq->private_data = oldsock;
         vhost_net_enable_vq(n, vq);
         if (ubufs)
                 vhost_net_ubuf_put_wait_and_free(ubufs);