Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd
Pull iommufd fixes from Jason Gunthorpe:
- Syzkaller found a case where maths overflows can cause divide by 0
- Typo in a compiler bug warning fix in the selftests broke the
selftests
- type1 compatability had a mismatch when unmapping an already unmapped
range, it should succeed
* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
iommufd: Make vfio_compat's unmap succeed if the range is already empty
iommufd/selftest: Fix ioctl return value in _test_cmd_trigger_vevents()
iommufd: Don't overflow during division for dirty tracking
+13
-14
+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
-3
drivers/iommu/iommufd/iova_bitmap.c
+2
-3
drivers/iommu/iommufd/iova_bitmap.c
···
130
130
static unsigned long iova_bitmap_offset_to_index(struct iova_bitmap *bitmap,
131
131
unsigned long iova)
132
132
{
133
-
unsigned long pgsize = 1UL << bitmap->mapped.pgshift;
134
-
135
-
return iova / (BITS_PER_TYPE(*bitmap->bitmap) * pgsize);
133
+
return (iova >> bitmap->mapped.pgshift) /
134
+
BITS_PER_TYPE(*bitmap->bitmap);
136
135
}
137
136
138
137
/*
+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));
+2
-2
tools/testing/selftests/iommu/iommufd_utils.h
+2
-2
tools/testing/selftests/iommu/iommufd_utils.h
···
1044
1044
};
1045
1045
1046
1046
while (nvevents--) {
1047
-
if (!ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_TRIGGER_VEVENT),
1048
-
&trigger_vevent_cmd))
1047
+
if (ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_TRIGGER_VEVENT),
1048
+
&trigger_vevent_cmd))
1049
1049
return -1;
1050
1050
}
1051
1051
return 0;