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 v3 4/4] iommufd/selftests: Add coverage for IOMMU_DEVICE_SET/UNSET_DATA
Date: Sun, 23 Apr 2023 00:40:34 -0700 [thread overview]
Message-ID: <6df9a4e5ad00b1386220f984ec640cab6237ca37.1682234302.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1682234302.git.nicolinc@nvidia.com>
Add a new IOMMU_TEST_OP_DEV_CHECK_DATA to verify whether the dev_data
is properly set/unset by the IOMMU_DEVICE_SET/UNSET_DATA.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
tools/testing/selftests/iommu/iommufd.c | 20 +++++++
tools/testing/selftests/iommu/iommufd_utils.h | 59 +++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index 7291e1c4242a..8265ec6a0606 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -1483,6 +1483,26 @@ TEST_F(iommufd_mock_domain, alloc_hwpt)
}
}
+TEST_F(iommufd_mock_domain, set_dev_data)
+{
+ struct iommu_test_device_data dev_data = {
+ .val = IOMMU_DEVICE_DATA_SELFTEST,
+ };
+ int i;
+
+ for (i = 0; i != variant->mock_domains; i++) {
+ test_err_device_set_data(ENOENT, 0, &dev_data);
+ test_err_device_set_data(EINVAL, self->idev_ids[i], NULL);
+ test_cmd_device_set_data(self->idev_ids[i], &dev_data);
+ test_err_device_set_data(EEXIST, self->idev_ids[i], &dev_data);
+ test_cmd_dev_check_data(self->idev_ids[i], dev_data.val);
+ test_err_device_unset_data(ENOENT, 0);
+ test_cmd_device_unset_data(self->idev_ids[i]);
+ test_err_device_unset_data(ENOENT, self->idev_ids[i]);
+ test_cmd_dev_check_data(self->idev_ids[i], 0);
+ }
+}
+
/* VFIO compatibility IOCTLs */
TEST_F(iommufd, simple_ioctls)
diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index f8ba7b09078b..da04f802c675 100644
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -445,3 +445,62 @@ static int _test_cmd_device_get_hw_info(int fd, __u32 device_id,
EXPECT_ERRNO(_errno, \
_test_cmd_device_get_hw_info(self->fd, device_id, \
data_len, data))
+
+#define test_cmd_dev_check_data(device_id, expected) \
+ ({ \
+ struct iommu_test_cmd test_cmd = { \
+ .size = sizeof(test_cmd), \
+ .op = IOMMU_TEST_OP_DEV_CHECK_DATA, \
+ .id = device_id, \
+ .check_dev_data = { .val = expected }, \
+ }; \
+ ASSERT_EQ(0, \
+ ioctl(self->fd, \
+ _IOMMU_TEST_CMD(IOMMU_TEST_OP_DEV_CHECK_DATA), \
+ &test_cmd)); \
+ })
+
+static int _test_cmd_device_set_data(int fd, __u32 device_id,
+ struct iommu_test_device_data *dev_data)
+{
+ struct iommu_device_set_data cmd = {
+ .size = sizeof(cmd),
+ .dev_id = device_id,
+ .data_uptr = (uint64_t)dev_data,
+ .data_len = sizeof(*dev_data),
+ };
+ int ret;
+
+ ret = ioctl(fd, IOMMU_DEVICE_SET_DATA, &cmd);
+ if (ret)
+ return ret;
+ return 0;
+}
+
+#define test_cmd_device_set_data(device_id, dev_data) \
+ ASSERT_EQ(0, _test_cmd_device_set_data(self->fd, device_id, dev_data))
+
+#define test_err_device_set_data(_errno, device_id, dev_data) \
+ EXPECT_ERRNO(_errno, \
+ _test_cmd_device_set_data(self->fd, device_id, dev_data))
+
+static int _test_cmd_device_unset_data(int fd, __u32 device_id)
+{
+ struct iommu_device_unset_data cmd = {
+ .size = sizeof(cmd),
+ .dev_id = device_id,
+ };
+ int ret;
+
+ ret = ioctl(fd, IOMMU_DEVICE_UNSET_DATA, &cmd);
+ if (ret)
+ return ret;
+ return 0;
+}
+
+#define test_cmd_device_unset_data(device_id) \
+ ASSERT_EQ(0, _test_cmd_device_unset_data(self->fd, device_id))
+
+#define test_err_device_unset_data(_errno, device_id) \
+ EXPECT_ERRNO(_errno, \
+ _test_cmd_device_unset_data(self->fd, device_id))
--
2.40.0
prev parent reply other threads:[~2023-04-23 7:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-23 7:40 [PATCH RFC v3 0/4] Add set_dev_data and unset_dev_data support Nicolin Chen
2023-04-23 7:40 ` [PATCH RFC v3 1/4] iommu: Add set/unset_dev_user_data ops Nicolin Chen
2023-04-23 7:40 ` [PATCH RFC v3 2/4] iommufd: Add IOMMUFD_CMD_DEVICE_SET_DATA and IOMMUFD_CMD_DEVICE_UNSET_DATA Nicolin Chen
2023-04-24 2:44 ` Baolu Lu
2023-04-24 18:50 ` Nicolin Chen
2023-04-23 7:40 ` [PATCH RFC v3 3/4] iommufd/selftest: Add IOMMU_TEST_OP_DEV_CHECK_DATA Nicolin Chen
2023-04-23 7:40 ` Nicolin Chen [this message]
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=6df9a4e5ad00b1386220f984ec640cab6237ca37.1682234302.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®