@@ -331,13 +331,16 @@ static int mock_domain_read_and_clear_dirty(struct iommu_domain *domain,
ent = xa_load(&mock->pfns, cur / MOCK_IO_PAGE_SIZE);
if (ent &&
(xa_to_value(ent) & MOCK_PFN_DIRTY_IOVA)) {
- unsigned long val;
-
/* Clear dirty */
- val = xa_to_value(ent) & ~MOCK_PFN_DIRTY_IOVA;
- old = xa_store(&mock->pfns, cur / MOCK_IO_PAGE_SIZE,
- xa_mk_value(val), GFP_KERNEL);
- WARN_ON_ONCE(ent != old);
+ if (!(flags & IOMMU_GET_DIRTY_IOVA_NO_CLEAR)) {
+ unsigned long val;
+
+ val = xa_to_value(ent) & ~MOCK_PFN_DIRTY_IOVA;
+ old = xa_store(&mock->pfns,
+ cur / MOCK_IO_PAGE_SIZE,
+ xa_mk_value(val), GFP_KERNEL);
+ WARN_ON_ONCE(ent != old);
+ }
iommu_dirty_bitmap_record(dirty, cur, MOCK_IO_PAGE_SIZE);
}
}
@@ -1508,13 +1508,49 @@ TEST_F(iommufd_dirty_tracking, get_dirty_iova)
test_mock_dirty_bitmaps(hwpt_id, variant->buffer_size,
MOCK_APERTURE_START,
self->page_size, self->bitmap,
- self->bitmap_size, _metadata);
+ self->bitmap_size, 0, _metadata);
/* PAGE_SIZE unaligned bitmap */
test_mock_dirty_bitmaps(hwpt_id, variant->buffer_size,
MOCK_APERTURE_START,
self->page_size, self->bitmap + MOCK_PAGE_SIZE,
- self->bitmap_size, _metadata);
+ self->bitmap_size, 0, _metadata);
+
+ test_ioctl_destroy(stddev_id);
+ test_ioctl_destroy(hwpt_id);
+}
+
+TEST_F(iommufd_dirty_tracking, get_dirty_iova_no_clear)
+{
+ uint32_t stddev_id;
+ uint32_t hwpt_id;
+ uint32_t ioas_id;
+
+ test_ioctl_ioas_alloc(&ioas_id);
+ test_ioctl_ioas_map_fixed_id(ioas_id, self->buffer,
+ variant->buffer_size,
+ MOCK_APERTURE_START);
+
+ test_cmd_hwpt_alloc(self->idev_id, ioas_id,
+ IOMMU_HWPT_ALLOC_ENFORCE_DIRTY, &hwpt_id);
+ test_cmd_mock_domain(hwpt_id, &stddev_id, NULL, NULL);
+
+ test_cmd_set_dirty(hwpt_id, true);
+
+ test_mock_dirty_bitmaps(hwpt_id, variant->buffer_size,
+ MOCK_APERTURE_START,
+ self->page_size, self->bitmap,
+ self->bitmap_size,
+ IOMMU_GET_DIRTY_IOVA_NO_CLEAR,
+ _metadata);
+
+ /* Unaligned bitmap */
+ test_mock_dirty_bitmaps(hwpt_id, variant->buffer_size,
+ MOCK_APERTURE_START,
+ self->page_size, self->bitmap + MOCK_PAGE_SIZE,
+ self->bitmap_size,
+ IOMMU_GET_DIRTY_IOVA_NO_CLEAR,
+ _metadata);
test_ioctl_destroy(stddev_id);
test_ioctl_destroy(hwpt_id);
@@ -166,11 +166,13 @@ static int _test_cmd_get_device_caps(int fd, __u32 dev_id, __u64 capability)
expected))
static int _test_cmd_get_dirty_iova(int fd, __u32 hwpt_id, size_t length,
- __u64 iova, size_t page_size, __u64 *bitmap)
+ __u64 iova, size_t page_size, __u64 *bitmap,
+ __u32 flags)
{
struct iommu_hwpt_get_dirty_iova cmd = {
.size = sizeof(cmd),
.hwpt_id = hwpt_id,
+ .flags = flags,
.bitmap = {
.iova = iova,
.length = length,
@@ -186,9 +188,10 @@ static int _test_cmd_get_dirty_iova(int fd, __u32 hwpt_id, size_t length,
return 0;
}
-#define test_cmd_get_dirty_iova(fd, hwpt_id, length, iova, page_size, bitmap) \
+#define test_cmd_get_dirty_iova(fd, hwpt_id, length, iova, page_size, bitmap, \
+ flags) \
ASSERT_EQ(0, _test_cmd_get_dirty_iova(fd, hwpt_id, length, \
- iova, page_size, bitmap))
+ iova, page_size, bitmap, flags))
static int _test_cmd_mock_domain_set_dirty(int fd, __u32 hwpt_id, size_t length,
__u64 iova, size_t page_size,
@@ -224,6 +227,7 @@ static int _test_cmd_mock_domain_set_dirty(int fd, __u32 hwpt_id, size_t length,
static int _test_mock_dirty_bitmaps(int fd, __u32 hwpt_id, size_t length,
__u64 iova, size_t page_size,
__u64 *bitmap, __u64 bitmap_size,
+ __u32 flags,
struct __test_metadata *_metadata)
{
unsigned long i, count, nbits = bitmap_size * BITS_PER_BYTE;
@@ -242,26 +246,30 @@ static int _test_mock_dirty_bitmaps(int fd, __u32 hwpt_id, size_t length,
/* Expect all even bits as dirty in the user bitmap */
memset(bitmap, 0, bitmap_size);
- test_cmd_get_dirty_iova(fd, hwpt_id, length, iova, page_size, bitmap);
+ test_cmd_get_dirty_iova(fd, hwpt_id, length, iova,
+ page_size, bitmap, flags);
for (count = 0, i = 0; i < nbits; count += !(i%2), i++)
ASSERT_EQ(!(i % 2), test_bit(i, (unsigned long *) bitmap));
ASSERT_EQ(count, out_dirty);
memset(bitmap, 0, bitmap_size);
- test_cmd_get_dirty_iova(fd, hwpt_id, length, iova, page_size, bitmap);
+ test_cmd_get_dirty_iova(fd, hwpt_id, length, iova,
+ page_size, bitmap, flags);
/* It as read already -- expect all zeroes */
- for (i = 0; i < nbits; i++)
- ASSERT_EQ(0, test_bit(i, (unsigned long *) bitmap));
+ for (i = 0; i < nbits; i++) {
+ ASSERT_EQ(!(i % 2) && (flags & IOMMU_GET_DIRTY_IOVA_NO_CLEAR),
+ test_bit(i, (unsigned long *) bitmap));
+ }
return 0;
}
#define test_mock_dirty_bitmaps(hwpt_id, length, iova, page_size, bitmap, \
- bitmap_size, _metadata) \
+ bitmap_size, flags, _metadata) \
ASSERT_EQ(0, _test_mock_dirty_bitmaps(self->fd, hwpt_id, \
length, iova, \
page_size, bitmap, \
- bitmap_size, _metadata))
+ bitmap_size, flags, _metadata))
static int _test_cmd_create_access(int fd, unsigned int ioas_id,
__u32 *access_id, unsigned int flags)
Change test_mock_dirty_bitmaps() to pass a flag where we specify the flag under test. The test does the same thing as the GET_DIRTY_IOVA regular test. Except that we test whether the bits we dirtied are fetched all the same a second time as opposed to observing them cleared. Signed-off-by: Joao Martins <joao.m.martins@oracle.com> --- drivers/iommu/iommufd/selftest.c | 15 ++++--- tools/testing/selftests/iommu/iommufd.c | 40 ++++++++++++++++++- tools/testing/selftests/iommu/iommufd_utils.h | 26 +++++++----- 3 files changed, 64 insertions(+), 17 deletions(-)