From: Nicolin Chen <nicolinc@nvidia.com>
To: <jgg@nvidia.com>, <kevin.tian@intel.com>, <will@kernel.org>
Cc: <joro@8bytes.org>, <suravee.suthikulpanit@amd.com>,
<robin.murphy@arm.com>, <dwmw2@infradead.org>,
<baolu.lu@linux.intel.com>, <shuah@kernel.org>,
<linux-kernel@vger.kernel.org>, <iommu@lists.linux.dev>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kselftest@vger.kernel.org>, <eric.auger@redhat.com>,
<jean-philippe@linaro.org>, <mdf@kernel.org>,
<mshavit@google.com>, <shameerali.kolothum.thodi@huawei.com>,
<smostafa@google.com>, <yi.l.liu@intel.com>
Subject: [PATCH v2 13/19] iommufd/selftest: Add IOMMU_TEST_OP_DEV_CHECK_CACHE test command
Date: Tue, 27 Aug 2024 09:59:50 -0700 [thread overview]
Message-ID: <a1be4a0d01fd9d6c3d307461ec2cfeb805e7984b.1724776335.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1724776335.git.nicolinc@nvidia.com>
Similar to IOMMU_TEST_OP_MD_CHECK_IOTLB verifying a mock_domain's iotlb,
IOMMU_TEST_OP_DEV_CHECK_CACHE will be used to verify a mock_dev's cache.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/iommufd/iommufd_test.h | 5 ++++
drivers/iommu/iommufd/selftest.c | 24 +++++++++++++++++++
tools/testing/selftests/iommu/iommufd.c | 7 +++++-
tools/testing/selftests/iommu/iommufd_utils.h | 24 +++++++++++++++++++
4 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index 368076da10ca..56bade6146ff 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -23,6 +23,7 @@ enum {
IOMMU_TEST_OP_DIRTY,
IOMMU_TEST_OP_MD_CHECK_IOTLB,
IOMMU_TEST_OP_TRIGGER_IOPF,
+ IOMMU_TEST_OP_DEV_CHECK_CACHE,
};
enum {
@@ -140,6 +141,10 @@ struct iommu_test_cmd {
__u32 perm;
__u64 addr;
} trigger_iopf;
+ struct {
+ __u32 id;
+ __u32 cache;
+ } check_dev_cache;
};
__u32 last;
};
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 8abffc7794c8..f512874105ac 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -1035,6 +1035,26 @@ static int iommufd_test_md_check_iotlb(struct iommufd_ucmd *ucmd,
return rc;
}
+static int iommufd_test_dev_check_cache(struct iommufd_ucmd *ucmd,
+ u32 idev_id, unsigned int cache_id,
+ u32 cache)
+{
+ struct iommufd_device *idev;
+ struct mock_dev *mdev;
+ int rc = 0;
+
+ idev = iommufd_get_device(ucmd, idev_id);
+ if (IS_ERR(idev))
+ return PTR_ERR(idev);
+ mdev = container_of(idev->dev, struct mock_dev, dev);
+
+ if (cache_id > MOCK_DEV_CACHE_ID_MAX ||
+ mdev->cache[cache_id] != cache)
+ rc = -EINVAL;
+ iommufd_put_object(ucmd->ictx, &idev->obj);
+ return rc;
+}
+
struct selftest_access {
struct iommufd_access *access;
struct file *file;
@@ -1545,6 +1565,10 @@ int iommufd_test(struct iommufd_ucmd *ucmd)
return iommufd_test_md_check_iotlb(ucmd, cmd->id,
cmd->check_iotlb.id,
cmd->check_iotlb.iotlb);
+ case IOMMU_TEST_OP_DEV_CHECK_CACHE:
+ return iommufd_test_dev_check_cache(ucmd, cmd->id,
+ cmd->check_dev_cache.id,
+ cmd->check_dev_cache.cache);
case IOMMU_TEST_OP_CREATE_ACCESS:
return iommufd_test_create_access(ucmd, cmd->id,
cmd->create_access.flags);
diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index 12b5a8f78d4b..1b45445dbd53 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -220,6 +220,8 @@ FIXTURE_SETUP(iommufd_ioas)
for (i = 0; i != variant->mock_domains; i++) {
test_cmd_mock_domain(self->ioas_id, &self->stdev_id,
&self->hwpt_id, &self->device_id);
+ test_cmd_dev_check_cache_all(self->device_id,
+ IOMMU_TEST_DEV_CACHE_DEFAULT);
self->base_iova = MOCK_APERTURE_START;
}
}
@@ -1442,9 +1444,12 @@ FIXTURE_SETUP(iommufd_mock_domain)
ASSERT_GE(ARRAY_SIZE(self->hwpt_ids), variant->mock_domains);
- for (i = 0; i != variant->mock_domains; i++)
+ for (i = 0; i != variant->mock_domains; i++) {
test_cmd_mock_domain(self->ioas_id, &self->stdev_ids[i],
&self->hwpt_ids[i], &self->idev_ids[i]);
+ test_cmd_dev_check_cache_all(self->idev_ids[0],
+ IOMMU_TEST_DEV_CACHE_DEFAULT);
+ }
self->hwpt_id = self->hwpt_ids[0];
self->mmap_flags = MAP_SHARED | MAP_ANONYMOUS;
diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index be722ea88358..d697a7aa55c9 100644
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -234,6 +234,30 @@ static int _test_cmd_hwpt_alloc(int fd, __u32 device_id, __u32 pt_id, __u32 ft_i
test_cmd_hwpt_check_iotlb(hwpt_id, i, expected); \
})
+#define test_cmd_dev_check_cache(device_id, cache_id, expected) \
+ ({ \
+ struct iommu_test_cmd test_cmd = { \
+ .size = sizeof(test_cmd), \
+ .op = IOMMU_TEST_OP_DEV_CHECK_CACHE, \
+ .id = device_id, \
+ .check_dev_cache = { \
+ .id = cache_id, \
+ .cache = expected, \
+ }, \
+ }; \
+ ASSERT_EQ(0, \
+ ioctl(self->fd, \
+ _IOMMU_TEST_CMD(IOMMU_TEST_OP_DEV_CHECK_CACHE),\
+ &test_cmd)); \
+ })
+
+#define test_cmd_dev_check_cache_all(device_id, expected) \
+ ({ \
+ int c; \
+ for (c = 0; c < MOCK_DEV_CACHE_NUM; c++) \
+ test_cmd_dev_check_cache(device_id, c, expected); \
+ })
+
static int _test_cmd_hwpt_invalidate(int fd, __u32 hwpt_id, void *reqs,
uint32_t data_type, uint32_t lreq,
uint32_t *nreqs)
--
2.43.0
next prev parent reply other threads:[~2024-08-27 17:02 UTC|newest]
Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 16:59 [PATCH v2 00/19] iommufd: Add VIOMMU infrastructure (Part-1) Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 01/19] iommufd: Reorder struct forward declarations Nicolin Chen
2024-09-05 15:44 ` Jason Gunthorpe
2024-08-27 16:59 ` [PATCH v2 02/19] iommufd/viommu: Add IOMMUFD_OBJ_VIOMMU and IOMMU_VIOMMU_ALLOC ioctl Nicolin Chen
2024-09-01 2:39 ` Baolu Lu
2024-09-02 5:27 ` Nicolin Chen
2024-09-04 16:26 ` Jason Gunthorpe
2024-09-04 17:29 ` Nicolin Chen
2024-09-04 23:37 ` Jason Gunthorpe
2024-09-05 3:07 ` Nicolin Chen
2024-09-12 3:39 ` Nicolin Chen
2024-09-15 21:10 ` Jason Gunthorpe
2024-09-05 15:53 ` Jason Gunthorpe
2024-09-05 17:10 ` Nicolin Chen
2024-09-05 17:41 ` Jason Gunthorpe
2024-09-05 18:04 ` Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 03/19] iommu: Pass in a viommu pointer to domain_alloc_user op Nicolin Chen
2024-09-05 15:54 ` Jason Gunthorpe
2024-09-05 17:19 ` Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 04/19] iommufd: Allow pt_id to carry viommu_id for IOMMU_HWPT_ALLOC Nicolin Chen
2024-09-05 15:56 ` Jason Gunthorpe
2024-09-26 8:50 ` Yi Liu
2024-09-26 20:10 ` Nicolin Chen
2024-09-27 0:43 ` Tian, Kevin
2024-09-27 1:25 ` Nicolin Chen
2024-09-27 2:23 ` Tian, Kevin
2024-09-27 2:57 ` Nicolin Chen
2024-09-27 5:38 ` Yi Liu
2024-09-27 6:02 ` Nicolin Chen
2024-09-27 11:59 ` Jason Gunthorpe
2024-09-27 19:52 ` Nicolin Chen
2024-09-27 12:12 ` Yi Liu
2024-09-27 20:29 ` Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 05/19] iommufd/selftest: Add IOMMU_VIOMMU_ALLOC test coverage Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 06/19] iommufd/viommu: Add IOMMU_VIOMMU_SET/UNSET_VDEV_ID ioctl Nicolin Chen
2024-09-05 16:03 ` Jason Gunthorpe
2024-09-05 17:37 ` Nicolin Chen
2024-09-05 17:43 ` Jason Gunthorpe
2024-09-05 20:14 ` Nicolin Chen
2024-09-11 6:19 ` Tian, Kevin
2024-09-11 7:11 ` Nicolin Chen
2024-09-11 7:18 ` Tian, Kevin
2024-09-11 7:47 ` Nicolin Chen
2024-10-01 8:54 ` Nicolin Chen
2024-10-01 13:46 ` Jason Gunthorpe
2024-10-01 18:45 ` Nicolin Chen
2024-09-27 13:50 ` Mostafa Saleh
2024-09-27 14:01 ` Jason Gunthorpe
2024-09-27 14:22 ` Mostafa Saleh
2024-09-27 14:58 ` Jason Gunthorpe
2024-09-27 15:59 ` Mostafa Saleh
2024-10-04 4:32 ` Alexey Kardashevskiy
2024-10-04 5:33 ` Nicolin Chen
2024-10-04 11:41 ` Jason Gunthorpe
2024-10-04 18:13 ` Nicolin Chen
2024-10-04 18:50 ` Jason Gunthorpe
2024-10-04 19:25 ` Nicolin Chen
2024-10-04 20:17 ` Jason Gunthorpe
2024-10-04 20:33 ` Nicolin Chen
2024-10-07 17:18 ` Jason Gunthorpe
2025-04-30 7:54 ` Alexey Kardashevskiy
2025-04-30 7:58 ` Nicolin Chen
2025-05-05 17:08 ` Jason Gunthorpe
2025-05-06 2:53 ` Nicolin Chen
2025-05-06 4:35 ` Alexey Kardashevskiy
2025-05-06 4:46 ` Tian, Kevin
2025-05-06 12:58 ` Jason Gunthorpe
2025-05-06 19:55 ` Nicolin Chen
2025-05-07 12:28 ` Jason Gunthorpe
2025-05-07 11:18 ` Alexey Kardashevskiy
2025-05-07 12:24 ` Jason Gunthorpe
2025-05-09 2:57 ` Alexey Kardashevskiy
2025-05-09 22:07 ` Jason Gunthorpe
2025-05-10 12:51 ` Alexey Kardashevskiy
2025-05-12 15:31 ` Jason Gunthorpe
2024-08-27 16:59 ` [PATCH v2 07/19] iommufd/selftest: Add IOMMU_VIOMMU_SET/UNSET_VDEV_ID test coverage Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 08/19] iommufd/viommu: Add cache_invalidate for IOMMU_VIOMMU_TYPE_DEFAULT Nicolin Chen
2024-09-05 16:05 ` Jason Gunthorpe
2024-08-27 16:59 ` [PATCH v2 09/19] iommufd: Allow hwpt_id to carry viommu_id for IOMMU_HWPT_INVALIDATE Nicolin Chen
2024-09-05 16:10 ` Jason Gunthorpe
2024-08-27 16:59 ` [PATCH v2 10/19] iommufd/viommu: Add vdev_id helpers for IOMMU drivers Nicolin Chen
2024-09-05 16:14 ` Jason Gunthorpe
2024-09-05 17:53 ` Nicolin Chen
2024-09-11 23:11 ` Jason Gunthorpe
2024-09-12 3:17 ` Nicolin Chen
2024-10-05 5:19 ` Nicolin Chen
2024-10-07 15:38 ` Jason Gunthorpe
2024-10-07 16:36 ` Nicolin Chen
2024-10-07 17:11 ` Jason Gunthorpe
2024-10-07 17:25 ` Nicolin Chen
2024-10-07 18:28 ` Jason Gunthorpe
2024-10-07 19:56 ` Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 11/19] iommu: Add iommu_copy_struct_from_full_user_array helper Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 12/19] iommufd/selftest: Add mock_viommu_invalidate_user op Nicolin Chen
2024-08-27 16:59 ` Nicolin Chen [this message]
2024-08-27 16:59 ` [PATCH v2 14/19] iommufd/selftest: Add VIOMMU coverage for IOMMU_HWPT_INVALIDATE ioctl Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 15/19] iommufd/viommu: Add iommufd_viommu_to_parent_domain helper Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 16/19] iommu/arm-smmu-v3: Add arm_smmu_cache_invalidate_user Nicolin Chen
2024-09-05 16:23 ` Jason Gunthorpe
2024-09-05 17:56 ` Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 17/19] iommu/arm-smmu-v3: Add arm_smmu_viommu_cache_invalidate Nicolin Chen
2024-09-05 16:20 ` Jason Gunthorpe
2024-09-05 18:00 ` Nicolin Chen
2024-09-05 18:21 ` Jason Gunthorpe
2024-09-11 6:25 ` Tian, Kevin
2024-09-11 7:20 ` Nicolin Chen
2024-09-11 7:50 ` Baolu Lu
2024-09-11 8:17 ` Tian, Kevin
2024-09-11 8:19 ` Baolu Lu
2024-09-11 21:08 ` Nicolin Chen
2024-09-12 4:45 ` Baolu Lu
2024-09-11 8:13 ` Tian, Kevin
2024-09-11 20:53 ` Nicolin Chen
2024-09-11 23:07 ` Jason Gunthorpe
2024-09-13 2:33 ` Tian, Kevin
2024-09-14 14:50 ` Jason Gunthorpe
2024-09-18 8:10 ` Tian, Kevin
2024-09-23 18:34 ` Jason Gunthorpe
2024-09-11 23:00 ` Jason Gunthorpe
2024-08-27 16:59 ` [PATCH v2 18/19] iommu/arm-smmu-v3: Allow ATS for IOMMU_DOMAIN_NESTED Nicolin Chen
2024-08-27 16:59 ` [PATCH v2 19/19] iommu/arm-smmu-v3: Update comments about ATS and bypass Nicolin Chen
2024-09-11 6:12 ` [PATCH v2 00/19] iommufd: Add VIOMMU infrastructure (Part-1) Tian, Kevin
2024-09-11 7:08 ` Nicolin Chen
2024-09-11 7:18 ` Tian, Kevin
2024-09-11 7:40 ` Nicolin Chen
2024-09-11 8:08 ` Tian, Kevin
2024-09-11 20:21 ` Nicolin Chen
2024-10-01 1:55 ` Alexey Kardashevskiy
2024-10-01 3:36 ` Nicolin Chen
2024-10-01 5:06 ` Alexey Kardashevskiy
2024-10-01 13:44 ` Jason Gunthorpe
2024-09-25 10:30 ` Yi Liu
2024-09-25 18:55 ` Nicolin Chen
2024-09-26 8:47 ` Yi Liu
2024-09-26 20:03 ` Nicolin Chen
2024-09-27 2:05 ` Baolu Lu
2024-09-27 6:14 ` Yi Liu
2024-09-27 5:54 ` Yi Liu
2024-09-27 6:32 ` Nicolin Chen
2024-09-27 12:12 ` Yi Liu
2024-09-27 12:20 ` Jason Gunthorpe
2024-09-29 7:19 ` Yi Liu
2024-10-01 13:48 ` Jason Gunthorpe
2024-10-01 18:40 ` Nicolin Chen
2024-09-27 20:44 ` Nicolin Chen
2024-09-29 7:16 ` Yi Liu
2024-09-30 21:59 ` Nicolin Chen
2024-10-09 7:20 ` Yi Liu
2024-10-09 12:31 ` Jason Gunthorpe
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=a1be4a0d01fd9d6c3d307461ec2cfeb805e7984b.1724776335.git.nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=baolu.lu@linux.intel.com \
--cc=dwmw2@infradead.org \
--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=linux-kselftest@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=mshavit@google.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=shuah@kernel.org \
--cc=smostafa@google.com \
--cc=suravee.suthikulpanit@amd.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®