Re: [PATCH v3 1/2] vhost-vdpa: fix vhost_vdpa_map() on error condition
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2020-10-11 06:46:02
Also in:
lkml, netdev
On Sat, Oct 10, 2020 at 09:48:42AM +0800, Jason Wang wrote:
On 2020/10/3 下午1:02, Si-Wei Liu wrote:quoted
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 <redacted> --- 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>
Linus already merged this, I can't add your ack, sorry! -- MST _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization