iommufd/selftest: Rename the sefltest 'device_id' to 'stdev_id'

It is too confusing now that we have the 'dev_id' as part of the main
interface. Make it clear this is the special selftest device object. This
object is analogous to the VFIO device FD.

Link: https://lore.kernel.org/r/7-v3-ae9c2975a131+2e1e8-iommufd_hwpt_jgg@nvidia.com
Reviewed-by: Kevin Tian <kevin.tian@intel.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 1d96a8f466fd2990667adc826ddb4bdf34534451..b3d69cca77295caf8ddc8e17f038bfd743b55410 100644 (file)
--- a/drivers/iommu/iommufd/iommufd_test.h
+++ b/drivers/iommu/iommufd/iommufd_test.h
@@ -49,7 +49,7 @@ struct iommu_test_cmd {
                        __aligned_u64 length;
                } add_reserved;
                struct {
-                       __u32 out_device_id;
+                       __u32 out_stdev_id;
                        __u32 out_hwpt_id;
                } mock_domain;
                struct {

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index cfb5fe9a5e0ee8664518158a7176c909ee8a9c06..e05b41059630a7cf5d42bb00b36df816017df886 100644 (file)
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -302,7 +302,7 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd *ucmd,
 
        /* Userspace must destroy both of these IDs to destroy the object */
        cmd->mock_domain.out_hwpt_id = hwpt->obj.id;
-       cmd->mock_domain.out_device_id = sobj->obj.id;
+       cmd->mock_domain.out_stdev_id = sobj->obj.id;
        iommufd_object_finalize(ucmd->ictx, &sobj->obj);
        iommufd_put_object(&ioas->obj);
        return iommufd_ucmd_respond(ucmd, sizeof(*cmd));

diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index 0d1f46369c2a30409d8ada98eb73629ee802b0ea..85d6662ef8e86785d276e94ef903ec9c060b5a5b 100644 (file)
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -38,7 +38,7 @@ static unsigned long BUFFER_SIZE;
                                &test_cmd));                                  \
        })
 
-static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *device_id,
+static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *stdev_id,
                                 __u32 *hwpt_id)
 {
        struct iommu_test_cmd cmd = {
@@ -52,19 +52,19 @@ static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *device_id,
        ret = ioctl(fd, IOMMU_TEST_CMD, &cmd);
        if (ret)
                return ret;
-       if (device_id)
-               *device_id = cmd.mock_domain.out_device_id;
+       if (stdev_id)
+               *stdev_id = cmd.mock_domain.out_stdev_id;
        assert(cmd.id != 0);
        if (hwpt_id)
                *hwpt_id = cmd.mock_domain.out_hwpt_id;
        return 0;
 }
-#define test_cmd_mock_domain(ioas_id, device_id, hwpt_id)                \
-       ASSERT_EQ(0, _test_cmd_mock_domain(self->fd, ioas_id, device_id, \
-                                          hwpt_id))
-#define test_err_mock_domain(_errno, ioas_id, device_id, hwpt_id)     \
+#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_err_mock_domain(_errno, ioas_id, stdev_id, hwpt_id)      \
        EXPECT_ERRNO(_errno, _test_cmd_mock_domain(self->fd, ioas_id, \
-                                                  device_id, hwpt_id))
+                                                  stdev_id, hwpt_id))
 
 static int _test_cmd_create_access(int fd, unsigned int ioas_id,
                                   __u32 *access_id, unsigned int flags)