Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri,  8 Jul 2022 16:27:11 +0000
Message-Id: <20220708162711.1309633-1-dlatypov@google.com>
Mime-Version: 1.0
Subject: [PATCH v3] kunit: tool: Enable virtio/PCI by default on UML
From:   Daniel Latypov <dlatypov@google.com>
To:     brendanhiggins@google.com, davidgow@google.com
Cc:     linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com,
        linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org,
        "=?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?=" <jose.exposito89@gmail.com>,
        Daniel Latypov <dlatypov@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: David Gow <davidgow@google.com>

There are several tests which depend on PCI, and hence need a bunch of
extra options to run under UML. This makes it awkward to give
configuration instructions (whether in documentation, or as part of a
.kunitconfig file), as two separate, incompatible sets of config options
are required for UML and "most other architectures".

For non-UML architectures, it's possible to add default kconfig options
via the qemu_config python files, but there's no equivalent for UML. Add
a new tools/testing/kunit/configs/arch_uml.config file containing extra
kconfig options to use on UML.

Tested-by: Jos=C3=A9 Exp=C3=B3sito <jose.exposito89@gmail.com>
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Daniel Latypov <dlatypov@google.com>
---

NOTE: This depends on v4 of the repeatable --kunitconfig patch here:
https://patchwork.kernel.org/project/linux-kselftest/patch/20220708013632.1=
210466-1-dlatypov@google.com/
Please apply it first first.

Changes since v2: (dlatypov@google.com)
- Rebase on top of the -kselftest kunit branch + v4 of the --kunitconfig
  patch. It rebased cleanly, but it evidently would not apply cleanly
  due to all the conflicts v4 --kunitconfig had with --qemu_args

Changes since v1:
https://lore.kernel.org/linux-kselftest/20220624084400.1454579-1-davidgow@g=
oogle.com/
- (Hopefully) fix a pytype warning re: architecture being None in the
  tests. (Thanks, Daniel)
- Rebase on top of the new combined v3 of the kconfig/kunitconfig
  patchset.
- Add Jos=C3=A9's Tested-by and Daniel's Reviewed-by.

Changes since RFC:
https://lore.kernel.org/linux-kselftest/20220622035326.759935-1-davidgow@go=
ogle.com/
- Rebase on top of the previous kconfig patches.
- Fix a missing make_arch_qemuconfig->make_arch_config rename (Thanks
  Brendan)
- Fix the tests to use the base LinuxSourceTreeOperations class, which
  has no default kconfig options (and so won't conflict with those set
  in the tests). Only test_build_reconfig_existing_config actually
  failed, but I updated a few more in case the defaults changed.

---
 tools/testing/kunit/configs/arch_uml.config |  5 +++++
 tools/testing/kunit/kunit_kernel.py         | 14 ++++++++++----
 tools/testing/kunit/kunit_tool_test.py      | 12 ++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 tools/testing/kunit/configs/arch_uml.config

diff --git a/tools/testing/kunit/configs/arch_uml.config b/tools/testing/ku=
nit/configs/arch_uml.config
new file mode 100644
index 000000000000..e824ce43b05a
--- /dev/null
+++ b/tools/testing/kunit/configs/arch_uml.config
@@ -0,0 +1,5 @@
+# Config options which are added to UML builds by default
+
+# Enable virtio/pci, as a lot of tests require it.
+CONFIG_VIRTIO_UML=3Dy
+CONFIG_UML_PCI_OVER_VIRTIO=3Dy
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kuni=
t_kernel.py
index 56492090e28e..f5c26ea89714 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -26,6 +26,7 @@ KUNITCONFIG_PATH =3D '.kunitconfig'
 OLD_KUNITCONFIG_PATH =3D 'last_used_kunitconfig'
 DEFAULT_KUNITCONFIG_PATH =3D 'tools/testing/kunit/configs/default.config'
 BROKEN_ALLCONFIG_PATH =3D 'tools/testing/kunit/configs/broken_on_uml.confi=
g'
+UML_KCONFIG_PATH =3D 'tools/testing/kunit/configs/arch_uml.config'
 OUTFILE_PATH =3D 'test.log'
 ABS_TOOL_PATH =3D os.path.abspath(os.path.dirname(__file__))
 QEMU_CONFIGS_DIR =3D os.path.join(ABS_TOOL_PATH, 'qemu_configs')
@@ -53,7 +54,7 @@ class LinuxSourceTreeOperations:
 		except subprocess.CalledProcessError as e:
 			raise ConfigError(e.output.decode())
=20
-	def make_arch_qemuconfig(self, base_kunitconfig: kunit_config.Kconfig) ->=
 kunit_config.Kconfig:
+	def make_arch_config(self, base_kunitconfig: kunit_config.Kconfig) -> kun=
it_config.Kconfig:
 		return base_kunitconfig
=20
 	def make_allyesconfig(self, build_dir: str, make_options) -> None:
@@ -109,7 +110,7 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOper=
ations):
 		self._kernel_command_line =3D qemu_arch_params.kernel_command_line + ' k=
unit_shutdown=3Dreboot'
 		self._extra_qemu_params =3D qemu_arch_params.extra_qemu_params
=20
-	def make_arch_qemuconfig(self, base_kunitconfig: kunit_config.Kconfig) ->=
 kunit_config.Kconfig:
+	def make_arch_config(self, base_kunitconfig: kunit_config.Kconfig) -> kun=
it_config.Kconfig:
 		kconfig =3D kunit_config.parse_from_string(self._kconfig)
 		kconfig.merge_in_entries(base_kunitconfig)
 		return kconfig
@@ -138,6 +139,11 @@ class LinuxSourceTreeOperationsUml(LinuxSourceTreeOper=
ations):
 	def __init__(self, cross_compile=3DNone):
 		super().__init__(linux_arch=3D'um', cross_compile=3Dcross_compile)
=20
+	def make_arch_config(self, base_kunitconfig: kunit_config.Kconfig) -> kun=
it_config.Kconfig:
+		kconfig =3D kunit_config.parse_file(UML_KCONFIG_PATH)
+		kconfig.merge_in_entries(base_kunitconfig)
+		return kconfig
+
 	def make_allyesconfig(self, build_dir: str, make_options) -> None:
 		stdout.print_with_timestamp(
 			'Enabling all CONFIGs for UML...')
@@ -298,7 +304,7 @@ class LinuxSourceTree:
 		if build_dir and not os.path.exists(build_dir):
 			os.mkdir(build_dir)
 		try:
-			self._kconfig =3D self._ops.make_arch_qemuconfig(self._kconfig)
+			self._kconfig =3D self._ops.make_arch_config(self._kconfig)
 			self._kconfig.write_to_file(kconfig_path)
 			self._ops.make_olddefconfig(build_dir, make_options)
 		except ConfigError as e:
@@ -329,7 +335,7 @@ class LinuxSourceTree:
 			return self.build_config(build_dir, make_options)
=20
 		existing_kconfig =3D kunit_config.parse_file(kconfig_path)
-		self._kconfig =3D self._ops.make_arch_qemuconfig(self._kconfig)
+		self._kconfig =3D self._ops.make_arch_config(self._kconfig)
=20
 		if self._kconfig.is_subset_of(existing_kconfig) and not self._kunitconfi=
g_changed(build_dir):
 			return True
diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/k=
unit_tool_test.py
index ad63d0d34f3f..446ac432d9a4 100755
--- a/tools/testing/kunit/kunit_tool_test.py
+++ b/tools/testing/kunit/kunit_tool_test.py
@@ -430,6 +430,10 @@ class LinuxSourceTreeTest(unittest.TestCase):
 				f.write('CONFIG_KUNIT=3Dy')
=20
 			tree =3D kunit_kernel.LinuxSourceTree(build_dir)
+			# Stub out the source tree operations, so we don't have
+			# the defaults for any given architecture get in the
+			# way.
+			tree._ops =3D kunit_kernel.LinuxSourceTreeOperations('none', None)
 			mock_build_config =3D mock.patch.object(tree, 'build_config').start()
=20
 			# Should generate the .config
@@ -447,6 +451,10 @@ class LinuxSourceTreeTest(unittest.TestCase):
 				f.write('CONFIG_KUNIT=3Dy\nCONFIG_KUNIT_TEST=3Dy')
=20
 			tree =3D kunit_kernel.LinuxSourceTree(build_dir)
+			# Stub out the source tree operations, so we don't have
+			# the defaults for any given architecture get in the
+			# way.
+			tree._ops =3D kunit_kernel.LinuxSourceTreeOperations('none', None)
 			mock_build_config =3D mock.patch.object(tree, 'build_config').start()
=20
 			self.assertTrue(tree.build_reconfig(build_dir, make_options=3D[]))
@@ -463,6 +471,10 @@ class LinuxSourceTreeTest(unittest.TestCase):
 				f.write('CONFIG_KUNIT=3Dy\nCONFIG_KUNIT_TEST=3Dy')
=20
 			tree =3D kunit_kernel.LinuxSourceTree(build_dir)
+			# Stub out the source tree operations, so we don't have
+			# the defaults for any given architecture get in the
+			# way.
+			tree._ops =3D kunit_kernel.LinuxSourceTreeOperations('none', None)
 			mock_build_config =3D mock.patch.object(tree, 'build_config').start()
=20
 			# ... so we should trigger a call to build_config()

base-commit: cbb6bc7059151df198b45e883ed731d8f528b65b
--=20
2.37.0.rc0.161.g10f37bed90-goog