From: Nicolin Chen <nicolinc@nvidia.com>
To: <jgg@nvidia.com>, <kevin.tian@intel.com>, <corbet@lwn.net>,
<will@kernel.org>
Cc: <bagasdotme@gmail.com>, <robin.murphy@arm.com>, <joro@8bytes.org>,
<thierry.reding@gmail.com>, <vdumpa@nvidia.com>,
<jonathanh@nvidia.com>, <shuah@kernel.org>, <jsnitsel@redhat.com>,
<nathan@kernel.org>, <peterz@infradead.org>, <yi.l.liu@intel.com>,
<mshavit@google.com>, <praan@google.com>,
<zhangzekun11@huawei.com>, <iommu@lists.linux.dev>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-tegra@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<patches@lists.linux.dev>, <mochs@nvidia.com>,
<alok.a.tiwari@oracle.com>, <vasant.hegde@amd.com>
Subject: [PATCH v4 15/23] iommufd/selftest: Add coverage for the new mmap interface
Date: Thu, 8 May 2025 20:02:36 -0700 [thread overview]
Message-ID: <ea380d5d4da4e34c7c7830b3a681d046154d8b63.1746757630.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1746757630.git.nicolinc@nvidia.com>
Extend the loopback test to a new mmap page.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/iommufd/iommufd_test.h | 4 +++
drivers/iommu/iommufd/selftest.c | 41 ++++++++++++++++++++++---
tools/testing/selftests/iommu/iommufd.c | 7 +++++
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index 51cd744a354f..8fc618b2bcf9 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -232,12 +232,16 @@ struct iommu_hwpt_invalidate_selftest {
* (IOMMU_VIOMMU_TYPE_SELFTEST)
* @in_data: Input random data from user space
* @out_data: Output data (matching @in_data) to user space
+ * @out_mmap_offset: The offset argument for mmap syscall
+ * @out_mmap_length: The length argument for mmap syscall
*
* Simply set @out_data=@in_data for a loopback test
*/
struct iommu_viommu_selftest {
__u32 in_data;
__u32 out_data;
+ __aligned_u64 out_mmap_offset;
+ __aligned_u64 out_mmap_length;
};
/* Should not be equal to any defined value in enum iommu_viommu_invalidate_data_type */
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 692c29ccdc46..36e7fc0059dc 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -149,6 +149,9 @@ struct mock_viommu {
struct iommufd_viommu core;
struct mock_iommu_domain *s2_parent;
struct mock_hw_queue *hw_queue[IOMMU_TEST_HW_QUEUE_MAX];
+
+ unsigned long mmap_offset;
+ u32 *page; /* Mmap page to test u32 type of in_data */
};
static inline struct mock_viommu *to_mock_viommu(struct iommufd_viommu *viommu)
@@ -647,9 +650,14 @@ static void mock_viommu_destroy(struct iommufd_viommu *viommu)
{
struct mock_iommu_device *mock_iommu = container_of(
viommu->iommu_dev, struct mock_iommu_device, iommu_dev);
+ struct mock_viommu *mock_viommu = to_mock_viommu(viommu);
if (refcount_dec_and_test(&mock_iommu->users))
complete(&mock_iommu->complete);
+ if (mock_viommu->mmap_offset)
+ iommufd_viommu_destroy_mmap(mock_viommu, core,
+ mock_viommu->mmap_offset);
+ free_page((unsigned long)mock_viommu->page);
/* iommufd core frees mock_viommu and viommu */
}
@@ -831,17 +839,42 @@ mock_viommu_alloc(struct device *dev, struct iommu_domain *domain,
return ERR_CAST(mock_viommu);
if (user_data) {
+ mock_viommu->page =
+ (u32 *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
+ if (!mock_viommu->page) {
+ rc = -ENOMEM;
+ goto err_destroy_struct;
+ }
+
+ rc = iommufd_viommu_alloc_mmap(mock_viommu, core,
+ __pa(mock_viommu->page),
+ PAGE_SIZE,
+ &mock_viommu->mmap_offset);
+ if (rc)
+ goto err_free_page;
+
+ /* For loopback tests on both the page and out_data */
+ *mock_viommu->page = data.in_data;
data.out_data = data.in_data;
+ data.out_mmap_length = PAGE_SIZE;
+ data.out_mmap_offset = mock_viommu->mmap_offset;
rc = iommu_copy_struct_to_user(
user_data, &data, IOMMU_VIOMMU_TYPE_SELFTEST, out_data);
- if (rc) {
- iommufd_struct_destroy(mock_viommu, core);
- return ERR_PTR(rc);
- }
+ if (rc)
+ goto err_destroy_mmap;
}
refcount_inc(&mock_iommu->users);
return &mock_viommu->core;
+
+err_destroy_mmap:
+ iommufd_viommu_destroy_mmap(mock_viommu, core,
+ mock_viommu->mmap_offset);
+err_free_page:
+ free_page((unsigned long)mock_viommu->page);
+err_destroy_struct:
+ iommufd_struct_destroy(mock_viommu, core);
+ return ERR_PTR(rc);
}
static const struct iommu_ops mock_ops = {
diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index bfdb3a3f1d23..38ad71efb338 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -2799,12 +2799,19 @@ TEST_F(iommufd_viommu, viommu_alloc_with_data)
struct iommu_viommu_selftest data = {
.in_data = 0xbeef,
};
+ uint32_t *test;
if (self->device_id) {
test_cmd_viommu_alloc(self->device_id, self->hwpt_id,
IOMMU_VIOMMU_TYPE_SELFTEST, &data,
sizeof(data), &self->viommu_id);
assert(data.out_data == data.in_data);
+ test = mmap(NULL, data.out_mmap_length, PROT_READ | PROT_WRITE,
+ MAP_SHARED, self->fd, data.out_mmap_offset);
+ assert(test && *test == data.in_data);
+ EXPECT_ERRNO(EBUSY,
+ _test_ioctl_destroy(self->fd, self->viommu_id));
+ munmap(test, data.out_mmap_length);
}
}
--
2.43.0
next prev parent reply other threads:[~2025-05-09 3:03 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-09 3:02 [PATCH v4 00/23] iommufd: Add vIOMMU infrastructure (Part-4 HW QUEUE) Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 01/23] iommufd/viommu: Add driver-allocated vDEVICE support Nicolin Chen
2025-05-15 5:42 ` Tian, Kevin
2025-05-15 16:55 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 02/23] iommu: Pass in a driver-level user data structure to viommu_alloc op Nicolin Chen
2025-05-15 5:44 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 03/23] iommufd/viommu: Allow driver-specific user data for a vIOMMU object Nicolin Chen
2025-05-15 5:45 ` Tian, Kevin
2025-05-15 16:56 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 04/23] iommu: Add iommu_copy_struct_to_user helper Nicolin Chen
2025-05-15 5:46 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 05/23] iommufd/driver: Let iommufd_viommu_alloc helper save ictx to viommu->ictx Nicolin Chen
2025-05-14 17:06 ` Jason Gunthorpe
2025-05-16 2:05 ` Nicolin Chen
2025-05-16 13:28 ` Jason Gunthorpe
2025-05-16 20:56 ` Nicolin Chen
2025-05-26 13:30 ` Jason Gunthorpe
2025-05-27 18:41 ` Nicolin Chen
2025-05-30 18:27 ` Jason Gunthorpe
2025-05-30 18:34 ` Nicolin Chen
2025-05-15 5:48 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 06/23] iommufd/driver: Add iommufd_struct_destroy to revert iommufd_viommu_alloc Nicolin Chen
2025-05-14 18:26 ` Jason Gunthorpe
2025-05-14 19:21 ` Nicolin Chen
2025-05-15 12:49 ` Jason Gunthorpe
2025-05-15 16:55 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 07/23] iommufd/selftest: Support user_data in mock_viommu_alloc Nicolin Chen
2025-05-15 5:49 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 08/23] iommufd/selftest: Add covearge for viommu data Nicolin Chen
2025-05-15 5:50 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 09/23] iommufd: Abstract iopt_pin_pages and iopt_unpin_pages helpers Nicolin Chen
2025-05-14 18:45 ` Jason Gunthorpe
2025-05-15 5:54 ` Tian, Kevin
2025-05-09 3:02 ` [PATCH v4 10/23] iommufd/viommu: Introduce IOMMUFD_OBJ_HW_QUEUE and its related struct Nicolin Chen
2025-05-15 5:58 ` Tian, Kevin
2025-05-15 17:14 ` Nicolin Chen
2025-05-16 2:30 ` Nicolin Chen
2025-05-16 2:59 ` Tian, Kevin
2025-05-19 17:05 ` Vasant Hegde
2025-05-15 15:39 ` Jason Gunthorpe
2025-05-15 17:17 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 11/23] iommufd/viommu: Add IOMMUFD_CMD_HW_QUEUE_ALLOC ioctl Nicolin Chen
2025-05-15 6:30 ` Tian, Kevin
2025-05-15 18:44 ` Nicolin Chen
2025-05-16 2:49 ` Tian, Kevin
2025-05-16 3:16 ` Nicolin Chen
2025-05-16 3:52 ` Tian, Kevin
2025-05-16 4:05 ` Nicolin Chen
2025-05-18 15:19 ` Nicolin Chen
2025-05-15 16:06 ` Jason Gunthorpe
2025-05-15 18:16 ` Nicolin Chen
2025-05-15 18:59 ` Jason Gunthorpe
2025-05-15 20:32 ` Nicolin Chen
2025-05-16 13:26 ` Jason Gunthorpe
2025-05-16 2:42 ` Tian, Kevin
2025-05-16 13:25 ` Jason Gunthorpe
2025-05-19 17:29 ` Vasant Hegde
2025-05-19 18:14 ` Nicolin Chen
2025-05-20 8:38 ` Vasant Hegde
2025-05-23 1:51 ` Tian, Kevin
2025-05-26 13:29 ` Jason Gunthorpe
2025-05-09 3:02 ` [PATCH v4 12/23] iommufd/driver: Add iommufd_hw_queue_depend/undepend() helpers Nicolin Chen
2025-05-15 16:12 ` Jason Gunthorpe
2025-05-16 4:51 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 13/23] iommufd/selftest: Add coverage for IOMMUFD_CMD_HW_QUEUE_ALLOC Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 14/23] iommufd: Add mmap interface Nicolin Chen
2025-05-09 14:13 ` kernel test robot
2025-05-09 19:30 ` Nicolin Chen
2025-05-15 6:41 ` Tian, Kevin
2025-05-15 16:47 ` Jason Gunthorpe
2025-05-16 4:08 ` Tian, Kevin
2025-05-16 13:29 ` Jason Gunthorpe
2025-05-16 17:42 ` Nicolin Chen
2025-05-09 3:02 ` Nicolin Chen [this message]
2025-05-09 3:02 ` [PATCH v4 16/23] Documentation: userspace-api: iommufd: Update HW QUEUE Nicolin Chen
2025-05-15 6:42 ` Tian, Kevin
2025-05-15 16:58 ` Jason Gunthorpe
2025-05-09 3:02 ` [PATCH v4 17/23] iommu/arm-smmu-v3-iommufd: Add vsmmu_alloc impl op Nicolin Chen
2025-05-15 7:52 ` Tian, Kevin
2025-05-15 17:19 ` Jason Gunthorpe
2025-05-15 17:32 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 18/23] iommu/arm-smmu-v3-iommufd: Support implementation-defined hw_info Nicolin Chen
2025-05-15 7:54 ` Tian, Kevin
2025-05-15 17:17 ` Jason Gunthorpe
2025-05-15 18:52 ` Nicolin Chen
2025-05-15 18:56 ` Jason Gunthorpe
2025-05-15 19:21 ` Nicolin Chen
2025-05-15 19:23 ` Jason Gunthorpe
2025-05-15 20:17 ` Nicolin Chen
2025-05-16 13:22 ` Jason Gunthorpe
2025-05-16 17:34 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 19/23] iommu/tegra241-cmdqv: Use request_threaded_irq Nicolin Chen
2025-05-15 7:57 ` Tian, Kevin
2025-05-15 17:21 ` Jason Gunthorpe
2025-05-09 3:02 ` [PATCH v4 20/23] iommu/tegra241-cmdqv: Simplify deinit flow in tegra241_cmdqv_remove_vintf() Nicolin Chen
2025-05-15 8:00 ` Tian, Kevin
2025-05-15 17:27 ` Jason Gunthorpe
2025-05-09 3:02 ` [PATCH v4 21/23] iommu/tegra241-cmdqv: Do not statically map LVCMDQs Nicolin Chen
2025-05-15 8:20 ` Tian, Kevin
2025-05-15 17:03 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 22/23] iommu/tegra241-cmdqv: Add user-space use support Nicolin Chen
2025-05-15 8:27 ` Tian, Kevin
2025-05-15 17:13 ` Nicolin Chen
2025-05-16 4:00 ` Tian, Kevin
2025-05-16 4:10 ` Nicolin Chen
2025-05-09 3:02 ` [PATCH v4 23/23] iommu/tegra241-cmdqv: Add IOMMU_VEVENTQ_TYPE_TEGRA241_CMDQV support 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=ea380d5d4da4e34c7c7830b3a681d046154d8b63.1746757630.git.nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=alok.a.tiwari@oracle.com \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=jsnitsel@redhat.com \
--cc=kevin.tian@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mochs@nvidia.com \
--cc=mshavit@google.com \
--cc=nathan@kernel.org \
--cc=patches@lists.linux.dev \
--cc=peterz@infradead.org \
--cc=praan@google.com \
--cc=robin.murphy@arm.com \
--cc=shuah@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vasant.hegde@amd.com \
--cc=vdumpa@nvidia.com \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.com \
--cc=zhangzekun11@huawei.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;
as well as URLs for NNTP newsgroup(s).