[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/7] vdpa: Remove SVQ vring from iova_tree at shutdown
From: |
Eugenio Pérez |
Subject: |
[PATCH v2 4/7] vdpa: Remove SVQ vring from iova_tree at shutdown |
Date: |
Tue, 23 Aug 2022 20:20:05 +0200 |
Although the device will be reset before usage, the right thing to do is
to clean it.
Reported-by: Lei Yang <leiyang@redhat.com>
Fixes: 34e3c94eda ("vdpa: Add custom IOTLB translations to SVQ")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
v2:
* Call vhost_iova_tree_remove with the map as value.
* report_error on vhost_vdpa_dma_unmap fail
---
hw/virtio/vhost-vdpa.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 87e0ad393f..e16e0e222e 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -898,6 +898,12 @@ static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
size = ROUND_UP(result->size, qemu_real_host_page_size());
r = vhost_vdpa_dma_unmap(v, result->iova, size);
+ if (unlikely(r < 0)) {
+ error_report("Unable to unmap SVQ vring: %s (%d)", g_strerror(-r), -r);
+ return false;
+ }
+
+ vhost_iova_tree_remove(v->iova_tree, *result);
return r == 0;
}
--
2.31.1
- [PATCH v2 0/7] vDPA shadow virtqueue iova tree fixes., Eugenio Pérez, 2022/08/23
- [PATCH v2 4/7] vdpa: Remove SVQ vring from iova_tree at shutdown,
Eugenio Pérez <=
- [PATCH v2 1/7] vdpa: Skip the maps not in the iova tree, Eugenio Pérez, 2022/08/23
- [PATCH v2 2/7] vdpa: do not save failed dma maps in SVQ iova tree, Eugenio Pérez, 2022/08/23
- [PATCH v2 3/7] util: accept iova_tree_remove_parameter by value, Eugenio Pérez, 2022/08/23
- [PATCH v2 5/7] vdpa: Make SVQ vring unmapping return void, Eugenio Pérez, 2022/08/23
- [PATCH v2 7/7] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring, Eugenio Pérez, 2022/08/23
- [PATCH v2 6/7] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd, Eugenio Pérez, 2022/08/23