Skip to contentSkip to conversation

vhost: handle error while adding split ranges to iotlb

PATCH In review Anirudh Rayabharam 2 participants 2 messages Mar 20, 2022 – Mar 21, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vhost: handle error while adding split ranges to iotlb

vhost_iotlb_add_range_ctx() handles the range [0, ULONG_MAX] by splitting it into two ranges and adding them separately. The return value of adding the first range to the iotlb is currently ignored. Check the return value and bail out in case of an error.

Fixes e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries")

---

v2:
- Add "Fixes:" tag and "Reviewed-by:".

v1:
https://lore.kernel.org/kvm/[email protected]/

---
 drivers/vhost/iotlb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/vhost/iotlb.c +5 -1
index 40b098320b2a..5829cf2d0552 100644
@@ -62,8 +62,12 @@ int vhost_iotlb_add_range_ctx(struct vhost_iotlb *iotlb,
 	 */
 	if (start == 0 && last == ULONG_MAX) {
 		u64 mid = last / 2;
+		int err = vhost_iotlb_add_range_ctx(iotlb, start, mid, addr,
+				perm, opaque);
+
+		if (err)
+			return err;
 
-		vhost_iotlb_add_range_ctx(iotlb, start, mid, addr, perm, opaque);
 		addr += mid + 1;
 		start = mid + 1;
 	}
Signature · 1 line
2.35.1
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Anirudh Rayabharam

vhost_iotlb_add_range_ctx() handles the range [0, ULONG_MAX] by splitting it into two ranges and adding them separately. The return value of adding the first range to the iotlb is currently ignored. Check the return value and bail out in case of an error.

Fixes e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries")
Quoted 33 lines

---

v2:
- Add "Fixes:" tag and "Reviewed-by:".

v1:
https://lore.kernel.org/kvm/[email protected]/

---
 drivers/vhost/iotlb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/vhost/iotlb.c +5 -2
index 40b098320b2a..5829cf2d0552 100644
@@ -62,8 +62,12 @@ int vhost_iotlb_add_range_ctx(struct vhost_iotlb *iotlb,
         */
        if (start == 0 && last == ULONG_MAX) {
                u64 mid = last / 2;
+               int err = vhost_iotlb_add_range_ctx(iotlb, start, mid, addr,
+                               perm, opaque);
+
+               if (err)
+                       return err;
 
-               vhost_iotlb_add_range_ctx(iotlb, start, mid, addr, perm, opaque);
                addr += mid + 1;
                start = mid + 1;
        }
--

2.35.1