Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iommufd: Make vfio_compat's unmap succeed if the range is already empty
iommufd returns ENOENT when attempting to unmap a range that is already
empty, while vfio type1 returns success. Fix vfio_compat to match.
Fixes: d624d6652a65 ("iommufd: vfio container FD ioctl compatibility")
Link: https://patch.msgid.link/r/0-v1-76be45eff0be+5d-iommufd_unmap_compat_jgg@nvidia.com
Reviewed-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Alex Mastro <amastro@fb.com>
Reported-by: Alex Mastro <amastro@fb.com>
Closes: https://lore.kernel.org/r/aP0S5ZF9l3sWkJ1G@devgpu012.nha5.facebook.com
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+9
-9
+3
-9
drivers/iommu/iommufd/io_pagetable.c
+3
-9
drivers/iommu/iommufd/io_pagetable.c
···
707
707
struct iopt_area *area;
708
708
unsigned long unmapped_bytes = 0;
709
709
unsigned int tries = 0;
710
-
int rc = -ENOENT;
710
+
/* If there are no mapped entries then success */
711
+
int rc = 0;
711
712
712
713
/*
713
714
* The domains_rwsem must be held in read mode any time any area->pages
···
778
777
779
778
down_write(&iopt->iova_rwsem);
780
779
}
781
-
if (unmapped_bytes)
782
-
rc = 0;
783
780
784
781
out_unlock_iova:
785
782
up_write(&iopt->iova_rwsem);
···
814
815
815
816
int iopt_unmap_all(struct io_pagetable *iopt, unsigned long *unmapped)
816
817
{
817
-
int rc;
818
-
819
-
rc = iopt_unmap_iova_range(iopt, 0, ULONG_MAX, unmapped);
820
818
/* If the IOVAs are empty then unmap all succeeds */
821
-
if (rc == -ENOENT)
822
-
return 0;
823
-
return rc;
819
+
return iopt_unmap_iova_range(iopt, 0, ULONG_MAX, unmapped);
824
820
}
825
821
826
822
/* The caller must always free all the nodes in the allowed_iova rb_root. */
+4
drivers/iommu/iommufd/ioas.c
+4
drivers/iommu/iommufd/ioas.c
+2
tools/testing/selftests/iommu/iommufd.c
+2
tools/testing/selftests/iommu/iommufd.c
···
2638
2638
ASSERT_EQ(0, ioctl(self->fd, VFIO_IOMMU_MAP_DMA, &map_cmd));
2639
2639
ASSERT_EQ(0, ioctl(self->fd, VFIO_IOMMU_UNMAP_DMA, &unmap_cmd));
2640
2640
ASSERT_EQ(BUFFER_SIZE, unmap_cmd.size);
2641
+
/* Unmap of empty is success */
2642
+
ASSERT_EQ(0, ioctl(self->fd, VFIO_IOMMU_UNMAP_DMA, &unmap_cmd));
2641
2643
2642
2644
/* UNMAP_FLAG_ALL requires 0 iova/size */
2643
2645
ASSERT_EQ(0, ioctl(self->fd, VFIO_IOMMU_MAP_DMA, &map_cmd));