[PATCH RFCv1 06/14] iommufd/selftest: Add IOMMU_VIOMMU_ALLOC test coverage

Nicolin Chen
2024-04-13T03:47:51Z

Add mock_viommu to cover the new IOMMU_VIOMMU_ALLOC ioctl.

Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/iommufd/selftest.c | 18 +++++++++++++
tools/testing/selftests/iommu/iommufd.c | 23 ++++++++++++++++
tools/testing/selftests/iommu/iommufd_utils.h | 26 +++++++++++++++++++
3 files changed, 67 insertions(+)

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 7a2199470f31..e2fc2ec23093 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -514,6 +514,23 @@ static struct iommu_device *mock_probe_device(struct device *dev)
return &mock_iommu_device;
}

+struct mock_viommu {
+ struct iommufd_viommu core;
+};
+
+static struct iommufd_viommu *mock_viommu_alloc(struct device *dev,
+ unsigned int viommu_type,
+ struct iommu_domain *domain)
+{
+ struct mock_viommu *mv;
+
+ mv = iommufd_viommu_alloc(mock_viommu, core);
+ if (!mv)
+ return ERR_PTR(-ENOMEM);
+
+ return &mv->core;
+}
+
static const struct iommu_ops mock_ops = {
/*
* IOMMU_DOMAIN_BLOCKED cannot be returned from def_domain_type()
@@ -529,6 +546,7 @@ static const struct iommu_ops mock_ops = {
.capable = mock_domain_capable,
.device_group = generic_device_group,
.probe_device = mock_probe_device,
+ .viommu_alloc = mock_viommu_alloc,
.default_domain_ops =
&(struct iommu_domain_ops){
.free = mock_domain_free,
diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index edf1c99c9936..dd7b7c7a06c6 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -266,6 +266,29 @@ TEST_F(iommufd_ioas, ioas_destroy)
}
}

+TEST_F(iommufd_ioas, viommu)
+{
+ uint32_t dev_id = self->device_id;
+ uint32_t viommu_id = 0;
+ uint32_t hwpt_id = 0;
+
+ if (dev_id) {
+ test_err_viommu_alloc(ENOENT, dev_id, hwpt_id, &viommu_id);
+ test_cmd_hwpt_alloc(dev_id, self->ioas_id, 0, &hwpt_id);
+ test_err_viommu_alloc(EINVAL, dev_id, hwpt_id, &viommu_id);
+ test_ioctl_destroy(hwpt_id);
+
+ test_cmd_hwpt_alloc(dev_id, self->ioas_id,
+ IOMMU_HWPT_ALLOC_NEST_PARENT,
+ &hwpt_id);
+ test_cmd_viommu_alloc(dev_id, hwpt_id, &viommu_id);
+ test_ioctl_destroy(viommu_id);
+ test_ioctl_destroy(hwpt_id);
+ } else {
+ test_err_viommu_alloc(ENOENT, dev_id, hwpt_id, &viommu_id);
+ }
+}
+
TEST_F(iommufd_ioas, alloc_hwpt_nested)
{
const uint32_t min_data_len =
diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index 8d2b46b2114d..037c84189d50 100644
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -684,3 +684,29 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_id, void *data,

#define test_cmd_get_hw_capabilities(device_id, caps, mask) \
ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, NULL, 0, &caps))
+
+static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id,
+ __u32 flags, __u32 *viommu_id)
+{
+ struct iommu_viommu_alloc cmd = {
+ .size = sizeof(cmd),
+ .flags = flags,
+ .dev_id = device_id,
+ .hwpt_id = hwpt_id,
+ };
+ int ret;
+
+ ret = ioctl(fd, IOMMU_VIOMMU_ALLOC, &cmd);
+ if (ret)
+ return ret;
+ if (viommu_id)
+ *viommu_id = cmd.out_viommu_id;
+ return 0;
+}
+
+#define test_cmd_viommu_alloc(device_id, hwpt_id, viommu_id) \
+ ASSERT_EQ(0, _test_cmd_viommu_alloc(self->fd, device_id, hwpt_id, \
+ 0, viommu_id))
+#define test_err_viommu_alloc(_errno, device_id, hwpt_id, viommu_id) \
+ EXPECT_ERRNO(_errno, _test_cmd_viommu_alloc(self->fd, device_id, \
+ hwpt_id, 0, viommu_id))
--
2.43.0