From: Yi Liu <yi.l.liu@intel.com>
To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com,
kevin.tian@intel.com, robin.murphy@arm.com,
baolu.lu@linux.intel.com
Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com,
kvm@vger.kernel.org, mjrosato@linux.ibm.com,
chao.p.peng@linux.intel.com, yi.l.liu@intel.com,
yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com,
shameerali.kolothum.thodi@huawei.com, lulu@redhat.com,
suravee.suthikulpanit@amd.com, iommu@lists.linux.dev,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
zhenzhong.duan@intel.com
Subject: [PATCH v3 11/17] iommufd/selftest: Add IOMMU_TEST_OP_DEV_[ADD|DEL]_RESERVED to add/del reserved regions to selftest device
Date: Mon, 24 Jul 2023 04:04:00 -0700 [thread overview]
Message-ID: <20230724110406.107212-12-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230724110406.107212-1-yi.l.liu@intel.com>
This makes test tool able to specify reserved regions to the selftest
device and hence able to validate the ioctl IOMMU_RESV_IOVA_RANGES.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/iommu/iommufd/iommufd_test.h | 6 ++
drivers/iommu/iommufd/selftest.c | 82 ++++++++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index 3f3644375bf1..b7f4bee2ea1b 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -19,6 +19,8 @@ enum {
IOMMU_TEST_OP_SET_TEMP_MEMORY_LIMIT,
IOMMU_TEST_OP_MOCK_DOMAIN_REPLACE,
IOMMU_TEST_OP_ACCESS_REPLACE_IOAS,
+ IOMMU_TEST_OP_DEV_ADD_RESERVED,
+ IOMMU_TEST_OP_DEV_DEL_RESERVED,
};
enum {
@@ -50,6 +52,10 @@ struct iommu_test_cmd {
__aligned_u64 start;
__aligned_u64 length;
} add_reserved;
+ struct {
+ __aligned_u64 start;
+ __aligned_u64 length;
+ } add_dev_reserved;
struct {
__u32 out_stdev_id;
__u32 out_hwpt_id;
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 72d0c37e0b5e..271c6c261eb4 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -93,6 +93,8 @@ enum selftest_obj_type {
struct mock_dev {
struct device dev;
+ struct rw_semaphore reserved_rwsem;
+ struct rb_root_cached reserved_itree;
};
struct selftest_obj {
@@ -385,6 +387,10 @@ static struct mock_dev *mock_dev_create(void)
mutex_init(&mdev->dev.iommu->lock);
mdev->dev.iommu->iommu_dev = &mock_iommu_device;
+ /* Reserve range related fields */
+ init_rwsem(&mdev->reserved_rwsem);
+ mdev->reserved_itree = RB_ROOT_CACHED;
+
rc = device_add(&mdev->dev);
if (rc)
goto err_dev_iommu;
@@ -407,8 +413,20 @@ static struct mock_dev *mock_dev_create(void)
return ERR_PTR(rc);
}
+static void mock_dev_remove_reserved_iovas(struct mock_dev *mdev)
+{
+ struct interval_tree_node *node;
+
+ while ((node = interval_tree_iter_first(&mdev->reserved_itree, 0,
+ ULONG_MAX))) {
+ interval_tree_remove(node, &mdev->reserved_itree);
+ kfree(node);
+ }
+}
+
static void mock_dev_destroy(struct mock_dev *mdev)
{
+ mock_dev_remove_reserved_iovas(mdev);
iommu_group_remove_device(&mdev->dev);
device_del(&mdev->dev);
kfree(mdev->dev.iommu);
@@ -536,6 +554,64 @@ static int iommufd_test_add_reserved(struct iommufd_ucmd *ucmd,
return rc;
}
+static int mock_dev_add_reserved_iova(struct mock_dev *mdev,
+ unsigned long start, unsigned long last)
+{
+ struct interval_tree_node *reserved;
+
+ if (interval_tree_iter_first(&mdev->reserved_itree, start, last))
+ return -EADDRINUSE;
+
+ reserved = kzalloc(sizeof(*reserved), GFP_KERNEL_ACCOUNT);
+ if (!reserved)
+ return -ENOMEM;
+ reserved->start = start;
+ reserved->last = last;
+ interval_tree_insert(reserved, &mdev->reserved_itree);
+ return 0;
+}
+
+/* Add a reserved IOVA region to a device */
+static int iommufd_test_dev_add_reserved(struct iommufd_ucmd *ucmd,
+ unsigned int device_id,
+ unsigned long start, size_t length)
+{
+ struct selftest_obj *sobj;
+ struct mock_dev *mdev;
+ int rc;
+
+ sobj = iommufd_test_get_device(ucmd->ictx, device_id);
+ if (IS_ERR(sobj))
+ return PTR_ERR(sobj);
+
+ mdev = sobj->idev.mock_dev;
+ down_write(&mdev->reserved_rwsem);
+ rc = mock_dev_add_reserved_iova(sobj->idev.mock_dev,
+ start, start + length - 1);
+ up_write(&mdev->reserved_rwsem);
+ iommufd_put_object(&sobj->obj);
+ return rc;
+}
+
+/* Remove all reserved IOVA regions of a device */
+static int iommufd_test_dev_del_reserved(struct iommufd_ucmd *ucmd,
+ unsigned int device_id)
+{
+ struct selftest_obj *sobj;
+ struct mock_dev *mdev;
+
+ sobj = iommufd_test_get_device(ucmd->ictx, device_id);
+ if (IS_ERR(sobj))
+ return PTR_ERR(sobj);
+
+ mdev = sobj->idev.mock_dev;
+ down_write(&mdev->reserved_rwsem);
+ mock_dev_remove_reserved_iovas(mdev);
+ up_write(&mdev->reserved_rwsem);
+ iommufd_put_object(&sobj->obj);
+ return 0;
+}
+
/* Check that every pfn under each iova matches the pfn under a user VA */
static int iommufd_test_md_check_pa(struct iommufd_ucmd *ucmd,
unsigned int mockpt_id, unsigned long iova,
@@ -1025,6 +1101,12 @@ int iommufd_test(struct iommufd_ucmd *ucmd)
return iommufd_test_add_reserved(ucmd, cmd->id,
cmd->add_reserved.start,
cmd->add_reserved.length);
+ case IOMMU_TEST_OP_DEV_ADD_RESERVED:
+ return iommufd_test_dev_add_reserved(ucmd, cmd->id,
+ cmd->add_dev_reserved.start,
+ cmd->add_dev_reserved.length);
+ case IOMMU_TEST_OP_DEV_DEL_RESERVED:
+ return iommufd_test_dev_del_reserved(ucmd, cmd->id);
case IOMMU_TEST_OP_MOCK_DOMAIN:
return iommufd_test_mock_domain(ucmd, cmd);
case IOMMU_TEST_OP_MOCK_DOMAIN_REPLACE:
--
2.34.1
next prev parent reply other threads:[~2023-07-24 11:05 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-24 11:03 [PATCH v3 00/17] iommufd: Add nesting infrastructure Yi Liu
2023-07-24 11:03 ` [PATCH v3 01/17] iommu: Add new iommu op to create domains owned by userspace Yi Liu
2023-07-28 9:37 ` Tian, Kevin
2023-07-28 16:56 ` Jason Gunthorpe
2023-07-31 12:44 ` Liu, Yi L
2023-07-31 13:19 ` Jason Gunthorpe
2023-08-03 2:28 ` Nicolin Chen
2023-07-24 11:03 ` [PATCH v3 02/17] iommu: Add nested domain support Yi Liu
2023-07-28 9:38 ` Tian, Kevin
2023-07-28 16:59 ` Jason Gunthorpe
2023-08-03 2:36 ` Nicolin Chen
2023-08-03 2:53 ` Liu, Yi L
2023-08-03 3:04 ` Nicolin Chen
2023-07-24 11:03 ` [PATCH v3 03/17] iommufd/hw_pagetable: Use domain_alloc_user op for domain allocation Yi Liu
2023-07-28 9:39 ` Tian, Kevin
2023-07-24 11:03 ` [PATCH v3 04/17] iommufd: Pass in hwpt_type/parent/user_data to iommufd_hw_pagetable_alloc() Yi Liu
2023-07-28 9:49 ` Tian, Kevin
2023-07-24 11:03 ` [PATCH v3 05/17] iommufd/hw_pagetable: Do not populate user-managed hw_pagetables Yi Liu
2023-07-28 9:51 ` Tian, Kevin
2023-07-24 11:03 ` [PATCH v3 06/17] iommufd: Only enforce IOMMU_RESV_SW_MSI when attaching user-managed HWPT Yi Liu
2023-07-28 10:02 ` Tian, Kevin
2023-07-28 17:06 ` Jason Gunthorpe
2023-07-24 11:03 ` [PATCH v3 07/17] iommufd: Add IOMMU_RESV_IOVA_RANGES Yi Liu
2023-07-28 10:07 ` Tian, Kevin
2023-07-28 17:16 ` Jason Gunthorpe
2023-07-31 6:14 ` Tian, Kevin
2023-07-31 13:12 ` Jason Gunthorpe
2023-07-28 17:44 ` Jason Gunthorpe
2023-07-31 6:21 ` Tian, Kevin
2023-07-31 9:53 ` Liu, Yi L
2023-07-31 13:23 ` Jason Gunthorpe
2023-08-01 2:40 ` Tian, Kevin
2023-08-01 18:22 ` Jason Gunthorpe
2023-08-02 1:09 ` Tian, Kevin
2023-08-02 12:22 ` Jason Gunthorpe
2023-08-03 1:23 ` Nicolin Chen
2023-08-03 1:25 ` Tian, Kevin
2023-08-03 2:17 ` Nicolin Chen
2023-07-24 11:03 ` [PATCH v3 08/17] iommufd: IOMMU_HWPT_ALLOC allocation with user data Yi Liu
2023-07-28 17:55 ` Jason Gunthorpe
2023-07-28 19:10 ` Nicolin Chen
2023-07-31 7:22 ` Liu, Yi L
2023-07-31 6:31 ` Tian, Kevin
2023-07-31 13:16 ` Jason Gunthorpe
2023-08-01 2:35 ` Tian, Kevin
2023-08-02 23:42 ` Nicolin Chen
2023-08-02 23:43 ` Jason Gunthorpe
2023-08-03 0:53 ` Nicolin Chen
2023-08-03 16:47 ` Jason Gunthorpe
2023-07-24 11:03 ` [PATCH v3 09/17] iommufd: Add IOMMU_HWPT_INVALIDATE Yi Liu
2023-07-28 18:02 ` Jason Gunthorpe
2023-07-31 10:07 ` Liu, Yi L
2023-07-31 13:19 ` Jason Gunthorpe
2023-08-03 2:16 ` Nicolin Chen
2023-08-03 3:07 ` Liu, Yi L
2023-08-03 3:13 ` Nicolin Chen
2023-08-03 2:56 ` Liu, Yi L
2023-08-03 2:07 ` Nicolin Chen
2023-07-24 11:03 ` [PATCH v3 10/17] iommufd/selftest: Add a helper to get test device Yi Liu
2023-07-24 11:04 ` Yi Liu [this message]
2023-07-24 11:04 ` [PATCH v3 12/17] iommufd/selftest: Add .get_resv_regions() for mock_dev Yi Liu
2023-07-24 11:04 ` [PATCH v3 13/17] iommufd/selftest: Add coverage for IOMMU_RESV_IOVA_RANGES Yi Liu
2023-07-24 11:04 ` [PATCH v3 14/17] iommufd/selftest: Add domain_alloc_user() support in iommu mock Yi Liu
2023-07-24 11:04 ` [PATCH v3 15/17] iommufd/selftest: Add coverage for IOMMU_HWPT_ALLOC with user data Yi Liu
2023-07-24 11:04 ` [PATCH v3 16/17] iommufd/selftest: Add IOMMU_TEST_OP_MD_CHECK_IOTLB test op Yi Liu
2023-07-24 11:04 ` [PATCH v3 17/17] iommufd/selftest: Add coverage for IOMMU_HWPT_INVALIDATE ioctl Yi Liu
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=20230724110406.107212-12-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=baolu.lu@linux.intel.com \
--cc=chao.p.peng@linux.intel.com \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=iommu@lists.linux.dev \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=yi.y.sun@linux.intel.com \
--cc=zhenzhong.duan@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