[PATCH RFC v4 3/4] iommufd/selftest: Add IOMMU_TEST_OP_DEV_CHECK_DATA
Nicolin Chen
nicolinc at nvidia.com
Mon May 8 21:51:49 PDT 2023
Add mock_domain_set/unset_dev_user_data and iommufd_test_dev_check_data to
allow testing on IOMMUFD_CMD_DEVICE_SET/UNSET_DATA ioctls from user space
selftest via IOMMU_TEST_OP_DEV_CHECK_DATA.
Signed-off-by: Nicolin Chen <nicolinc at nvidia.com>
---
drivers/iommu/iommufd/iommufd_test.h | 15 ++++++++++
drivers/iommu/iommufd/selftest.c | 42 ++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index 99db8ee9daee..10a04631797c 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -20,6 +20,7 @@ enum {
IOMMU_TEST_OP_MOCK_DOMAIN_REPLACE,
IOMMU_TEST_OP_ACCESS_REPLACE_IOAS,
IOMMU_TEST_OP_MD_CHECK_IOTLB,
+ IOMMU_TEST_OP_DEV_CHECK_DATA,
};
enum {
@@ -99,6 +100,9 @@ struct iommu_test_cmd {
struct {
__u32 iotlb;
} check_iotlb;
+ struct {
+ __u32 val;
+ } check_dev_data;
};
__u32 last;
};
@@ -119,6 +123,17 @@ struct iommu_test_hw_info {
__u32 test_reg;
};
+#define IOMMU_DEVICE_DATA_SELFTEST 0xdadbeef
+
+/**
+ * struct iommu_test_device_data
+ *
+ * @val: Should be set to IOMMU_DEVICE_DATA_SELFTEST or unset to 0x0
+ */
+struct iommu_test_device_data {
+ __u32 val;
+};
+
/* Should not be equal to any defined value in enum iommu_hwpt_type */
#define IOMMU_HWPT_TYPE_SELFTTEST 0xdead
#define IOMMU_HWPT_TYPE_BITMAP_SELFTTEST U64_MAX
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index dbc5cc44c80e..ba3b578ac5a6 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -95,6 +95,7 @@ enum selftest_obj_type {
struct mock_dev {
struct device dev;
+ u32 dev_data;
};
struct selftest_obj {
@@ -332,6 +333,23 @@ static void mock_domain_set_plaform_dma_ops(struct device *dev)
*/
}
+static int mock_domain_set_dev_user_data(struct device *dev,
+ const void *user_data)
+{
+ struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);
+ const struct iommu_test_device_data *data = user_data;
+
+ mdev->dev_data = data->val;
+ return 0;
+}
+
+static void mock_domain_unset_dev_user_data(struct device *dev)
+{
+ struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);
+
+ mdev->dev_data = 0;
+}
+
/*
* Note that having IOMMU_HWPT_TYPE_SELFTTEST (0xdead) ends up with a very large
* array. But this simplifies the core when handling the user data. And the size
@@ -353,6 +371,9 @@ static const struct iommu_ops mock_ops = {
.domain_alloc_user_data_len = mock_domain_user_data_len,
.capable = mock_domain_capable,
.set_platform_dma_ops = mock_domain_set_plaform_dma_ops,
+ .set_dev_user_data = mock_domain_set_dev_user_data,
+ .unset_dev_user_data = mock_domain_unset_dev_user_data,
+ .dev_user_data_len = sizeof(struct iommu_test_device_data),
.default_domain_ops =
&(struct iommu_domain_ops){
.free = mock_domain_free,
@@ -717,6 +738,24 @@ static int iommufd_test_md_check_iotlb(struct iommufd_ucmd *ucmd,
return rc;
}
+static int iommufd_test_dev_check_data(struct iommufd_ucmd *ucmd,
+ u32 dev_id, u32 val)
+{
+ struct iommufd_device *idev;
+ struct mock_dev *mdev;
+ int rc = 0;
+
+ idev = iommufd_get_device(ucmd, dev_id);
+ if (IS_ERR(idev))
+ return PTR_ERR(idev);
+ mdev = container_of(idev->dev, struct mock_dev, dev);
+
+ if (mdev->dev_data != val)
+ rc = -EINVAL;
+ iommufd_put_object(&idev->obj);
+ return rc;
+}
+
struct selftest_access {
struct iommufd_access *access;
struct file *file;
@@ -1133,6 +1172,9 @@ int iommufd_test(struct iommufd_ucmd *ucmd)
case IOMMU_TEST_OP_MD_CHECK_IOTLB:
return iommufd_test_md_check_iotlb(ucmd, cmd->id,
cmd->check_iotlb.iotlb);
+ case IOMMU_TEST_OP_DEV_CHECK_DATA:
+ return iommufd_test_dev_check_data(ucmd, cmd->id,
+ cmd->check_dev_data.val);
case IOMMU_TEST_OP_CREATE_ACCESS:
return iommufd_test_create_access(ucmd, cmd->id,
cmd->create_access.flags);
--
2.40.1
More information about the linux-arm-kernel
mailing list