vhost: move acked_features to VQs

Refactor code to make sure features are only accessed
under VQ mutex. This makes everything simpler, no need
for RCU here anymore.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e489161d0feb..2bc8f298a4e7 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -585,9 +585,9 @@ static void handle_rx(struct vhost_net *net)
         vhost_hlen = nvq->vhost_hlen;
         sock_hlen = nvq->sock_hlen;
 
-        vq_log = unlikely(vhost_has_feature(&net->dev, VHOST_F_LOG_ALL)) ?
+        vq_log = unlikely(vhost_has_feature(vq, VHOST_F_LOG_ALL)) ?
                 vq->log : NULL;
-        mergeable = vhost_has_feature(&net->dev, VIRTIO_NET_F_MRG_RXBUF);
+        mergeable = vhost_has_feature(vq, VIRTIO_NET_F_MRG_RXBUF);
 
         while ((sock_len = peek_head_len(sock->sk))) {
                 sock_len += sock_hlen;
@@ -1051,15 +1051,13 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features)
                 mutex_unlock(&n->dev.mutex);
                 return -EFAULT;
         }
-        n->dev.acked_features = features;
-        smp_wmb();
         for (i = 0; i < VHOST_NET_VQ_MAX; ++i) {
                 mutex_lock(&n->vqs[i].vq.mutex);
+                n->vqs[i].vq.acked_features = features;
                 n->vqs[i].vhost_hlen = vhost_hlen;
                 n->vqs[i].sock_hlen = sock_hlen;
                 mutex_unlock(&n->vqs[i].vq.mutex);
         }
-        vhost_net_flush(n);
         mutex_unlock(&n->dev.mutex);
         return 0;
 }