Commit 64e34b50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-kunit-5.19-rc1' of... 

Merge tag 'linux-kselftest-kunit-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull KUnit updates from Shuah Khan:
 "Several fixes, cleanups, and enhancements to tests and framework:

   - introduce _NULL and _NOT_NULL macros to pointer error checks

   - rework kunit_resource allocation policy to fix memory leaks when
     caller doesn't specify free() function to be used when allocating
     memory using kunit_add_resource() and kunit_alloc_resource() funcs.

   - add ability to specify suite-level init and exit functions"

* tag 'linux-kselftest-kunit-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (41 commits)
  kunit: tool: Use qemu-system-i386 for i386 runs
  kunit: fix executor OOM error handling logic on non-UML
  kunit: tool: update riscv QEMU config with new serial dependency
  kcsan: test: use new suite_{init,exit} support
  kunit: tool: Add list of all valid test configs on UML
  kunit: take `kunit_assert` as `const`
  kunit: tool: misc cleanups
  kunit: tool: minor cosmetic cleanups in kunit_parser.py
  kunit: tool: make parser stop overwriting status of suites w/ no_tests
  kunit: tool: remove dead parse_crash_in_log() logic
  kunit: tool: print clearer error message when there's no TAP output
  kunit: tool: stop using a shell to run kernel under QEMU
  kunit: tool: update test counts summary line format
  kunit: bail out of test filtering logic quicker if OOM
  lib/Kconfig.debug: change KUnit tests to default to KUNIT_ALL_TESTS
  kunit: Rework kunit_resource allocation policy
  kunit: fix debugfs code to use enum kunit_status, not bool
  kfence: test: use new suite_{init/exit} support, add .kunitconfig
  kunit: add ability to specify suite-level init and exit functions
  kunit: rename print_subtest_{start,end} for clarity (s/subtest/suite)
  ...
parents 1c6d2ead e7eaffce

Documentation/dev-tools/kunit/api/index.rst

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ API Reference 
.. toctree::



	test

	resource



This section documents the KUnit kernel testing API. It is divided into the

following sections:
@@ -13,3 +14,7 @@ following sections: 
Documentation/dev-tools/kunit/api/test.rst



 - documents all of the standard testing API



Documentation/dev-tools/kunit/api/resource.rst



 - documents the KUnit resource API

Documentation/dev-tools/kunit/api/resource.rst

0 → 100644
+13 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



============

Resource API

============



This file documents the KUnit resource API.



Most users won't need to use this API directly, power users can use it to store

state on a per-test basis, register custom cleanup actions, and more.



.. kernel-doc:: include/kunit/resource.h

   :internal:

Documentation/dev-tools/kunit/running_tips.rst

+2 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ Instead of enabling ``CONFIG_GCOV_KERNEL=y``, we can set these options: 


	CONFIG_DEBUG_KERNEL=y

	CONFIG_DEBUG_INFO=y

	CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

	CONFIG_GCOV=y
@@ -122,7 +123,7 @@ Putting it together into a copy-pastable sequence of commands: 
.. code-block:: bash



	# Append coverage options to the current config

	$ echo -e "CONFIG_DEBUG_KERNEL=y\nCONFIG_DEBUG_INFO=y\nCONFIG_GCOV=y" >> .kunit/.kunitconfig

	$ echo -e "CONFIG_DEBUG_KERNEL=y\nCONFIG_DEBUG_INFO=y\nCONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y\nCONFIG_GCOV=y" >> .kunit/.kunitconfig

	$ ./tools/testing/kunit/kunit.py run

	# Extract the coverage information from the build dir (.kunit/)

	$ lcov -t "my_kunit_tests" -o coverage.info -c -d .kunit/

Documentation/dev-tools/kunit/usage.rst

+11 −8
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ We need many test cases covering all the unit's behaviors. It is common to have 
many similar tests. In order to reduce duplication in these closely related

tests, most unit testing frameworks (including KUnit) provide the concept of a

*test suite*. A test suite is a collection of test cases for a unit of code

with a setup function that gets invoked before every test case and then a tear

down function that gets invoked after every test case completes. For example:

with optional setup and teardown functions that run before/after the whole

suite and/or every test case. For example:



.. code-block:: c
@@ -141,16 +141,19 @@ down function that gets invoked after every test case completes. For example: 
		.name = "example",

		.init = example_test_init,

		.exit = example_test_exit,

		.suite_init = example_suite_init,

		.suite_exit = example_suite_exit,

		.test_cases = example_test_cases,

	};

	kunit_test_suite(example_test_suite);



In the above example, the test suite ``example_test_suite`` would run the test

cases ``example_test_foo``, ``example_test_bar``, and ``example_test_baz``. Each

would have ``example_test_init`` called immediately before it and

``example_test_exit`` called immediately after it.

``kunit_test_suite(example_test_suite)`` registers the test suite with the

KUnit test framework.

In the above example, the test suite ``example_test_suite`` would first run

``example_suite_init``, then run the test cases ``example_test_foo``,

``example_test_bar``, and ``example_test_baz``. Each would have

``example_test_init`` called immediately before it and ``example_test_exit``

called immediately after it. Finally, ``example_suite_exit`` would be called

after everything else. ``kunit_test_suite(example_test_suite)`` registers the

test suite with the KUnit test framework.



.. note::

   A test case will only run if it is associated with a test suite.

drivers/thunderbolt/test.c

+67 −67
Original line number Diff line number Diff line
@@ -796,9 +796,9 @@ static void tb_test_path_not_connected(struct kunit *test) 
	up = &dev2->ports[9];



	path = tb_path_alloc(NULL, down, 8, up, 8, 0, "PCIe Down");

	KUNIT_ASSERT_TRUE(test, path == NULL);

	KUNIT_ASSERT_NULL(test, path);

	path = tb_path_alloc(NULL, down, 8, up, 8, 1, "PCIe Down");

	KUNIT_ASSERT_TRUE(test, path == NULL);

	KUNIT_ASSERT_NULL(test, path);

}



struct hop_expectation {
@@ -847,7 +847,7 @@ static void tb_test_path_not_bonded_lane0(struct kunit *test) 
	up = &dev->ports[9];



	path = tb_path_alloc(NULL, down, 8, up, 8, 0, "PCIe Down");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -909,7 +909,7 @@ static void tb_test_path_not_bonded_lane1(struct kunit *test) 
	out = &dev->ports[13];



	path = tb_path_alloc(NULL, in, 9, out, 9, 1, "Video");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -989,7 +989,7 @@ static void tb_test_path_not_bonded_lane1_chain(struct kunit *test) 
	out = &dev3->ports[13];



	path = tb_path_alloc(NULL, in, 9, out, 9, 1, "Video");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -1069,7 +1069,7 @@ static void tb_test_path_not_bonded_lane1_chain_reverse(struct kunit *test) 
	out = &host->ports[5];



	path = tb_path_alloc(NULL, in, 9, out, 9, 1, "Video");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -1161,7 +1161,7 @@ static void tb_test_path_mixed_chain(struct kunit *test) 
	out = &dev4->ports[13];



	path = tb_path_alloc(NULL, in, 9, out, 9, 1, "Video");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -1253,7 +1253,7 @@ static void tb_test_path_mixed_chain_reverse(struct kunit *test) 
	out = &host->ports[5];



	path = tb_path_alloc(NULL, in, 9, out, 9, 1, "Video");

	KUNIT_ASSERT_TRUE(test, path != NULL);

	KUNIT_ASSERT_NOT_NULL(test, path);

	KUNIT_ASSERT_EQ(test, path->path_length, ARRAY_SIZE(test_data));

	for (i = 0; i < ARRAY_SIZE(test_data); i++) {

		const struct tb_port *in_port, *out_port;
@@ -1297,7 +1297,7 @@ static void tb_test_tunnel_pcie(struct kunit *test) 
	down = &host->ports[8];

	up = &dev1->ports[9];

	tunnel1 = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, tunnel1 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel1);

	KUNIT_EXPECT_EQ(test, tunnel1->type, TB_TUNNEL_PCI);

	KUNIT_EXPECT_PTR_EQ(test, tunnel1->src_port, down);

	KUNIT_EXPECT_PTR_EQ(test, tunnel1->dst_port, up);
@@ -1312,7 +1312,7 @@ static void tb_test_tunnel_pcie(struct kunit *test) 
	down = &dev1->ports[10];

	up = &dev2->ports[9];

	tunnel2 = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, tunnel2 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel2);

	KUNIT_EXPECT_EQ(test, tunnel2->type, TB_TUNNEL_PCI);

	KUNIT_EXPECT_PTR_EQ(test, tunnel2->src_port, down);

	KUNIT_EXPECT_PTR_EQ(test, tunnel2->dst_port, up);
@@ -1349,7 +1349,7 @@ static void tb_test_tunnel_dp(struct kunit *test) 
	out = &dev->ports[13];



	tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DP);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, in);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, out);
@@ -1395,7 +1395,7 @@ static void tb_test_tunnel_dp_chain(struct kunit *test) 
	out = &dev4->ports[14];



	tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DP);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, in);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, out);
@@ -1445,7 +1445,7 @@ static void tb_test_tunnel_dp_tree(struct kunit *test) 
	out = &dev5->ports[13];



	tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DP);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, in);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, out);
@@ -1510,7 +1510,7 @@ static void tb_test_tunnel_dp_max_length(struct kunit *test) 
	out = &dev12->ports[13];



	tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DP);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, in);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, out);
@@ -1566,7 +1566,7 @@ static void tb_test_tunnel_usb3(struct kunit *test) 
	down = &host->ports[12];

	up = &dev1->ports[16];

	tunnel1 = tb_tunnel_alloc_usb3(NULL, up, down, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel1 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel1);

	KUNIT_EXPECT_EQ(test, tunnel1->type, TB_TUNNEL_USB3);

	KUNIT_EXPECT_PTR_EQ(test, tunnel1->src_port, down);

	KUNIT_EXPECT_PTR_EQ(test, tunnel1->dst_port, up);
@@ -1581,7 +1581,7 @@ static void tb_test_tunnel_usb3(struct kunit *test) 
	down = &dev1->ports[17];

	up = &dev2->ports[16];

	tunnel2 = tb_tunnel_alloc_usb3(NULL, up, down, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel2 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel2);

	KUNIT_EXPECT_EQ(test, tunnel2->type, TB_TUNNEL_USB3);

	KUNIT_EXPECT_PTR_EQ(test, tunnel2->src_port, down);

	KUNIT_EXPECT_PTR_EQ(test, tunnel2->dst_port, up);
@@ -1628,7 +1628,7 @@ static void tb_test_tunnel_port_on_path(struct kunit *test) 
	out = &dev5->ports[13];



	dp_tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, dp_tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dp_tunnel);



	KUNIT_EXPECT_TRUE(test, tb_tunnel_port_on_path(dp_tunnel, in));

	KUNIT_EXPECT_TRUE(test, tb_tunnel_port_on_path(dp_tunnel, out));
@@ -1685,7 +1685,7 @@ static void tb_test_tunnel_dma(struct kunit *test) 
	port = &host->ports[1];



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 8, 1, 8, 1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DMA);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, nhi);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, port);
@@ -1728,7 +1728,7 @@ static void tb_test_tunnel_dma_rx(struct kunit *test) 
	port = &host->ports[1];



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, -1, -1, 15, 2);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DMA);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, nhi);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, port);
@@ -1765,7 +1765,7 @@ static void tb_test_tunnel_dma_tx(struct kunit *test) 
	port = &host->ports[1];



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 15, 2, -1, -1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DMA);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, nhi);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, port);
@@ -1811,7 +1811,7 @@ static void tb_test_tunnel_dma_chain(struct kunit *test) 
	nhi = &host->ports[7];

	port = &dev2->ports[3];

	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 8, 1, 8, 1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_EXPECT_EQ(test, tunnel->type, TB_TUNNEL_DMA);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->src_port, nhi);

	KUNIT_EXPECT_PTR_EQ(test, tunnel->dst_port, port);
@@ -1857,7 +1857,7 @@ static void tb_test_tunnel_dma_match(struct kunit *test) 
	port = &host->ports[1];



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 15, 1, 15, 1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);



	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, 15, 1, 15, 1));

	KUNIT_ASSERT_FALSE(test, tb_tunnel_match_dma(tunnel, 8, 1, 15, 1));
@@ -1873,7 +1873,7 @@ static void tb_test_tunnel_dma_match(struct kunit *test) 
	tb_tunnel_free(tunnel);



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 15, 1, -1, -1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, 15, 1, -1, -1));

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, 15, -1, -1, -1));

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, -1, 1, -1, -1));
@@ -1885,7 +1885,7 @@ static void tb_test_tunnel_dma_match(struct kunit *test) 
	tb_tunnel_free(tunnel);



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, -1, -1, 15, 11);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, -1, -1, 15, 11));

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, -1, -1, 15, -1));

	KUNIT_ASSERT_TRUE(test, tb_tunnel_match_dma(tunnel, -1, -1, -1, 11));
@@ -1910,7 +1910,7 @@ static void tb_test_credit_alloc_legacy_not_bonded(struct kunit *test) 
	down = &host->ports[8];

	up = &dev->ports[9];

	tunnel = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)2);



	path = tunnel->paths[0];
@@ -1943,7 +1943,7 @@ static void tb_test_credit_alloc_legacy_bonded(struct kunit *test) 
	down = &host->ports[8];

	up = &dev->ports[9];

	tunnel = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)2);



	path = tunnel->paths[0];
@@ -1976,7 +1976,7 @@ static void tb_test_credit_alloc_pcie(struct kunit *test) 
	down = &host->ports[8];

	up = &dev->ports[9];

	tunnel = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)2);



	path = tunnel->paths[0];
@@ -2010,7 +2010,7 @@ static void tb_test_credit_alloc_dp(struct kunit *test) 
	out = &dev->ports[14];



	tunnel = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)3);



	/* Video (main) path */
@@ -2053,7 +2053,7 @@ static void tb_test_credit_alloc_usb3(struct kunit *test) 
	down = &host->ports[12];

	up = &dev->ports[16];

	tunnel = tb_tunnel_alloc_usb3(NULL, up, down, 0, 0);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)2);



	path = tunnel->paths[0];
@@ -2087,7 +2087,7 @@ static void tb_test_credit_alloc_dma(struct kunit *test) 
	port = &dev->ports[3];



	tunnel = tb_tunnel_alloc_dma(NULL, nhi, port, 8, 1, 8, 1);

	KUNIT_ASSERT_TRUE(test, tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel);

	KUNIT_ASSERT_EQ(test, tunnel->npaths, (size_t)2);



	/* DMA RX */
@@ -2141,7 +2141,7 @@ static void tb_test_credit_alloc_dma_multiple(struct kunit *test) 
	 * remaining 1 and then we run out of buffers.

	 */

	tunnel1 = tb_tunnel_alloc_dma(NULL, nhi, port, 8, 1, 8, 1);

	KUNIT_ASSERT_TRUE(test, tunnel1 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel1);

	KUNIT_ASSERT_EQ(test, tunnel1->npaths, (size_t)2);



	path = tunnel1->paths[0];
@@ -2159,7 +2159,7 @@ static void tb_test_credit_alloc_dma_multiple(struct kunit *test) 
	KUNIT_EXPECT_EQ(test, path->hops[1].initial_credits, 14U);



	tunnel2 = tb_tunnel_alloc_dma(NULL, nhi, port, 9, 2, 9, 2);

	KUNIT_ASSERT_TRUE(test, tunnel2 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel2);

	KUNIT_ASSERT_EQ(test, tunnel2->npaths, (size_t)2);



	path = tunnel2->paths[0];
@@ -2177,7 +2177,7 @@ static void tb_test_credit_alloc_dma_multiple(struct kunit *test) 
	KUNIT_EXPECT_EQ(test, path->hops[1].initial_credits, 1U);



	tunnel3 = tb_tunnel_alloc_dma(NULL, nhi, port, 10, 3, 10, 3);

	KUNIT_ASSERT_TRUE(test, tunnel3 == NULL);

	KUNIT_ASSERT_NULL(test, tunnel3);



	/*

	 * Release the first DMA tunnel. That should make 14 buffers
@@ -2186,7 +2186,7 @@ static void tb_test_credit_alloc_dma_multiple(struct kunit *test) 
	tb_tunnel_free(tunnel1);



	tunnel3 = tb_tunnel_alloc_dma(NULL, nhi, port, 10, 3, 10, 3);

	KUNIT_ASSERT_TRUE(test, tunnel3 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, tunnel3);



	path = tunnel3->paths[0];

	KUNIT_ASSERT_EQ(test, path->path_length, 2);
@@ -2216,7 +2216,7 @@ static struct tb_tunnel *TB_TEST_PCIE_TUNNEL(struct kunit *test, 
	down = &host->ports[8];

	up = &dev->ports[9];

	pcie_tunnel = tb_tunnel_alloc_pci(NULL, up, down);

	KUNIT_ASSERT_TRUE(test, pcie_tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, pcie_tunnel);

	KUNIT_ASSERT_EQ(test, pcie_tunnel->npaths, (size_t)2);



	path = pcie_tunnel->paths[0];
@@ -2246,7 +2246,7 @@ static struct tb_tunnel *TB_TEST_DP_TUNNEL1(struct kunit *test, 
	in = &host->ports[5];

	out = &dev->ports[13];

	dp_tunnel1 = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, dp_tunnel1 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dp_tunnel1);

	KUNIT_ASSERT_EQ(test, dp_tunnel1->npaths, (size_t)3);



	path = dp_tunnel1->paths[0];
@@ -2283,7 +2283,7 @@ static struct tb_tunnel *TB_TEST_DP_TUNNEL2(struct kunit *test, 
	in = &host->ports[6];

	out = &dev->ports[14];

	dp_tunnel2 = tb_tunnel_alloc_dp(NULL, in, out, 0, 0);

	KUNIT_ASSERT_TRUE(test, dp_tunnel2 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dp_tunnel2);

	KUNIT_ASSERT_EQ(test, dp_tunnel2->npaths, (size_t)3);



	path = dp_tunnel2->paths[0];
@@ -2320,7 +2320,7 @@ static struct tb_tunnel *TB_TEST_USB3_TUNNEL(struct kunit *test, 
	down = &host->ports[12];

	up = &dev->ports[16];

	usb3_tunnel = tb_tunnel_alloc_usb3(NULL, up, down, 0, 0);

	KUNIT_ASSERT_TRUE(test, usb3_tunnel != NULL);

	KUNIT_ASSERT_NOT_NULL(test, usb3_tunnel);

	KUNIT_ASSERT_EQ(test, usb3_tunnel->npaths, (size_t)2);



	path = usb3_tunnel->paths[0];
@@ -2350,7 +2350,7 @@ static struct tb_tunnel *TB_TEST_DMA_TUNNEL1(struct kunit *test, 
	nhi = &host->ports[7];

	port = &dev->ports[3];

	dma_tunnel1 = tb_tunnel_alloc_dma(NULL, nhi, port, 8, 1, 8, 1);

	KUNIT_ASSERT_TRUE(test, dma_tunnel1 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dma_tunnel1);

	KUNIT_ASSERT_EQ(test, dma_tunnel1->npaths, (size_t)2);



	path = dma_tunnel1->paths[0];
@@ -2380,7 +2380,7 @@ static struct tb_tunnel *TB_TEST_DMA_TUNNEL2(struct kunit *test, 
	nhi = &host->ports[7];

	port = &dev->ports[3];

	dma_tunnel2 = tb_tunnel_alloc_dma(NULL, nhi, port, 9, 2, 9, 2);

	KUNIT_ASSERT_TRUE(test, dma_tunnel2 != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dma_tunnel2);

	KUNIT_ASSERT_EQ(test, dma_tunnel2->npaths, (size_t)2);



	path = dma_tunnel2->paths[0];
@@ -2496,50 +2496,50 @@ static void tb_test_property_parse(struct kunit *test) 
	struct tb_property *p;



	dir = tb_property_parse_dir(root_directory, ARRAY_SIZE(root_directory));

	KUNIT_ASSERT_TRUE(test, dir != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dir);



	p = tb_property_find(dir, "foo", TB_PROPERTY_TYPE_TEXT);

	KUNIT_ASSERT_TRUE(test, !p);

	KUNIT_ASSERT_NULL(test, p);



	p = tb_property_find(dir, "vendorid", TB_PROPERTY_TYPE_TEXT);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_STREQ(test, p->value.text, "Apple Inc.");



	p = tb_property_find(dir, "vendorid", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0xa27);



	p = tb_property_find(dir, "deviceid", TB_PROPERTY_TYPE_TEXT);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_STREQ(test, p->value.text, "Macintosh");



	p = tb_property_find(dir, "deviceid", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0xa);



	p = tb_property_find(dir, "missing", TB_PROPERTY_TYPE_DIRECTORY);

	KUNIT_ASSERT_TRUE(test, !p);

	KUNIT_ASSERT_NULL(test, p);



	p = tb_property_find(dir, "network", TB_PROPERTY_TYPE_DIRECTORY);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);



	network_dir = p->value.dir;

	KUNIT_EXPECT_TRUE(test, uuid_equal(network_dir->uuid, &network_dir_uuid));



	p = tb_property_find(network_dir, "prtcid", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0x1);



	p = tb_property_find(network_dir, "prtcvers", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0x1);



	p = tb_property_find(network_dir, "prtcrevs", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0x1);



	p = tb_property_find(network_dir, "prtcstns", TB_PROPERTY_TYPE_VALUE);

	KUNIT_ASSERT_TRUE(test, p != NULL);

	KUNIT_ASSERT_NOT_NULL(test, p);

	KUNIT_EXPECT_EQ(test, p->value.immediate, 0x0);



	p = tb_property_find(network_dir, "deviceid", TB_PROPERTY_TYPE_VALUE);
@@ -2558,7 +2558,7 @@ static void tb_test_property_format(struct kunit *test) 
	int ret, i;



	dir = tb_property_parse_dir(root_directory, ARRAY_SIZE(root_directory));

	KUNIT_ASSERT_TRUE(test, dir != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dir);



	ret = tb_property_format_dir(dir, NULL, 0);

	KUNIT_ASSERT_EQ(test, ret, ARRAY_SIZE(root_directory));
@@ -2566,7 +2566,7 @@ static void tb_test_property_format(struct kunit *test) 
	block_len = ret;



	block = kunit_kzalloc(test, block_len * sizeof(u32), GFP_KERNEL);

	KUNIT_ASSERT_TRUE(test, block != NULL);

	KUNIT_ASSERT_NOT_NULL(test, block);



	ret = tb_property_format_dir(dir, block, block_len);

	KUNIT_EXPECT_EQ(test, ret, 0);
@@ -2584,10 +2584,10 @@ static void compare_dirs(struct kunit *test, struct tb_property_dir *d1, 
	int n1, n2, i;



	if (d1->uuid) {

		KUNIT_ASSERT_TRUE(test, d2->uuid != NULL);

		KUNIT_ASSERT_NOT_NULL(test, d2->uuid);

		KUNIT_ASSERT_TRUE(test, uuid_equal(d1->uuid, d2->uuid));

	} else {

		KUNIT_ASSERT_TRUE(test, d2->uuid == NULL);

		KUNIT_ASSERT_NULL(test, d2->uuid);

	}



	n1 = 0;
@@ -2606,9 +2606,9 @@ static void compare_dirs(struct kunit *test, struct tb_property_dir *d1, 
	p2 = NULL;

	for (i = 0; i < n1; i++) {

		p1 = tb_property_get_next(d1, p1);

		KUNIT_ASSERT_TRUE(test, p1 != NULL);

		KUNIT_ASSERT_NOT_NULL(test, p1);

		p2 = tb_property_get_next(d2, p2);

		KUNIT_ASSERT_TRUE(test, p2 != NULL);

		KUNIT_ASSERT_NOT_NULL(test, p2);



		KUNIT_ASSERT_STREQ(test, &p1->key[0], &p2->key[0]);

		KUNIT_ASSERT_EQ(test, p1->type, p2->type);
@@ -2616,14 +2616,14 @@ static void compare_dirs(struct kunit *test, struct tb_property_dir *d1, 


		switch (p1->type) {

		case TB_PROPERTY_TYPE_DIRECTORY:

			KUNIT_ASSERT_TRUE(test, p1->value.dir != NULL);

			KUNIT_ASSERT_TRUE(test, p2->value.dir != NULL);

			KUNIT_ASSERT_NOT_NULL(test, p1->value.dir);

			KUNIT_ASSERT_NOT_NULL(test, p2->value.dir);

			compare_dirs(test, p1->value.dir, p2->value.dir);

			break;



		case TB_PROPERTY_TYPE_DATA:

			KUNIT_ASSERT_TRUE(test, p1->value.data != NULL);

			KUNIT_ASSERT_TRUE(test, p2->value.data != NULL);

			KUNIT_ASSERT_NOT_NULL(test, p1->value.data);

			KUNIT_ASSERT_NOT_NULL(test, p2->value.data);

			KUNIT_ASSERT_TRUE(test,

				!memcmp(p1->value.data, p2->value.data,

					p1->length * 4)
@@ -2631,8 +2631,8 @@ static void compare_dirs(struct kunit *test, struct tb_property_dir *d1, 
			break;



		case TB_PROPERTY_TYPE_TEXT:

			KUNIT_ASSERT_TRUE(test, p1->value.text != NULL);

			KUNIT_ASSERT_TRUE(test, p2->value.text != NULL);

			KUNIT_ASSERT_NOT_NULL(test, p1->value.text);

			KUNIT_ASSERT_NOT_NULL(test, p2->value.text);

			KUNIT_ASSERT_STREQ(test, p1->value.text, p2->value.text);

			break;
@@ -2654,10 +2654,10 @@ static void tb_test_property_copy(struct kunit *test) 
	int ret, i;



	src = tb_property_parse_dir(root_directory, ARRAY_SIZE(root_directory));

	KUNIT_ASSERT_TRUE(test, src != NULL);

	KUNIT_ASSERT_NOT_NULL(test, src);



	dst = tb_property_copy_dir(src);

	KUNIT_ASSERT_TRUE(test, dst != NULL);

	KUNIT_ASSERT_NOT_NULL(test, dst);



	/* Compare the structures */

	compare_dirs(test, src, dst);
@@ -2667,7 +2667,7 @@ static void tb_test_property_copy(struct kunit *test) 
	KUNIT_ASSERT_EQ(test, ret, ARRAY_SIZE(root_directory));



	block = kunit_kzalloc(test, sizeof(root_directory), GFP_KERNEL);

	KUNIT_ASSERT_TRUE(test, block != NULL);

	KUNIT_ASSERT_NOT_NULL(test, block);



	ret = tb_property_format_dir(dst, block, ARRAY_SIZE(root_directory));

	KUNIT_EXPECT_TRUE(test, !ret);