Commit 2c029f32 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Michael S. Tsirkin
Browse files

vhost_net: get rid of vhost_net_flush_vq() and extra flush calls 



vhost_net_flush_vq() calls vhost_work_dev_flush() twice passing
vhost_dev pointer obtained via 'n->poll[index].dev' and
'n->vqs[index].vq.poll.dev'. This is actually the same pointer,
initialized in vhost_net_open()/vhost_dev_init()/vhost_poll_init()

Remove vhost_net_flush_vq() and call vhost_work_dev_flush() directly.
Do the flushes only once instead of several flush calls in a row
which seems rather useless.

Signed-off-by: default avatarAndrey Ryabinin <arbn@yandex-team.com>
[drop vhost_dev forward declaration in vhost.h]
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Message-Id: <20220517180850.198915-4-michael.christie@oracle.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6ca84326

drivers/vhost/net.c

+2 −9
Original line number Diff line number Diff line
@@ -1374,16 +1374,9 @@ static void vhost_net_stop(struct vhost_net *n, struct socket **tx_sock, 
	*rx_sock = vhost_net_stop_vq(n, &n->vqs[VHOST_NET_VQ_RX].vq);

}



static void vhost_net_flush_vq(struct vhost_net *n, int index)

{

	vhost_work_dev_flush(n->poll[index].dev);

	vhost_work_dev_flush(n->vqs[index].vq.poll.dev);

}



static void vhost_net_flush(struct vhost_net *n)

{

	vhost_net_flush_vq(n, VHOST_NET_VQ_TX);

	vhost_net_flush_vq(n, VHOST_NET_VQ_RX);

	vhost_work_dev_flush(&n->dev);

	if (n->vqs[VHOST_NET_VQ_TX].ubufs) {

		mutex_lock(&n->vqs[VHOST_NET_VQ_TX].vq.mutex);

		n->tx_flush = true;
@@ -1572,7 +1565,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) 
	}



	if (oldsock) {

		vhost_net_flush_vq(n, index);

		vhost_work_dev_flush(&n->dev);

		sockfd_put(oldsock);

	}