The two callbacks are needed to make pasid_attach/detach path complete for
mock device. A nop is enough for set_dev_pasid, a domain type check in the
remove_dev_pasid is also helpful.

Signed-off-by: Yi Liu <yi.l....@intel.com>
---
 drivers/iommu/iommufd/selftest.c | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 222cfc11ebfd..7fd8dc5a667f 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -539,6 +539,30 @@ static int mock_dev_disable_feat(struct device *dev, enum 
iommu_dev_features fea
        return 0;
 }
 
+static void mock_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid,
+                                       struct iommu_domain *domain)
+{
+       /* Domain type specific cleanup: */
+       if (domain) {
+               switch (domain->type) {
+               case IOMMU_DOMAIN_NESTED:
+               case IOMMU_DOMAIN_UNMANAGED:
+                       break;
+               default:
+                       /* should never reach here */
+                       WARN_ON(1);
+                       break;
+               }
+       }
+}
+
+static int mock_domain_set_dev_pasid_nop(struct iommu_domain *domain,
+                                        struct device *dev, ioasid_t pasid,
+                                        struct iommu_domain *old)
+{
+       return 0;
+}
+
 static const struct iommu_ops mock_ops = {
        /*
         * IOMMU_DOMAIN_BLOCKED cannot be returned from def_domain_type()
@@ -558,6 +582,7 @@ static const struct iommu_ops mock_ops = {
        .dev_enable_feat = mock_dev_enable_feat,
        .dev_disable_feat = mock_dev_disable_feat,
        .user_pasid_table = true,
+       .remove_dev_pasid = mock_iommu_remove_dev_pasid,
        .default_domain_ops =
                &(struct iommu_domain_ops){
                        .free = mock_domain_free,
@@ -565,6 +590,7 @@ static const struct iommu_ops mock_ops = {
                        .map_pages = mock_domain_map_pages,
                        .unmap_pages = mock_domain_unmap_pages,
                        .iova_to_phys = mock_domain_iova_to_phys,
+                       .set_dev_pasid = mock_domain_set_dev_pasid_nop,
                },
 };
 
@@ -629,6 +655,7 @@ static struct iommu_domain_ops domain_nested_ops = {
        .free = mock_domain_free_nested,
        .attach_dev = mock_domain_nop_attach,
        .cache_invalidate_user = mock_domain_cache_invalidate_user,
+       .set_dev_pasid = mock_domain_set_dev_pasid_nop,
 };
 
 static inline struct iommufd_hw_pagetable *
@@ -689,6 +716,10 @@ static void mock_dev_release(struct device *dev)
 
 static struct mock_dev *mock_dev_create(unsigned long dev_flags)
 {
+       struct property_entry prop[] = {
+               PROPERTY_ENTRY_U32("pasid-num-bits", 20),
+               {},
+       };
        struct mock_dev *mdev;
        int rc;
 
@@ -714,6 +745,12 @@ static struct mock_dev *mock_dev_create(unsigned long 
dev_flags)
        if (rc)
                goto err_put;
 
+       rc = device_create_managed_software_node(&mdev->dev, prop, NULL);
+       if (rc) {
+               dev_err(&mdev->dev, "add pasid-num-bits property failed, rc: 
%d", rc);
+               goto err_put;
+       }
+
        rc = device_add(&mdev->dev);
        if (rc)
                goto err_put;
@@ -1549,6 +1586,7 @@ int __init iommufd_test_init(void)
                goto err_sysfs;
 
        mock_iommu_iopf_queue = iopf_queue_alloc("mock-iopfq");
+       mock_iommu_device.max_pasids = (1 << 20);
 
        return 0;
 
-- 
2.34.1


Reply via email to