diff mbox series

[v3,1/2] vhost-vdpa: fix vhost_vdpa_map() on error condition

Message ID 1601701330-16837-2-git-send-email-si-wei.liu@oracle.com
State New
Headers show
Series vhost-vdpa mapping error path fixes | expand

Commit Message

Si-Wei Liu Oct. 3, 2020, 5:02 a.m. UTC 
vhost_vdpa_map() should remove the iotlb entry just added
if the corresponding mapping fails to set up properly.

Fixes: 4c8cf31885f6 ("vhost: introduce vDPA-based backend")
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
---
 drivers/vhost/vdpa.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Jason Wang Oct. 10, 2020, 1:48 a.m. UTC | #1 
On 2020/10/3 下午1:02, Si-Wei Liu wrote:
> vhost_vdpa_map() should remove the iotlb entry just added

> if the corresponding mapping fails to set up properly.

>

> Fixes: 4c8cf31885f6 ("vhost: introduce vDPA-based backend")

> Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>

> ---

>   drivers/vhost/vdpa.c | 3 +++

>   1 file changed, 3 insertions(+)

>

> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c

> index 796fe97..0f27919 100644

> --- a/drivers/vhost/vdpa.c

> +++ b/drivers/vhost/vdpa.c

> @@ -565,6 +565,9 @@ static int vhost_vdpa_map(struct vhost_vdpa *v,

>   			      perm_to_iommu_flags(perm));

>   	}

>   

> +	if (r)

> +		vhost_iotlb_del_range(dev->iotlb, iova, iova + size - 1);

> +

>   	return r;

>   }

>   



Acked-by: Jason Wang <jasowang@redhat.com>
diff mbox series

Patch

diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index 796fe97..0f27919 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -565,6 +565,9 @@  static int vhost_vdpa_map(struct vhost_vdpa *v,
 			      perm_to_iommu_flags(perm));
 	}
 
+	if (r)
+		vhost_iotlb_del_range(dev->iotlb, iova, iova + size - 1);
+
 	return r;
 }