The new IOMMU_OPTION_SW_MSI_START/SIZE must not overlap with any existing
device reserved region, so add a testing region [0x80000000, 0x8fffffff],
on top of the normal IOVA aperture for selftest program to run an overlap
test.

Signed-off-by: Nicolin Chen <nicol...@nvidia.com>
---
 drivers/iommu/iommufd/iommufd_test.h |  3 +++
 drivers/iommu/iommufd/selftest.c     | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/iommufd/iommufd_test.h 
b/drivers/iommu/iommufd/iommufd_test.h
index 02be242f8f34..53e2e30570fc 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -213,4 +213,7 @@ struct iommu_viommu_invalidate_selftest {
        __u32 cache_id;
 };
 
+#define IOMMU_TEST_RESV_BASE 0x80000000UL
+#define IOMMU_TEST_RESV_LENGTH 0x10000000UL
+
 #endif
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 37a5cb89e27c..f4ac443d73d6 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -13,6 +13,7 @@
 #include <linux/xarray.h>
 #include <uapi/linux/iommufd.h>
 
+#include "../dma-iommu.h"
 #include "../iommu-priv.h"
 #include "io_pagetable.h"
 #include "iommufd_private.h"
@@ -379,7 +380,8 @@ mock_domain_alloc_paging_flags(struct device *dev, u32 
flags,
        if (!mock)
                return ERR_PTR(-ENOMEM);
        mock->domain.geometry.aperture_start = MOCK_APERTURE_START;
-       mock->domain.geometry.aperture_end = MOCK_APERTURE_LAST;
+       mock->domain.geometry.aperture_end =
+               MOCK_APERTURE_LAST + IOMMU_TEST_RESV_LENGTH;
        mock->domain.pgsize_bitmap = MOCK_IO_PAGE_SIZE;
        if (dev && mdev->flags & MOCK_FLAGS_DEVICE_HUGE_IOVA)
                mock->domain.pgsize_bitmap |= MOCK_HUGE_PAGE_SIZE;
@@ -567,6 +569,20 @@ static int mock_dev_disable_feat(struct device *dev, enum 
iommu_dev_features fea
        return 0;
 }
 
+static void mock_dev_get_resv_regions(struct device *dev,
+                                     struct list_head *head)
+{
+       const int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO;
+       struct iommu_resv_region *region;
+
+       region = iommu_alloc_resv_region(IOMMU_TEST_RESV_BASE,
+                                        IOMMU_TEST_RESV_LENGTH, prot,
+                                        IOMMU_RESV_RESERVED, GFP_KERNEL);
+       if (!region)
+               return;
+       list_add_tail(&region->list, head);
+}
+
 static void mock_viommu_destroy(struct iommufd_viommu *viommu)
 {
        struct mock_iommu_device *mock_iommu = container_of(
@@ -711,6 +727,7 @@ static const struct iommu_ops mock_ops = {
        .page_response = mock_domain_page_response,
        .dev_enable_feat = mock_dev_enable_feat,
        .dev_disable_feat = mock_dev_disable_feat,
+       .get_resv_regions = mock_dev_get_resv_regions,
        .user_pasid_table = true,
        .viommu_alloc = mock_viommu_alloc,
        .default_domain_ops =
-- 
2.43.0


Reply via email to