Commit 5778c757 authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommufd/selftest: Add IOMMU_VDEVICE_ALLOC test coverage 

Add a vdevice_alloc op to the viommu mock_viommu_ops for the coverage of
IOMMU_VIOMMU_TYPE_SELFTEST allocations. Then, add a vdevice_alloc TEST_F
to cover the IOMMU_VDEVICE_ALLOC ioctl.

Link: https://patch.msgid.link/r/4b9607e5b86726c8baa7b89bd48123fb44104a23.1730836308.git.nicolinc@nvidia.com


Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 0ce5c247

tools/testing/selftests/iommu/iommufd.c

+20 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ TEST_F(iommufd, cmd_length) 
	TEST_LENGTH(iommu_vfio_ioas, IOMMU_VFIO_IOAS, __reserved);

	TEST_LENGTH(iommu_ioas_map_file, IOMMU_IOAS_MAP_FILE, iova);

	TEST_LENGTH(iommu_viommu_alloc, IOMMU_VIOMMU_ALLOC, out_viommu_id);

	TEST_LENGTH(iommu_vdevice_alloc, IOMMU_VDEVICE_ALLOC, virt_id);

#undef TEST_LENGTH

}
@@ -2617,4 +2618,23 @@ TEST_F(iommufd_viommu, viommu_alloc_nested_iopf) 
	}

}



TEST_F(iommufd_viommu, vdevice_alloc)

{

	uint32_t viommu_id = self->viommu_id;

	uint32_t dev_id = self->device_id;

	uint32_t vdev_id = 0;



	if (dev_id) {

		/* Set vdev_id to 0x99, unset it, and set to 0x88 */

		test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &vdev_id);

		test_err_vdevice_alloc(EEXIST, viommu_id, dev_id, 0x99,

				       &vdev_id);

		test_ioctl_destroy(vdev_id);

		test_cmd_vdevice_alloc(viommu_id, dev_id, 0x88, &vdev_id);

		test_ioctl_destroy(vdev_id);

	} else {

		test_err_vdevice_alloc(ENOENT, viommu_id, dev_id, 0x99, NULL);

	}

}



TEST_HARNESS_MAIN

tools/testing/selftests/iommu/iommufd_fail_nth.c

+4 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ TEST_FAIL_NTH(basic_fail_nth, device) 
	uint32_t idev_id;

	uint32_t hwpt_id;

	uint32_t viommu_id;

	uint32_t vdev_id;

	__u64 iova;



	self->fd = open("/dev/iommu", O_RDWR);
@@ -674,6 +675,9 @@ TEST_FAIL_NTH(basic_fail_nth, device) 
				   IOMMU_VIOMMU_TYPE_SELFTEST, 0, &viommu_id))

		return -1;



	if (_test_cmd_vdevice_alloc(self->fd, viommu_id, idev_id, 0, &vdev_id))

		return -1;



	return 0;

}

tools/testing/selftests/iommu/iommufd_utils.h

+27 −0
Original line number Diff line number Diff line
@@ -847,3 +847,30 @@ static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id, 
	EXPECT_ERRNO(_errno,                                               \

		     _test_cmd_viommu_alloc(self->fd, device_id, hwpt_id,  \

					    type, 0, viommu_id))



static int _test_cmd_vdevice_alloc(int fd, __u32 viommu_id, __u32 idev_id,

				   __u64 virt_id, __u32 *vdev_id)

{

	struct iommu_vdevice_alloc cmd = {

		.size = sizeof(cmd),

		.dev_id = idev_id,

		.viommu_id = viommu_id,

		.virt_id = virt_id,

	};

	int ret;



	ret = ioctl(fd, IOMMU_VDEVICE_ALLOC, &cmd);

	if (ret)

		return ret;

	if (vdev_id)

		*vdev_id = cmd.out_vdevice_id;

	return 0;

}



#define test_cmd_vdevice_alloc(viommu_id, idev_id, virt_id, vdev_id)       \

	ASSERT_EQ(0, _test_cmd_vdevice_alloc(self->fd, viommu_id, idev_id, \

					     virt_id, vdev_id))

#define test_err_vdevice_alloc(_errno, viommu_id, idev_id, virt_id, vdev_id) \

	EXPECT_ERRNO(_errno,                                                 \

		     _test_cmd_vdevice_alloc(self->fd, viommu_id, idev_id,   \

					     virt_id, vdev_id))