[PATCH v1 11/13] iommufd/selftest: Add MOCK_FLAGS_DEVICE_NO_ATTACH

[Nicolin Chen]

Add a new MOCK_FLAGS_DEVICE_NO_ATTACH flag to allow the mock_domain cmd to
bypass the attach step, as IOMMU_OPTION_SW_MSI_START/SIZE only allow users
to set prior to an IOAS/HWPT attachment.

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

diff --git a/drivers/iommu/iommufd/iommufd_test.h 
b/drivers/iommu/iommufd/iommufd_test.h
index a6b7a163f636..02be242f8f34 100644
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -48,6 +48,7 @@ enum {
 enum {
        MOCK_FLAGS_DEVICE_NO_DIRTY = 1 << 0,
        MOCK_FLAGS_DEVICE_HUGE_IOVA = 1 << 1,
+       MOCK_FLAGS_DEVICE_NO_ATTACH = 1 << 2,
 };
 
 enum {
diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index d40deb0a4f06..37a5cb89e27c 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -839,11 +839,13 @@ static void mock_dev_release(struct device *dev)
 
 static struct mock_dev *mock_dev_create(unsigned long dev_flags)
 {
+       const u32 SUPPORTED_FLAGS = MOCK_FLAGS_DEVICE_NO_DIRTY |
+                                   MOCK_FLAGS_DEVICE_HUGE_IOVA |
+                                   MOCK_FLAGS_DEVICE_NO_ATTACH;
        struct mock_dev *mdev;
        int rc, i;
 
-       if (dev_flags &
-           ~(MOCK_FLAGS_DEVICE_NO_DIRTY | MOCK_FLAGS_DEVICE_HUGE_IOVA))
+       if (dev_flags & ~SUPPORTED_FLAGS)
                return ERR_PTR(-EINVAL);
 
        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
@@ -921,9 +923,13 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd 
*ucmd,
        }
        sobj->idev.idev = idev;
 
-       rc = iommufd_device_attach(idev, &pt_id);
-       if (rc)
-               goto out_unbind;
+       if (dev_flags & MOCK_FLAGS_DEVICE_NO_ATTACH) {
+               pt_id = 0;
+       } else {
+               rc = iommufd_device_attach(idev, &pt_id);
+               if (rc)
+                       goto out_unbind;
+       }
 
        /* Userspace must destroy the device_id to destroy the object */
        cmd->mock_domain.out_hwpt_id = pt_id;
@@ -936,7 +942,8 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd 
*ucmd,
        return 0;
 
 out_detach:
-       iommufd_device_detach(idev);
+       if (!(dev_flags & MOCK_FLAGS_DEVICE_NO_ATTACH))
+               iommufd_device_detach(idev);
 out_unbind:
        iommufd_device_unbind(idev);
 out_mdev:
@@ -1603,7 +1610,8 @@ void iommufd_selftest_destroy(struct iommufd_object *obj)
 
        switch (sobj->type) {
        case TYPE_IDEV:
-               iommufd_device_detach(sobj->idev.idev);
+               if (!(sobj->idev.mock_dev->flags & MOCK_FLAGS_DEVICE_NO_ATTACH))
+                       iommufd_device_detach(sobj->idev.idev);
                iommufd_device_unbind(sobj->idev.idev);
                mock_dev_destroy(sobj->idev.mock_dev);
                break;
-- 
2.43.0