Commit 2cfdeaa0 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 339fbf3a

drivers/iommu/iommufd/iommufd_test.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/iommu/iommufd/selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

tools/testing/selftests/iommu/iommufd_utils.h

+8 −8
Original line number Diff line number Diff line
@@ -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)