iommufd/selftest: Return the real idev id from selftest mock_domain

Now that we actually call iommufd_device_bind() we can return the
idev_id from that function to userspace for use in other APIs.

Link: https://lore.kernel.org/r/18-v8-6659224517ea+532-iommufd_alloc_jgg@nvidia.com
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h
index e3f1035cbd64644c9d2844567ac08b0a54513029..dd9168a20ddf4c08be380373890895b61c8b3ec0 100644 (file)
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -52,6 +52,8 @@ struct iommu_test_cmd {
                struct {
                        __u32 out_stdev_id;
                        __u32 out_hwpt_id;
+                       /* out_idev_id is the standard iommufd_bind object */
+                       __u32 out_idev_id;
                } mock_domain;
                struct {
                        __u32 pt_id;

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index eb33dffb955dcfe4b8309b620d641c07edf619fa..9d43334e4faf1691cad58380a675538bb75bfd0d 100644 (file)
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -443,6 +443,7 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd *ucmd,
        /* Userspace must destroy the device_id to destroy the object */
        cmd->mock_domain.out_hwpt_id = pt_id;
        cmd->mock_domain.out_stdev_id = sobj->obj.id;
+       cmd->mock_domain.out_idev_id = idev_id;
        iommufd_object_finalize(ucmd->ictx, &sobj->obj);
        return iommufd_ucmd_respond(ucmd, sizeof(*cmd));
 

diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c
index 96881ecca5c757950eb55beba30f46593c9d4951..78841aba47d038582a3bf4d9cfa7bf06a89dc2a2 100644 (file)
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -211,7 +211,7 @@ FIXTURE_SETUP(iommufd_ioas)
 
        for (i = 0; i != variant->mock_domains; i++) {
                test_cmd_mock_domain(self->ioas_id, &self->stdev_id,
-                                    &self->hwpt_id);
+                                    &self->hwpt_id, NULL);
                self->base_iova = MOCK_APERTURE_START;
        }
 }
@@ -262,7 +262,7 @@ TEST_F(iommufd_ioas, hwpt_attach)
 {
        /* Create a device attached directly to a hwpt */
        if (self->stdev_id) {
-               test_cmd_mock_domain(self->hwpt_id, NULL, NULL);
+               test_cmd_mock_domain(self->hwpt_id, NULL, NULL, NULL);
        } else {
                test_err_mock_domain(ENOENT, self->hwpt_id, NULL, NULL);
        }
@@ -681,7 +681,7 @@ TEST_F(iommufd_ioas, access_pin)
                                   _IOMMU_TEST_CMD(IOMMU_TEST_OP_ACCESS_PAGES),
                                   &access_cmd));
                test_cmd_mock_domain(self->ioas_id, &mock_stdev_id,
-                                    &mock_hwpt_id);
+                                    &mock_hwpt_id, NULL);
                check_map_cmd.id = mock_hwpt_id;
                ASSERT_EQ(0, ioctl(self->fd,
                                   _IOMMU_TEST_CMD(IOMMU_TEST_OP_MD_CHECK_MAP),
@@ -836,7 +836,7 @@ TEST_F(iommufd_ioas, fork_gone)
                 * If a domain already existed then everything was pinned within
                 * the fork, so this copies from one domain to another.
                 */
-               test_cmd_mock_domain(self->ioas_id, NULL, NULL);
+               test_cmd_mock_domain(self->ioas_id, NULL, NULL, NULL);
                check_access_rw(_metadata, self->fd, access_id,
                                MOCK_APERTURE_START, 0);
 
@@ -885,7 +885,7 @@ TEST_F(iommufd_ioas, fork_present)
        ASSERT_EQ(8, read(efd, &tmp, sizeof(tmp)));
 
        /* Read pages from the remote process */
-       test_cmd_mock_domain(self->ioas_id, NULL, NULL);
+       test_cmd_mock_domain(self->ioas_id, NULL, NULL, NULL);
        check_access_rw(_metadata, self->fd, access_id, MOCK_APERTURE_START, 0);
 
        ASSERT_EQ(0, close(pipefds[1]));
@@ -1033,6 +1033,7 @@ FIXTURE(iommufd_mock_domain)
        uint32_t hwpt_id;
        uint32_t hwpt_ids[2];
        uint32_t stdev_ids[2];
+       uint32_t idev_ids[2];
        int mmap_flags;
        size_t mmap_buf_size;
 };
@@ -1055,7 +1056,7 @@ FIXTURE_SETUP(iommufd_mock_domain)
 
        for (i = 0; i != variant->mock_domains; i++)
                test_cmd_mock_domain(self->ioas_id, &self->stdev_ids[i],
-                                    &self->hwpt_ids[i]);
+                                    &self->hwpt_ids[i], &self->idev_ids[i]);
        self->hwpt_id = self->hwpt_ids[0];
 
        self->mmap_flags = MAP_SHARED | MAP_ANONYMOUS;
@@ -1249,7 +1250,7 @@ TEST_F(iommufd_mock_domain, all_aligns_copy)
                        /* Add and destroy a domain while the area exists */
                        old_id = self->hwpt_ids[1];
                        test_cmd_mock_domain(self->ioas_id, &mock_stdev_id,
-                                            &self->hwpt_ids[1]);
+                                            &self->hwpt_ids[1], NULL);
 
                        check_mock_iova(buf + start, iova, length);
                        check_refs(buf + start / PAGE_SIZE * PAGE_SIZE,
@@ -1458,7 +1459,7 @@ FIXTURE_SETUP(vfio_compat_mock_domain)
 
        /* Create what VFIO would consider a group */
        test_ioctl_ioas_alloc(&self->ioas_id);
-       test_cmd_mock_domain(self->ioas_id, NULL, NULL);
+       test_cmd_mock_domain(self->ioas_id, NULL, NULL, NULL);
 
        /* Attach it to the vfio compat */
        vfio_ioas_cmd.ioas_id = self->ioas_id;

diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c b/tools/testing/selftests/iommu/iommufd_fail_nth.c
index 96fb2f04623f236bc089789b53990fb913645289..8ab20df4edc8c78110b630eaca6852145d147ca5 100644 (file)
--- a/tools/testing/selftests/iommu/iommufd_fail_nth.c
+++ b/tools/testing/selftests/iommu/iommufd_fail_nth.c
@@ -315,7 +315,7 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain)
 
        fail_nth_enable();
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
                return -1;
 
        if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -326,7 +326,7 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain)
        if (_test_ioctl_destroy(self->fd, stdev_id))
                return -1;
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
                return -1;
        return 0;
 }
@@ -350,12 +350,13 @@ TEST_FAIL_NTH(basic_fail_nth, map_two_domains)
        if (_test_ioctl_set_temp_memory_limit(self->fd, 32))
                return -1;
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
                return -1;
 
        fail_nth_enable();
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2,
+                                 NULL))
                return -1;
 
        if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -369,9 +370,10 @@ TEST_FAIL_NTH(basic_fail_nth, map_two_domains)
        if (_test_ioctl_destroy(self->fd, stdev_id2))
                return -1;
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
                return -1;
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2,
+                                 NULL))
                return -1;
        return 0;
 }
@@ -528,7 +530,7 @@ TEST_FAIL_NTH(basic_fail_nth, access_pin_domain)
        if (_test_ioctl_set_temp_memory_limit(self->fd, 32))
                return -1;
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
                return -1;
 
        if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, BUFFER_SIZE, &iova,
@@ -603,7 +605,7 @@ TEST_FAIL_NTH(basic_fail_nth, device)
 
        fail_nth_enable();
 
-       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, NULL))
+       if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, NULL, NULL))
                return -1;
 
        if (_test_cmd_mock_domain_replace(self->fd, stdev_id, ioas_id2, NULL))

diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index 8b11bb700952698a1cc3b43b9169020003718b8b..62e01412a7679e8b492da259e383e52a8efef8ad 100644 (file)
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -41,7 +41,7 @@ static unsigned long PAGE_SIZE;
        })
 
 static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *stdev_id,
-                                __u32 *hwpt_id)
+                                __u32 *hwpt_id, __u32 *idev_id)
 {
        struct iommu_test_cmd cmd = {
                .size = sizeof(cmd),
@@ -59,14 +59,16 @@ static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *stdev_id,
        assert(cmd.id != 0);
        if (hwpt_id)
                *hwpt_id = cmd.mock_domain.out_hwpt_id;
+       if (idev_id)
+               *idev_id = cmd.mock_domain.out_idev_id;
        return 0;
 }
-#define test_cmd_mock_domain(ioas_id, stdev_id, hwpt_id) \
-       ASSERT_EQ(0,                                     \
-                 _test_cmd_mock_domain(self->fd, ioas_id, stdev_id, hwpt_id))
+#define test_cmd_mock_domain(ioas_id, stdev_id, hwpt_id, idev_id)       \
+       ASSERT_EQ(0, _test_cmd_mock_domain(self->fd, ioas_id, stdev_id, \
+                                          hwpt_id, idev_id))
 #define test_err_mock_domain(_errno, ioas_id, stdev_id, hwpt_id)      \
        EXPECT_ERRNO(_errno, _test_cmd_mock_domain(self->fd, ioas_id, \
-                                                  stdev_id, hwpt_id))
+                                                  stdev_id, hwpt_id, NULL))
 
 static int _test_cmd_mock_domain_replace(int fd, __u32 stdev_id, __u32 pt_id,
                                         __u32 *hwpt_id)