OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vdpa: Make SVQ vring unmapping return void 

Nothing actually reads the return value, but an error in cleaning some
entries could cause device stop to abort, making a restart impossible.
Better ignore explicitely the return value.

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>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-08-23 20:20:06 +02:00 committed by Jason Wang
parent b37c12be96
commit 5b590f51b9
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/virtio/vhost-vdpa.c
View File

@ -884,7 +884,7 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev *dev,
/** /**
* Unmap a SVQ area in the device * Unmap a SVQ area in the device
*/ */
static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v, static void vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
const DMAMap *needle) const DMAMap *needle)
{ {
const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, needle); const DMAMap *result = vhost_iova_tree_find_iova(v->iova_tree, needle);
@ -893,38 +893,33 @@ static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
if (unlikely(!result)) { if (unlikely(!result)) {
error_report("Unable to find SVQ address to unmap"); error_report("Unable to find SVQ address to unmap");
return false; return;
} }
size = ROUND_UP(result->size, qemu_real_host_page_size()); size = ROUND_UP(result->size, qemu_real_host_page_size());
r = vhost_vdpa_dma_unmap(v, result->iova, size); r = vhost_vdpa_dma_unmap(v, result->iova, size);
if (unlikely(r < 0)) { if (unlikely(r < 0)) {
error_report("Unable to unmap SVQ vring: %s (%d)", g_strerror(-r), -r); error_report("Unable to unmap SVQ vring: %s (%d)", g_strerror(-r), -r);
return false; return;
} }
vhost_iova_tree_remove(v->iova_tree, *result); vhost_iova_tree_remove(v->iova_tree, *result);
return r == 0;
} }
static bool vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev, static void vhost_vdpa_svq_unmap_rings(struct vhost_dev *dev,
const VhostShadowVirtqueue *svq) const VhostShadowVirtqueue *svq)
{ {
DMAMap needle = {}; DMAMap needle = {};
struct vhost_vdpa *v = dev->opaque; struct vhost_vdpa *v = dev->opaque;
struct vhost_vring_addr svq_addr; struct vhost_vring_addr svq_addr;
bool ok;
vhost_svq_get_vring_addr(svq, &svq_addr); vhost_svq_get_vring_addr(svq, &svq_addr);
needle.translated_addr = svq_addr.desc_user_addr; needle.translated_addr = svq_addr.desc_user_addr;
ok = vhost_vdpa_svq_unmap_ring(v, &needle); vhost_vdpa_svq_unmap_ring(v, &needle);
if (unlikely(!ok)) {
return false;
}
needle.translated_addr = svq_addr.used_user_addr; needle.translated_addr = svq_addr.used_user_addr;
return vhost_vdpa_svq_unmap_ring(v, &needle); vhost_vdpa_svq_unmap_ring(v, &needle);
} }
/** /**
@ -1095,26 +1090,22 @@ err:
return false; return false;
} }
static bool vhost_vdpa_svqs_stop(struct vhost_dev *dev) static void vhost_vdpa_svqs_stop(struct vhost_dev *dev)
{ {
struct vhost_vdpa *v = dev->opaque; struct vhost_vdpa *v = dev->opaque;
if (!v->shadow_vqs) { if (!v->shadow_vqs) {
return true; return;
} }
for (unsigned i = 0; i < v->shadow_vqs->len; ++i) { for (unsigned i = 0; i < v->shadow_vqs->len; ++i) {
VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i); VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i);
bool ok = vhost_vdpa_svq_unmap_rings(dev, svq); vhost_vdpa_svq_unmap_rings(dev, svq);
if (unlikely(!ok)) {
return false;
}
} }
if (v->migration_blocker) { if (v->migration_blocker) {
migrate_del_blocker(v->migration_blocker); migrate_del_blocker(v->migration_blocker);
} }
return true;
} }
static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started) static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
@ -1131,10 +1122,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
} }
vhost_vdpa_set_vring_ready(dev); vhost_vdpa_set_vring_ready(dev);
} else { } else {
ok = vhost_vdpa_svqs_stop(dev); vhost_vdpa_svqs_stop(dev);
if (unlikely(!ok)) {
return -1;
}
vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs); vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
} }