Commit 9526f9a2 authored by Eric Auger's avatar Eric Auger Committed by Michael S. Tsirkin
Browse files

vhost/net: Clear the pending messages when the backend is removed 



When the vhost iotlb is used along with a guest virtual iommu
and the guest gets rebooted, some MISS messages may have been
recorded just before the reboot and spuriously executed by
the virtual iommu after the reboot.

As vhost does not have any explicit reset user API,
VHOST_NET_SET_BACKEND looks a reasonable point where to clear
the pending messages, in case the backend is removed.

Export vhost_clear_msg() and call it in vhost_net_set_backend()
when fd == -1.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Suggested-by: default avatarJason Wang <jasowang@redhat.com>
Fixes: 6b1e6cc7 ("vhost: new device IOTLB API")
Message-Id: <20230117151518.44725-3-eric.auger@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2241ab53

drivers/vhost/net.c

+3 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,9 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) 
	nvq = &n->vqs[index];

	mutex_lock(&vq->mutex);



	if (fd == -1)

		vhost_clear_msg(&n->dev);



	/* Verify that ring has been setup correctly. */

	if (!vhost_vq_access_ok(vq)) {

		r = -EFAULT;

drivers/vhost/vhost.c

+2 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ void vhost_dev_stop(struct vhost_dev *dev) 
}

EXPORT_SYMBOL_GPL(vhost_dev_stop);



static void vhost_clear_msg(struct vhost_dev *dev)

void vhost_clear_msg(struct vhost_dev *dev)

{

	struct vhost_msg_node *node, *n;
@@ -679,6 +679,7 @@ static void vhost_clear_msg(struct vhost_dev *dev) 


	spin_unlock(&dev->iotlb_lock);

}

EXPORT_SYMBOL_GPL(vhost_clear_msg);



void vhost_dev_cleanup(struct vhost_dev *dev)

{

drivers/vhost/vhost.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp); 
long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp);

bool vhost_vq_access_ok(struct vhost_virtqueue *vq);

bool vhost_log_access_ok(struct vhost_dev *);

void vhost_clear_msg(struct vhost_dev *dev);



int vhost_get_vq_desc(struct vhost_virtqueue *,

		      struct iovec iov[], unsigned int iov_count,