From: Nicolin Chen <nicolinc@xxxxxxxxxx>
This allows to get info for the mock_dev, helps to run selftest to check
IOMMU_DEVICE_GET_INFO in selftest.
Signed-off-by: Nicolin Chen <nicolinc@xxxxxxxxxx>
Signed-off-by: Yi Liu <yi.l.liu@xxxxxxxxx>
---
drivers/iommu/iommufd/device.c | 1 +
drivers/iommu/iommufd/iommufd_test.h | 15 +++++++++++
drivers/iommu/iommufd/selftest.c | 16 ++++++++++++
tools/testing/selftests/iommu/iommufd.c | 18 ++++++++++++-
tools/testing/selftests/iommu/iommufd_utils.h | 26 +++++++++++++++++++
5 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
index 470838e6902d..0e5d2bde7b3c 100644
--- a/drivers/iommu/iommufd/device.c
+++ b/drivers/iommu/iommufd/device.c
@@ -8,6 +8,7 @@
#include "io_pagetable.h"
#include "iommufd_private.h"
+#include "iommufd_test.h"
MODULE_IMPORT_NS(IOMMUFD_INTERNAL);
diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index f2c61a9500e7..1605ff2b1a90 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -94,4 +94,19 @@ struct iommu_test_cmd {
};
#define IOMMU_TEST_CMD _IO(IOMMUFD_TYPE, IOMMUFD_CMD_BASE + 32)
+/* Mock structs for IOMMU_DEVICE_GET_INFO ioctl */
+#define IOMMU_DEVICE_DATA_SELFTEST 0xfeedbeef
+#define IOMMU_DEVICE_INFO_SELFTEST_REGVAL 0xdeadbeef
+
+/**
+ * struct iommu_device_info_selftest
+ *
+ * @flags: Must be set to 0
+ * @test_reg: Pass IOMMU_DEVICE_INFO_SELFTEST_REGVAL to user selftest program
+ */
+struct iommu_device_info_selftest {
+ __u32 flags;
+ __u32 test_reg;
+};
+
#endif
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 5afed3fc30fe..5013c8757f4b 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -104,6 +104,20 @@ struct selftest_obj {
};
};
+static void *mock_domain_hw_info(struct device *dev, u32 *length)
+{
+ struct iommu_device_info_selftest *info;
+
+ info = kzalloc(sizeof(*info), GFP_KERNEL);
+ if (!info)
+ return ERR_PTR(-ENOMEM);
+
+ info->test_reg = IOMMU_DEVICE_INFO_SELFTEST_REGVAL;
+ *length = sizeof(*info);
+
+ return info;
+}
+
static struct iommu_domain *mock_domain_alloc(unsigned int iommu_domain_type)
{
struct mock_iommu_domain *mock;
@@ -239,6 +253,8 @@ static phys_addr_t mock_domain_iova_to_phys(struct iommu_domain *domain,
static const struct iommu_ops mock_ops = {
.owner = THIS_MODULE,
.pgsize_bitmap = MOCK_IO_PAGE_SIZE,
+ .driver_type = IOMMU_DEVICE_DATA_SELFTEST,
+ .hw_info = mock_domain_hw_info,
.domain_alloc = mock_domain_alloc,
.default_domain_ops =
&(struct iommu_domain_ops){
diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index 1e293950ac88..8e1369451464 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -124,6 +124,7 @@ TEST_F(iommufd, cmd_length)
TEST_LENGTH(iommu_ioas_unmap, IOMMU_IOAS_UNMAP);
TEST_LENGTH(iommu_option, IOMMU_OPTION);
TEST_LENGTH(iommu_vfio_ioas, IOMMU_VFIO_IOAS);
+ TEST_LENGTH(iommu_device_info, IOMMU_DEVICE_GET_INFO);
#undef TEST_LENGTH
}
@@ -185,6 +186,7 @@ TEST_F(iommufd, global_options)
FIXTURE(iommufd_ioas)
{
int fd;
+ uint32_t dev_id;
uint32_t ioas_id;
uint32_t domain_id;
uint64_t base_iova;
@@ -212,7 +214,8 @@ FIXTURE_SETUP(iommufd_ioas)
}
for (i = 0; i != variant->mock_domains; i++) {
- test_cmd_mock_domain(self->ioas_id, NULL, &self->domain_id);
+ test_cmd_mock_domain(self->ioas_id, &self->dev_id,
+ &self->domain_id);
self->base_iova = MOCK_APERTURE_START;
}
}
@@ -281,6 +284,19 @@ TEST_F(iommufd_ioas, ioas_area_auto_destroy)
}
}
+TEST_F(iommufd_ioas, device_get_info)
+{
+ struct iommu_device_info_selftest info;
+
+ if (self->dev_id) {
+ test_cmd_device_get_info(self->dev_id, sizeof(info), &info);
+ assert(info.test_reg == IOMMU_DEVICE_INFO_SELFTEST_REGVAL);
+ } else {
+ test_err_device_get_info(ENOENT, self->dev_id,
+ sizeof(info), &info);
+ }
+}
+
TEST_F(iommufd_ioas, area)
{
int i;
diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index 67805afc620f..1807d29c05f8 100644
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -294,3 +294,29 @@ static void teardown_iommufd(int fd, struct __test_metadata *_metadata)
})
#endif
+
+static int _test_cmd_device_get_info(int fd, __u32 device_id,
+ __u32 data_len, void *data)
+{
+ struct iommu_device_info cmd = {
+ .size = sizeof(cmd),
+ .dev_id = device_id,
+ .data_len = data_len,
+ .data_ptr = (uint64_t)data,
+ };
+ int ret;
+
+ ret = ioctl(fd, IOMMU_DEVICE_GET_INFO, &cmd);
+ if (ret)
+ return ret;
+ return 0;
+}
+
+#define test_cmd_device_get_info(device_id, data_len, data) \
+ ASSERT_EQ(0, _test_cmd_device_get_info(self->fd, device_id, \
+ data_len, data))
+
+#define test_err_device_get_info(_errno, device_id, data_len, data) \
+ EXPECT_ERRNO(_errno, \
+ _test_cmd_device_get_info(self->fd, device_id, \
+ data_len, data))
--
2.34.1
