From: Nicolin Chen <nicolinc@nvidia.com>
To: <jgg@nvidia.com>, <kevin.tian@intel.com>
Cc: <robin.murphy@arm.com>, <eric.auger@redhat.com>,
<yi.l.liu@intel.com>, <baolu.lu@linux.intel.com>,
<will@kernel.org>, <joro@8bytes.org>,
<shameerali.kolothum.thodi@huawei.com>,
<jean-philippe@linaro.org>,
<linux-arm-kernel@lists.infradead.org>, <iommu@lists.linux.dev>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH RFC v4 3/4] iommufd/selftest: Add IOMMU_TEST_OP_DEV_CHECK_DATA
Date: Mon, 8 May 2023 21:51:49 -0700 [thread overview]
Message-ID: <0783fcf9eca9fa2dc462a43574c4a0ab76d367fa.1683593949.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1683593949.git.nicolinc@nvidia.com>
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@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
next prev parent reply other threads:[~2023-05-09 4:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-09 4:51 [PATCH RFC v4 0/4] Add set_dev_data and unset_dev_data support Nicolin Chen
2023-05-09 4:51 ` [PATCH RFC v4 1/4] iommu: Add set/unset_dev_user_data ops Nicolin Chen
2023-05-09 4:51 ` [PATCH RFC v4 2/4] iommufd: Add IOMMUFD_CMD_DEVICE_SET_DATA and IOMMUFD_CMD_DEVICE_UNSET_DATA Nicolin Chen
2023-05-09 4:51 ` Nicolin Chen [this message]
2023-05-09 4:51 ` [PATCH RFC v4 4/4] iommufd/selftests: Add coverage for IOMMU_DEVICE_SET/UNSET_DATA Nicolin Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0783fcf9eca9fa2dc462a43574c4a0ab76d367fa.1683593949.git.nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=baolu.lu@linux.intel.com \
--cc=eric.auger@redhat.com \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®