hw/virtio/vhost-shadow-virtqueue: range boundary in translation
PATCH v2 1/1 hw/virtio/vhost-shadow-virtqueue: range boundary in translation
iova-tree expects inclusive range sizing when maps are allocated or searched. Currently, svqs use exclusive sizing when searching their vhost-iova-tree for a match to the region to be translated. This could lead to errors if the region to be translated is at the edge of an iova region.
Fix this by reducing needle.size by 1 in vhost_svq_translate_addr to bring it in line with DMAMap and iova-tree convention.
The only current user of svq->iova_tree is hw/virtio/vhost-vdpa.c, which also treats size as inclusive when using the tree API. In progress work on vhost-user isolation mode in hw/virtio.vhost-vdpa.c also uses inclusive sizing when interacting with the tree.
This patch is an updated version of one from the patch series "vhost-user:
isolated memory". The patch has been isolated from the series as it is not tightly coupled with the rest of the series.
---
V2 Differences:
- Context added about users of svq->iova_tree and their adoption of inclusive sizing
hw/virtio/vhost-shadow-virtqueue.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
hw/virtio/vhost-shadow-virtqueue.c +8 -2
@@ -99,19 +99,25 @@ static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq,const DMAMap *map;DMAMap needle; +if (unlikely (iovec[i].iov_len ==0 )) { +qemu_log_mask (LOG_GUEST_ERROR , +"Zero-sized buffer made available by guest" ); +return false; + } +/* Check if the descriptor is backed by guest memory */ if (gpas) {/* Search the GPA->IOVA tree */ needle = (DMAMap ) { .translated_addr = gpas[i], - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_gpa (svq->iova_tree, &needle); }else {/* Search the IOVA->HVA tree */ needle = (DMAMap ) { .translated_addr = (hwaddr )(uintptr_t )iovec[i].iov_base, - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_iova (svq->iova_tree, &needle); }
Signature · 1 line
2.43.0
Quoted 6 lines · Connor Kite
iova-tree expects inclusive range sizing when maps are allocated or searched. Currently, svqs use exclusive sizing when searching their vhost-iova-tree for a match to the region to be translated. This could lead to errors if the region to be translated is at the edge of an iova region.
Quoted 8 lines
Fix this by reducing
needle.sizeby 1 invhost_svq_translate_addrto bring it in line with DMAMap and iova-tree convention.The only current user of
svq->iova_treeishw/virtio/vhost-vdpa.c, which also treats size as inclusive when using the tree API. In progress work on vhost-user isolation mode inhw/virtio.vhost-vdpa.calso uses inclusive sizing when interacting with the tree.
Please correct hw/virtio.vhost-vdpa.c to hw/virtio/vhost-user.c. The former does not exist and misidentifies where the vhost-user isolation work lives.
Quoted 7 lines
This patch is an updated version of one from the patch series "vhost-user:
isolated memory". The patch has been isolated from the series as it is not tightly coupled with the rest of the series.Signed-off-by Connor Kite <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>
Please add the required trailer:
That commit introduced the oversized needle, and QEMU policy requests a
Fixes: trailer for in-tree regressions.
Regards,
Akihiko Odaki
Quoted 40 lines
---
V2 Differences:
- Context added about users ofsvq->iova_treeand their adoption of inclusive sizinghw/virtio/vhost-shadow-virtqueue.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)hw/virtio/vhost-shadow-virtqueue.c +8
-2@@ -99,19 +99,25 @@ static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq,const DMAMap *map;DMAMap needle; +if (unlikely (iovec[i].iov_len ==0 )) { +qemu_log_mask (LOG_GUEST_ERROR , +"Zero-sized buffer made available by guest" ); +return false; + } +/* Check if the descriptor is backed by guest memory */ if (gpas) {/* Search the GPA->IOVA tree */ needle = (DMAMap ) { .translated_addr = gpas[i], - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_gpa (svq->iova_tree, &needle); }else {/* Search the IOVA->HVA tree */ needle = (DMAMap ) { .translated_addr = (hwaddr )(uintptr_t )iovec[i].iov_base, - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_iova (svq->iova_tree, &needle); }
Quoted 40 lines · Connor Kite
iova-tree expects inclusive range sizing when maps are allocated or searched. Currently, svqs use exclusive sizing when searching their vhost-iova-tree for a match to the region to be translated. This could lead to errors if the region to be translated is at the edge of an iova region.
Fix this by reducing
needle.sizeby 1 invhost_svq_translate_addrto bring it in line with DMAMap and iova-tree convention.The only current user of
svq->iova_treeishw/virtio/vhost-vdpa.c, which also treats size as inclusive when using the tree API. In progress work on vhost-user isolation mode inhw/virtio.vhost-vdpa.calso uses inclusive sizing when interacting with the tree.This patch is an updated version of one from the patch series "vhost-user:
isolated memory". The patch has been isolated from the series as it is not tightly coupled with the rest of the series.Signed-off-by Connor Kite <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>---
V2 Differences:
- Context added about users ofsvq->iova_treeand their adoption of inclusive sizing
hw/virtio/vhost-shadow-virtqueue.c| 10 ++++++++--1 file changed, 8 insertions(+), 2 deletions(-)hw/virtio/vhost-shadow-virtqueue.c +3
-0@@ -99,19 +99,25 @@ static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq,const DMAMap *map;DMAMap needle; +if (unlikely (iovec[i].iov_len ==0 )) { +qemu_log_mask (LOG_GUEST_ERROR , +"Zero-sized buffer made available by guest" );
hw/virtio/vhost-shadow-virtqueue.c static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq, · line 113
Quoted 10 lines
hw/virtio/vhost-shadow-virtqueue.c +4
-1+return false; + } +/* Check if the descriptor is backed by guest memory */ if (gpas) {/* Search the GPA->IOVA tree */ needle = (DMAMap ) { .translated_addr = gpas[i], - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */
^
nit: double spaces here...
hw/virtio/vhost-shadow-virtqueue.c static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq, · line 120
Quoted 8 lines
hw/virtio/vhost-shadow-virtqueue.c +1
-1}; map =vhost_iova_tree_find_gpa (svq->iova_tree, &needle); }else {/* Search the IOVA->HVA tree */ needle = (DMAMap ) { .translated_addr = (hwaddr )(uintptr_t )iovec[i].iov_base, - .size = iovec[i].iov_len, + .size = iovec[i].iov_len - 1, /* Inclusive */
^
... single here.
If you need to respin, maybe we can be consistent and fix it.
Anyway with Akihiko's comments fixed:
Thanks for the fix!
Stefano
Quoted 16 lines · Connor Kite
iova-tree expects inclusive range sizing when maps are allocated or searched. Currently, svqs use exclusive sizing when searching their vhost-iova-tree for a match to the region to be translated. This could lead to errors if the region to be translated is at the edge of an iova region.
Fix this by reducing
needle.sizeby 1 invhost_svq_translate_addrto bring it in line with DMAMap and iova-tree convention.The only current user of
svq->iova_treeishw/virtio/vhost-vdpa.c, which also treats size as inclusive when using the tree API. In progress work on vhost-user isolation mode inhw/virtio.vhost-vdpa.calso uses inclusive sizing when interacting with the tree.
Quoted 6 lines
This patch is an updated version of one from the patch series "vhost-user:
isolated memory". The patch has been isolated from the series as it is not tightly coupled with the rest of the series.Signed-off-by Connor Kite <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>
I'd like to improve the patch subject by adding a verb and the object. Something like (*add* range boundary in *vhost svq* translation).
Also, adding the Fixes tag,
Thank you very much for the catch!
Quoted 43 lines
---
V2 Differences:
- Context added about users ofsvq->iova_treeand their adoption of inclusive sizinghw/virtio/vhost-shadow-virtqueue.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)hw/virtio/vhost-shadow-virtqueue.c +8
-3@@ -99,19 +99,25 @@ static bool vhost_svq_translate_addr(const VhostShadowVirtqueue *svq,const DMAMap *map;DMAMap needle; +if (unlikely (iovec[i].iov_len ==0 )) { +qemu_log_mask (LOG_GUEST_ERROR , +"Zero-sized buffer made available by guest" ); +return false; + } +/* Check if the descriptor is backed by guest memory */ if (gpas) {/* Search the GPA->IOVA tree */ needle = (DMAMap ) { .translated_addr = gpas[i], - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_gpa (svq->iova_tree, &needle); }else {/* Search the IOVA->HVA tree */ needle = (DMAMap ) { .translated_addr = (hwaddr )(uintptr_t )iovec[i].iov_base, - .size = iovec[i].iov_len, + .size = iovec[i].iov_len -1 ,/* Inclusive */ }; map =vhost_iova_tree_find_iova (svq->iova_tree, &needle); } --2.43.0