diff options
| author | Si-Wei Liu <si-wei.liu@oracle.com> | 2020-10-03 01:02:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-14 11:55:57 +0200 |
| commit | ec7257845d40ee81ed18f67d97df87e7107d4cc4 (patch) | |
| tree | 5661995286d70f1044d6574f95328eebe0c183c4 | |
| parent | 72d41c97e736bfa7acf91b91d6f3c27a9499f2aa (diff) | |
| download | linux-stable-ec7257845d40ee81ed18f67d97df87e7107d4cc4.tar.gz linux-stable-ec7257845d40ee81ed18f67d97df87e7107d4cc4.tar.bz2 linux-stable-ec7257845d40ee81ed18f67d97df87e7107d4cc4.zip | |
vhost-vdpa: fix vhost_vdpa_map() on error condition
[ Upstream commit 1477c8aebb94a1db398c12d929a9d27bbd678d8c ]
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>
Link: https://lore.kernel.org/r/1601701330-16837-2-git-send-email-si-wei.liu@oracle.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/vhost/vdpa.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index a54b60d6623f..5259f5210b37 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -527,6 +527,9 @@ static int vhost_vdpa_map(struct vhost_vdpa *v, r = iommu_map(v->domain, iova, pa, size, perm_to_iommu_flags(perm)); + if (r) + vhost_iotlb_del_range(dev->iotlb, iova, iova + size - 1); + return r; } |