Commit f8406f65 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

iommufd/selftest: Rename the remaining mock device_id's to stdev_id 

For consistency.

Link: https://lore.kernel.org/r/10-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 11a86ae9

tools/testing/selftests/iommu/iommufd.c

+6 −6
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ TEST_F(iommufd_ioas, access_pin) 
			       MOCK_FLAGS_ACCESS_CREATE_NEEDS_PIN_PAGES);



	for (npages = 1; npages < BUFFER_SIZE / PAGE_SIZE; npages++) {

		uint32_t mock_device_id;

		uint32_t mock_stdev_id;

		uint32_t mock_hwpt_id;



		access_cmd.access_pages.length = npages * PAGE_SIZE;
@@ -637,14 +637,14 @@ TEST_F(iommufd_ioas, access_pin) 
		ASSERT_EQ(0, ioctl(self->fd,

				   _IOMMU_TEST_CMD(IOMMU_TEST_OP_ACCESS_PAGES),

				   &access_cmd));

		test_cmd_mock_domain(self->ioas_id, &mock_device_id,

		test_cmd_mock_domain(self->ioas_id, &mock_stdev_id,

				     &mock_hwpt_id);

		check_map_cmd.id = mock_hwpt_id;

		ASSERT_EQ(0, ioctl(self->fd,

				   _IOMMU_TEST_CMD(IOMMU_TEST_OP_MD_CHECK_MAP),

				   &check_map_cmd));



		test_ioctl_destroy(mock_device_id);

		test_ioctl_destroy(mock_stdev_id);

		test_ioctl_destroy(mock_hwpt_id);

		test_cmd_destroy_access_pages(

			access_cmd.id,
@@ -1197,14 +1197,14 @@ TEST_F(iommufd_mock_domain, all_aligns_copy) 
		for (; end < buf_size; end += MOCK_PAGE_SIZE) {

			size_t length = end - start;

			unsigned int old_id;

			uint32_t mock_device_id;

			uint32_t mock_stdev_id;

			__u64 iova;



			test_ioctl_ioas_map(buf + start, length, &iova);



			/* Add and destroy a domain while the area exists */

			old_id = self->hwpt_ids[1];

			test_cmd_mock_domain(self->ioas_id, &mock_device_id,

			test_cmd_mock_domain(self->ioas_id, &mock_stdev_id,

					     &self->hwpt_ids[1]);



			check_mock_iova(buf + start, iova, length);
@@ -1213,7 +1213,7 @@ TEST_F(iommufd_mock_domain, all_aligns_copy) 
					   start / PAGE_SIZE * PAGE_SIZE,

				   1);



			test_ioctl_destroy(mock_device_id);

			test_ioctl_destroy(mock_stdev_id);

			test_ioctl_destroy(self->hwpt_ids[1]);

			self->hwpt_ids[1] = old_id;

tools/testing/selftests/iommu/iommufd_fail_nth.c

+15 −15
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ TEST_FAIL_NTH(basic_fail_nth, basic) 
TEST_FAIL_NTH(basic_fail_nth, map_domain)

{

	uint32_t ioas_id;

	__u32 device_id;

	__u32 stdev_id;

	__u32 hwpt_id;

	__u64 iova;
@@ -313,7 +313,7 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain) 


	fail_nth_enable();



	if (_test_cmd_mock_domain(self->fd, ioas_id, &device_id, &hwpt_id))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))

		return -1;



	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -321,12 +321,12 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain) 
					 IOMMU_IOAS_MAP_READABLE))

		return -1;



	if (_test_ioctl_destroy(self->fd, device_id))

	if (_test_ioctl_destroy(self->fd, stdev_id))

		return -1;

	if (_test_ioctl_destroy(self->fd, hwpt_id))

		return -1;



	if (_test_cmd_mock_domain(self->fd, ioas_id, &device_id, &hwpt_id))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))

		return -1;

	return 0;

}
@@ -334,8 +334,8 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain) 
TEST_FAIL_NTH(basic_fail_nth, map_two_domains)

{

	uint32_t ioas_id;

	__u32 device_id2;

	__u32 device_id;

	__u32 stdev_id2;

	__u32 stdev_id;

	__u32 hwpt_id2;

	__u32 hwpt_id;

	__u64 iova;
@@ -350,12 +350,12 @@ 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, &device_id, &hwpt_id))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))

		return -1;



	fail_nth_enable();



	if (_test_cmd_mock_domain(self->fd, ioas_id, &device_id2, &hwpt_id2))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2))

		return -1;



	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -363,19 +363,19 @@ TEST_FAIL_NTH(basic_fail_nth, map_two_domains) 
					 IOMMU_IOAS_MAP_READABLE))

		return -1;



	if (_test_ioctl_destroy(self->fd, device_id))

	if (_test_ioctl_destroy(self->fd, stdev_id))

		return -1;

	if (_test_ioctl_destroy(self->fd, hwpt_id))

		return -1;



	if (_test_ioctl_destroy(self->fd, device_id2))

	if (_test_ioctl_destroy(self->fd, stdev_id2))

		return -1;

	if (_test_ioctl_destroy(self->fd, hwpt_id2))

		return -1;



	if (_test_cmd_mock_domain(self->fd, ioas_id, &device_id, &hwpt_id))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))

		return -1;

	if (_test_cmd_mock_domain(self->fd, ioas_id, &device_id2, &hwpt_id2))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2))

		return -1;

	return 0;

}
@@ -518,7 +518,7 @@ TEST_FAIL_NTH(basic_fail_nth, access_pin_domain) 
{

	uint32_t access_pages_id;

	uint32_t ioas_id;

	__u32 device_id;

	__u32 stdev_id;

	__u32 hwpt_id;

	__u64 iova;
@@ -532,7 +532,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, &device_id, &hwpt_id))

	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id))

		return -1;



	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, BUFFER_SIZE, &iova,
@@ -570,7 +570,7 @@ TEST_FAIL_NTH(basic_fail_nth, access_pin_domain) 
		return -1;

	self->access_id = 0;



	if (_test_ioctl_destroy(self->fd, device_id))

	if (_test_ioctl_destroy(self->fd, stdev_id))

		return -1;

	if (_test_ioctl_destroy(self->fd, hwpt_id))

		return -1;