Received-SPF: pass (google.com: domain of linux-kernel+bounces-122998-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <b6d884e9-f191-4ece-8d9e-51ee72d7b28f@oracle.com>
Date: Thu, 28 Mar 2024 13:54:45 +0000
From: Joao Martins <joao.m.martins@oracle.com>
Subject: Re: [BUG] seltests/iommu: runaway ./iommufd consuming 99% CPU after a
 failed assert()
To: Mirsad Todorovac <mirsad.todorovac@alu.unizg.hr>,
        Jason Gunthorpe <jgg@nvidia.com>
Cc: iommu@lists.linux.dev, Kevin Tian <kevin.tian@intel.com>,
        Shuah Khan <shuah@kernel.org>, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <0d5c3b29-fc5b-41d9-9556-5ce94262dac8@alu.unizg.hr>
 <20240319135852.GA393211@nvidia.com>
 <a692d5d7-11d5-4c1b-9abc-208d2194ccde@alu.unizg.hr>
 <cdc9c46b-1bad-41cd-8f98-38cc2171186a@oracle.com>
 <20240325135207.GC6245@nvidia.com>
 <f8e03425-98cf-4076-8959-d85eda846bab@oracle.com>
 <08a13b79-e94a-4f80-96e9-ce223d928b3e@alu.unizg.hr>
Content-Language: en-US
In-Reply-To: <08a13b79-e94a-4f80-96e9-ce223d928b3e@alu.unizg.hr>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?dWVtWmxYeHNmKy8vVUVZMmlWLzVMbmhZb3g1c013K1ZFSlM2R3BPclJzM1Ur?=
 =?utf-8?B?ejVmY09JeitJb0NtNVhmamhTc2R5bTM3UGlZQTV3K0EyaWo5Zys0b09mY2h6?=
 =?utf-8?B?RVdlRTkwZGtkSmdUWUlRVG9tNEUrU3kvRWJ5emY4SEFmaENxaExicCsvY0pN?=
 =?utf-8?B?dTlxWTlFWHdOSjdhak4vRkQ1a204a1VkeFZwQjJDY3I0TFBqNlB4L1BENHRp?=
 =?utf-8?B?RlhGODNCREdLdk5XSG8rY3dkQlZabjdVUlk3ZHJpU0FpWG9zZnp3bmN3RU00?=
 =?utf-8?B?MzFTQkFNRXJUTEFMc3M2eDl3Ykw4b2tZRHF3SnVLRmYxd1ZIdEdzczd4SWpo?=
 =?utf-8?B?ZnlhdlRlMkRCSFZjWnBJam9qd1JQZUFYSnVKUmZESXJhQnZYSmZpV05CWlBz?=
 =?utf-8?B?dGhVM3JmZzdHTTNZQVVFdTZwWTgyeG9IR1MzMnlxcEtxN1RQYWtuV0x6aHV1?=
 =?utf-8?B?L0NtYXRBSEVwU3c2NE8vVXlEWGpEYzlVSXBhaVYrMDJGNCs2Wnc4UmJwUmsy?=
 =?utf-8?B?SktTR2tZOU5nWGRBSHhoa0ZVUTRiM1dESDhWSUQyUjdHeHNOK2VQT0xrR1Iz?=
 =?utf-8?B?RlFVZzJsait0QlpmL09ZOG9BSlFDdC9MUTAvUjNvTm1ZMXJMdFJUdUhoQjI4?=
 =?utf-8?B?QlpwaEpidUFIYlBVbE5sVjdDSU5Ub001UGtWN29HYUx5TE1FU1oxc1gwdTR0?=
 =?utf-8?B?M25IOGt1dGozajVUMG1PcXE3TDVnMHM4eUhNcHVvRGFzL3RkV2lsOXRDTHRC?=
 =?utf-8?B?VTBsY1VvbEdoK1cvUjU2UmQ2eW1Rc3c5Qmc1VzZuZldpb21xR3o3cjd0bTlZ?=
 =?utf-8?B?MEJmRXlVT2FyVlQ5Ky9tbFljeFZpVTBzcWFTUitoSFJ1cTAvYTY0QnRNTy9X?=
 =?utf-8?B?S0U1RjIvSVhQNmNxWVArTzlKeUIrVkdsL25URWpOZUdpaU9neWI1bWhROFoz?=
 =?utf-8?B?S2ZpTk55cERTa2p5bENIMEpEa3dGQXNnOTNUa28xK09MalBmaFlYVnVBb0cv?=
 =?utf-8?B?cjBua2t2L0ZyOFQwWGRNNEZjdGQwL3ZGZFZFK3lDdUdiUE0zeEZodUE4VGR2?=
 =?utf-8?B?Q1Z5VlRhR2t6bExzaHBSVVpOU01yYUZmVjk0dVE4cFFJWWc0eHlxUWdHcTRp?=
 =?utf-8?B?dDVvSzQwZjF4a1VoTXY3VEx0SWdRbmpKVHYyeENYRzFGaklKRHp1OHB0QTkx?=
 =?utf-8?B?d0hpNlRiTzhCdWU2anlTSUtaSE9iZGlSKzFVdzFtUEpXY3U0SjdEWFNjMnB1?=
 =?utf-8?B?MldWa0xoRzFoMTJJak9CZm5uS2c3dGhoY0pWOXZtbUpCSWpVWVR1ZEJXUkd6?=
 =?utf-8?B?R0RZTWViNWlhZ0txZXA2V044YTJNNzJwUzBtMk5QcTRGOVZ6V2krWm9zUjhK?=
 =?utf-8?B?OWlUZlZZSWpKTVpqa1lkdDFrNDZBUmlOdk9EVERvaFNkeUlZNzBFQUpvOVU0?=
 =?utf-8?B?anptbWlyZXkzUmtKeGp5M284Y1ZFMXRSeUxuYUtpWFI1Q0hUY1BrWXpKUTl0?=
 =?utf-8?B?MnB2SndNeWZDZlpxaVRuL1BkRUExY2VSN2VNdjlCdFkvTVdMTERkOVlvL1J0?=
 =?utf-8?B?Rmp0cFRJbGh6UXRQR1BhTm9mZEc1QzA0SGJhWlRrcml6S2FtY0VjNUNQaUVq?=
 =?utf-8?B?NElJTVJQcnliakhoblNxREdEYWlrblF1Ymhua2RzeEhtblBjcEtlWTdVVkNr?=
 =?utf-8?B?Mys3a1JaWE9uMk80Q0hsQWhOWUtUN21OeDZiRDR6VE9UUnp0bjAvNkR4V1Yv?=
 =?utf-8?B?U25HVm0zV3ozUFhVZHRTRG1TWVFkWTdZR2szU3dWdkhnS3BPQk90WEpNSW0v?=
 =?utf-8?B?RDhNQXMwRXFjSWc1eExHd29pOS92cm4xYU1HWUJKRHBSdUZHZkwxcDNvbmF4?=
 =?utf-8?B?YTd4cmFlQUthbVlnSVJaUDVBdURkUEF5Y2l5YyszQVpsUmRJTHQycmFQOGtn?=
 =?utf-8?B?ek5NY2RKbFNHZHhTaTF4K04wVGpiR0xNaEp4NllHU05uQnVEUHFXbnozRHVl?=
 =?utf-8?B?bUJZY1l6VWFrbzIvQ2l6OXljZFhDeXAzYkgwUy9mUmNDeC9yTG1ldWZEQkEy?=
 =?utf-8?B?a0IweU5iZEU2WEFPUVFFa3E1cWQ4cCtEQm9PZkxwSEJTajA1bEY1NWdGamta?=
 =?utf-8?B?TnBHOCtzMFoyWXJoNXRFSXphUlVrbGNTYStMalFZWVZGYi9iUlFjN0VLWk1J?=
 =?utf-8?B?VXc9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	CIznLaTrqwgmUMVQ+bXvFghKRDGYkMcyVNslOkMmcMPKFPoZ0mvFhA+9j8np4z5ikv5XAFrSWLz8YS32WUnMEnZn9Wc6SAp+QtRV6aPS+U7Zf3KsX8Rcq0i6ufeBKBWW+1TUqOSoQM8JppUyfPZWdgnS+lvzmQBmHVf73AJV7oY7tkilz3OePWL10zHNWPuwANPWLZyzuOlJ/gPPSfIGVr6fMktmwYVMHUhWM355t5XaEncjaFm1S+MHsYAv9BHH1FHStccD/ONUhp8atXa76b+a6TTnMVEmKUtR9e0n9wjrLOaAGBSksQUr47CHtASfFzjhzkTtY3fcGAT2ncUMuaMMzA6rm0LeJ7f5RqKgHetwu10H4umveogmvK1yfr5QInF0FjDbn50PtM94/EsHeasMDPlwExd7kFuA4kh8M4o0h8cbPSQQU2JXyPi/dLqafz1Whu+9swyoq3uTLeVw6Phheg9l/oPTkfkdIEAqwnbOtwBWhSwImaE+R1VSKXPS8MOzHyqQqSIiGJxdIv56xac/hj9Wwy7vGpeYoBw/xz9q8R6O1wdfew8+tS2qmBODQbt1qHNGgAYOH8rnZzZZNlgLw8p008KrNm/6CAAXHOI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5817473e-3b59-4e66-ed10-08dc4f2ea396
X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5893.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 13:54:51.3194
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: M0Fd9Vf8kPwTce5pBBAn3GwMsxIlzNkEhDw2xaoteex5Rny/ClNM+Pt1a/mFizCJT0/nQuoSjw+SR6seqnUNHMNr+yXLuLNX7N6e8JYvFKw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7201
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-28_13,2024-03-27_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 bulkscore=0 spamscore=0 adultscore=0 mlxscore=0 suspectscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2403210000 definitions=main-2403280094
X-Proofpoint-GUID: sFLr_oqvA0eaGa4-GjOY8G3hhQ5tyJ53
X-Proofpoint-ORIG-GUID: sFLr_oqvA0eaGa4-GjOY8G3hhQ5tyJ53

On 27/03/2024 20:04, Mirsad Todorovac wrote:
> On 3/27/24 11:41, Joao Martins wrote:
>> On 25/03/2024 13:52, Jason Gunthorpe wrote:
>>> On Mon, Mar 25, 2024 at 12:17:28PM +0000, Joao Martins wrote:
>>>>> However, I am not smart enough to figure out why ...
>>>>>
>>>>> Apparently, from the source, mmap() fails to allocate pages on the desired
>>>>> address:
>>>>>
>>>>>    1746         assert((uintptr_t)self->buffer % HUGEPAGE_SIZE == 0);
>>>>>    1747         vrc = mmap(self->buffer, variant->buffer_size, PROT_READ |
>>>>> PROT_WRITE,
>>>>>    1748                    mmap_flags, -1, 0);
>>>>> → 1749         assert(vrc == self->buffer);
>>>>>    1750
>>>>>
>>>>> But I am not that deep into the source to figure our what was intended and
>>>>> what
>>>>> went
>>>>> wrong :-/
>>>>
>>>> I can SKIP() the test rather assert() in here if it helps. Though there are
>>>> other tests that fail if no hugetlb pages are reserved.
>>>>
>>>> But I am not sure if this is problem here as the initial bug email had an
>>>> enterily different set of failures? Maybe all you need is an assert() and it
>>>> gets into this state?
>>>
>>> I feel like there is something wrong with the kselftest framework,
>>> there should be some way to fail the setup/teardown operations without
>>> triggering an infinite loop :(
>>
>> I am now wondering if the problem is the fact that we have an assert() in the
>> middle of FIXTURE_{TEST,SETUP} whereby we should be having ASSERT_TRUE() (or any
>> other kselftest macro that). The expect/assert macros from kselftest() don't do
>> asserts and it looks like we are failing mid tests in the assert().
>>
>> Maybe it is OK for setup_sizes(), but maybe not OK for the rest (i.e. during the
>> actual setup / tests). I can throw a patch there to see if this helps Mirsad.
> 
> Well, we are in the job of making the kernel better and as bug free as we can.
> 
> Maybe we should not delve too much into detail: is this a kernel bug, or the
> kselftest
> program bug?
> 

I think the latter thus far. See at the end.

> Some people already mentioned that I might have sysctl variable problems. I
> don't see
> what the mmap() HUGEPAGE allocation at fixed address was meant to prove?

That just sounds like the setup -- you need hugepages to run all iommufd tests.
Most of my comments is about what your first report email in this thread on the
selftest getting stuck at 99%

If the use of assert() within test/setup is the issue then snip below should fix
it. But if Jason is right it won't make a difference. I think this infinite loop
is __bail() where we are doing a longjmp() in a loop once a ASSERT*() fails but
it only happens if we use these ASSERT() functions. Maybe this is because in
some test functions we end up doing ASSERTs within ASSERTs?

--->8---

diff --git a/tools/testing/selftests/iommu/iommufd.c
b/tools/testing/selftests/iommu/iommufd.c
index edf1c99c9936..d2661a13a4f2 100644
--- a/tools/testing/selftests/iommu/iommufd.c
+++ b/tools/testing/selftests/iommu/iommufd.c
@@ -353,34 +353,34 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(ENOENT, parent_hwpt_id, inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Check data_type by passing zero-length array */
 		num_inv = 0;
 		test_cmd_hwpt_invalidate(nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: Invalid data_type */
 		num_inv = 1;
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST_INVALID,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: structure size sanity */
 		num_inv = 1;
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs) + 1, &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		num_inv = 1;
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 1, &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: invalid flag is passed */
 		num_inv = 1;
@@ -388,7 +388,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EOPNOTSUPP, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: invalid data_uptr when array is not empty */
 		num_inv = 1;
@@ -396,7 +396,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], NULL,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: invalid entry_len when array is not empty */
 		num_inv = 1;
@@ -404,7 +404,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 0, &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/* Negative test: invalid iotlb_id */
 		num_inv = 1;
@@ -413,7 +413,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(!num_inv);
+		ASSERT_TRUE(!num_inv);

 		/*
 		 * Invalidate the 1st iotlb entry but fail the 2nd request
@@ -427,7 +427,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EOPNOTSUPP, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(num_inv == 1);
+		ASSERT_TRUE(num_inv == 1);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 0, 0);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 1,
 					  IOMMU_TEST_IOTLB_DEFAULT);
@@ -448,7 +448,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_err_hwpt_invalidate(EINVAL, nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(num_inv == 1);
+		ASSERT_TRUE(num_inv == 1);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 0, 0);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 1,
 					  IOMMU_TEST_IOTLB_DEFAULT);
@@ -464,7 +464,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_cmd_hwpt_invalidate(nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(num_inv == 1);
+		ASSERT_TRUE(num_inv == 1);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 0, 0);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 1, 0);
 		test_cmd_hwpt_check_iotlb(nested_hwpt_id[0], 2,
@@ -481,7 +481,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_cmd_hwpt_invalidate(nested_hwpt_id[0], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(num_inv == 2);
+		ASSERT_TRUE(num_inv == 2);
 		test_cmd_hwpt_check_iotlb_all(nested_hwpt_id[0], 0);

 		/* Invalidate all iotlb entries for nested_hwpt_id[1] and verify */
@@ -490,7 +490,7 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)
 		test_cmd_hwpt_invalidate(nested_hwpt_id[1], inv_reqs,
 					 IOMMU_HWPT_INVALIDATE_DATA_SELFTEST,
 					 sizeof(*inv_reqs), &num_inv);
-		assert(num_inv == 1);
+		ASSERT_TRUE(num_inv == 1);
 		test_cmd_hwpt_check_iotlb_all(nested_hwpt_id[1], 0);

 		/* Attach device to nested_hwpt_id[0] that then will be busy */
@@ -1743,10 +1743,14 @@ FIXTURE_SETUP(iommufd_dirty_tracking)
 		 */
 		mmap_flags |= MAP_HUGETLB | MAP_POPULATE;
 	}
-	assert((uintptr_t)self->buffer % HUGEPAGE_SIZE == 0);
+	ASSERT_TRUE((uintptr_t)self->buffer % HUGEPAGE_SIZE == 0);
 	vrc = mmap(self->buffer, variant->buffer_size, PROT_READ | PROT_WRITE,
 		   mmap_flags, -1, 0);
-	assert(vrc == self->buffer);
+	if (vrc != self->buffer && variant->hugepages) {
+		SKIP(return, "Skipping buffer_size=%lu due to mmap() errno=%d",
+			   variant->buffer_size, errno);
+	}
+	ASSERT_TRUE(vrc == self->buffer);

 	self->page_size = MOCK_PAGE_SIZE;
 	self->bitmap_size =
@@ -1755,9 +1759,9 @@ FIXTURE_SETUP(iommufd_dirty_tracking)
 	/* Provision with an extra (PAGE_SIZE) for the unaligned case */
 	rc = posix_memalign(&self->bitmap, PAGE_SIZE,
 			    self->bitmap_size + PAGE_SIZE);
-	assert(!rc);
-	assert(self->bitmap);
-	assert((uintptr_t)self->bitmap % PAGE_SIZE == 0);
+	ASSERT_TRUE(!rc);
+	ASSERT_TRUE(self->bitmap != NULL);
+	ASSERT_TRUE((uintptr_t)self->bitmap % PAGE_SIZE == 0);

 	test_ioctl_ioas_alloc(&self->ioas_id);
 	/* Enable 1M mock IOMMU hugepages */
diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c
b/tools/testing/selftests/iommu/iommufd_fail_nth.c
index f590417cd67a..4a88f9c28fe5 100644
--- a/tools/testing/selftests/iommu/iommufd_fail_nth.c
+++ b/tools/testing/selftests/iommu/iommufd_fail_nth.c
@@ -315,7 +315,8 @@ TEST_FAIL_NTH(basic_fail_nth, map_domain)

 	fail_nth_enable();

-	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL))
+	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL,
+				  _metadata))
 		return -1;

 	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -326,7 +327,8 @@ 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, NULL))
+	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL,
+				  _metadata))
 		return -1;
 	return 0;
 }
@@ -350,13 +352,14 @@ 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, NULL))
+	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL,
+				  _metadata))
 		return -1;

 	fail_nth_enable();

 	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2,
-				  NULL))
+				  NULL, _metadata))
 		return -1;

 	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, 262144, &iova,
@@ -370,10 +373,11 @@ 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, NULL))
+	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL,
+				  _metadata))
 		return -1;
 	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id2, &hwpt_id2,
-				  NULL))
+				  NULL, _metadata))
 		return -1;
 	return 0;
 }
@@ -530,7 +534,8 @@ 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, NULL))
+	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, &hwpt_id, NULL,
+				  _metadata))
 		return -1;

 	if (_test_ioctl_ioas_map(self->fd, ioas_id, buffer, BUFFER_SIZE, &iova,
@@ -609,10 +614,11 @@ TEST_FAIL_NTH(basic_fail_nth, device)
 	fail_nth_enable();

 	if (_test_cmd_mock_domain(self->fd, ioas_id, &stdev_id, NULL,
-				  &idev_id))
+				  &idev_id, _metadata))
 		return -1;

-	if (_test_cmd_get_hw_info(self->fd, idev_id, &info, sizeof(info), NULL))
+	if (_test_cmd_get_hw_info(self->fd, idev_id, &info, sizeof(info), NULL,
+				  _metadata))
 		return -1;

 	if (_test_cmd_hwpt_alloc(self->fd, idev_id, ioas_id, 0, &hwpt_id,
diff --git a/tools/testing/selftests/iommu/iommufd_utils.h
b/tools/testing/selftests/iommu/iommufd_utils.h
index 8d2b46b2114d..cd8bb14be658 100644
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -64,7 +64,8 @@ static unsigned long PAGE_SIZE;
 	})

 static int _test_cmd_mock_domain(int fd, unsigned int ioas_id, __u32 *stdev_id,
-				 __u32 *hwpt_id, __u32 *idev_id)
+				 __u32 *hwpt_id, __u32 *idev_id,
+				 struct __test_metadata *_metadata)
 {
 	struct iommu_test_cmd cmd = {
 		.size = sizeof(cmd),
@@ -79,7 +80,7 @@ static int _test_cmd_mock_domain(int fd, unsigned int ioas_id,
__u32 *stdev_id,
 		return ret;
 	if (stdev_id)
 		*stdev_id = cmd.mock_domain.out_stdev_id;
-	assert(cmd.id != 0);
+	ASSERT_TRUE(cmd.id != 0);
 	if (hwpt_id)
 		*hwpt_id = cmd.mock_domain.out_hwpt_id;
 	if (idev_id)
@@ -88,14 +89,16 @@ static int _test_cmd_mock_domain(int fd, unsigned int
ioas_id, __u32 *stdev_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))
+					   hwpt_id, idev_id, _metadata))
 #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, NULL))
+						   stdev_id, hwpt_id, NULL, \
+						   _metadata))

 static int _test_cmd_mock_domain_flags(int fd, unsigned int ioas_id,
 				       __u32 stdev_flags, __u32 *stdev_id,
-				       __u32 *hwpt_id, __u32 *idev_id)
+				       __u32 *hwpt_id, __u32 *idev_id,
+				       struct __test_metadata *_metadata)
 {
 	struct iommu_test_cmd cmd = {
 		.size = sizeof(cmd),
@@ -110,7 +113,7 @@ static int _test_cmd_mock_domain_flags(int fd, unsigned int
ioas_id,
 		return ret;
 	if (stdev_id)
 		*stdev_id = cmd.mock_domain_flags.out_stdev_id;
-	assert(cmd.id != 0);
+	ASSERT_TRUE(cmd.id != 0);
 	if (hwpt_id)
 		*hwpt_id = cmd.mock_domain_flags.out_hwpt_id;
 	if (idev_id)
@@ -119,11 +122,13 @@ static int _test_cmd_mock_domain_flags(int fd, unsigned
int ioas_id,
 }
 #define test_cmd_mock_domain_flags(ioas_id, flags, stdev_id, hwpt_id, idev_id) \
 	ASSERT_EQ(0, _test_cmd_mock_domain_flags(self->fd, ioas_id, flags,     \
-						 stdev_id, hwpt_id, idev_id))
+						 stdev_id, hwpt_id, idev_id,   \
+						 _metadata))
 #define test_err_mock_domain_flags(_errno, ioas_id, flags, stdev_id, hwpt_id) \
 	EXPECT_ERRNO(_errno,                                                  \
 		     _test_cmd_mock_domain_flags(self->fd, ioas_id, flags,    \
-						 stdev_id, hwpt_id, NULL))
+						 stdev_id, hwpt_id, NULL,     \
+			     			 _metadata))

 static int _test_cmd_mock_domain_replace(int fd, __u32 stdev_id, __u32 pt_id,
 					 __u32 *hwpt_id)
@@ -623,7 +628,8 @@ static void teardown_iommufd(int fd, struct __test_metadata
*_metadata)

 /* @data can be NULL */
 static int _test_cmd_get_hw_info(int fd, __u32 device_id, void *data,
-				 size_t data_len, uint32_t *capabilities)
+				 size_t data_len, uint32_t *capabilities,
+				 struct __test_metadata *_metadata)
 {
 	struct iommu_test_hw_info *info = (struct iommu_test_hw_info *)data;
 	struct iommu_hw_info cmd = {
@@ -639,13 +645,13 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_id,
void *data,
 	if (ret)
 		return ret;

-	assert(cmd.out_data_type == IOMMU_HW_INFO_TYPE_SELFTEST);
+	ASSERT_TRUE(cmd.out_data_type == IOMMU_HW_INFO_TYPE_SELFTEST);

 	/*
 	 * The struct iommu_test_hw_info should be the one defined
 	 * by the current kernel.
 	 */
-	assert(cmd.data_len == sizeof(struct iommu_test_hw_info));
+	ASSERT_TRUE(cmd.data_len == sizeof(struct iommu_test_hw_info));

 	/*
 	 * Trailing bytes should be 0 if user buffer is larger than
@@ -656,16 +662,16 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_id,
void *data,
 		int idx = 0;

 		while (idx < data_len - cmd.data_len) {
-			assert(!*(ptr + idx));
+			ASSERT_TRUE(!*(ptr + idx));
 			idx++;
 		}
 	}

 	if (info) {
 		if (data_len >= offsetofend(struct iommu_test_hw_info, test_reg))
-			assert(info->test_reg == IOMMU_HW_INFO_SELFTEST_REGVAL);
+			ASSERT_TRUE(info->test_reg == IOMMU_HW_INFO_SELFTEST_REGVAL);
 		if (data_len >= offsetofend(struct iommu_test_hw_info, flags))
-			assert(!info->flags);
+			ASSERT_TRUE(!info->flags);
 	}

 	if (capabilities)
@@ -674,13 +680,14 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_id,
void *data,
 	return 0;
 }

-#define test_cmd_get_hw_info(device_id, data, data_len)               \
+#define test_cmd_get_hw_info(device_id, data, data_len)     \
 	ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, data, \
-					   data_len, NULL))
+					   data_len, NULL, _metadata))

-#define test_err_get_hw_info(_errno, device_id, data, data_len)               \
+#define test_err_get_hw_info(_errno, device_id, data, data_len)     \
 	EXPECT_ERRNO(_errno, _test_cmd_get_hw_info(self->fd, device_id, data, \
-						   data_len, NULL))
+						   data_len, NULL, _metadata))

 #define test_cmd_get_hw_capabilities(device_id, caps, mask) \
-	ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, NULL, 0, &caps))
+	ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, NULL, 0, \
+					   &caps, _metadata))