linux-kernel - [PATCH 2/2] kunit: enable hardware acceleration when available

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20241025-kunit-qemu-accel-macos-v1-2-2f30c26192d4@gmail.com>
Date: Fri, 25 Oct 2024 17:03:54 -0400
From: Tamir Duberstein <tamird@...il.com>
To: Brendan Higgins <brendan.higgins@...ux.dev>, 
 David Gow <davidgow@...gle.com>, Rae Moar <rmoar@...gle.com>
Cc: linux-kselftest@...r.kernel.org, kunit-dev@...glegroups.com, 
 linux-kernel@...r.kernel.org, Tamir Duberstein <tamird@...il.com>
Subject: [PATCH 2/2] kunit: enable hardware acceleration when available

Use KVM or HVF if supported by the QEMU binary and available on the
system.

This produces a nice improvement on my Apple M3 Pro running macOS 14.7:

Before:
./tools/testing/kunit/kunit.py exec --arch arm64
[HH:MM:SS] Elapsed time: 10.145s

After:
./tools/testing/kunit/kunit.py exec --arch arm64
[HH:MM:SS] Elapsed time: 1.773s

Signed-off-by: Tamir Duberstein <tamird@...il.com>
---
 tools/testing/kunit/kunit_kernel.py       | 26 +++++++++++++++++++++++++-
 tools/testing/kunit/qemu_configs/arm64.py |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index 61931c4926fd6645f2c62dd13f9842a432ec4167..10cacf5a3c443bacd6c074647e4bddfc31599cf8 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -116,7 +116,8 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOperations):
 
 	def start(self, params: List[str], build_dir: str) -> subprocess.Popen:
 		kernel_path = os.path.join(build_dir, self._kernel_path)
-		qemu_command = ['qemu-system-' + self._qemu_arch,
+		qemu_binary = 'qemu-system-' + self._qemu_arch
+		qemu_command = [qemu_binary,
 				'-nodefaults',
 				'-m', '1024',
 				'-kernel', kernel_path,
@@ -124,6 +125,29 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOperations):
 				'-no-reboot',
 				'-nographic',
 				'-serial', self._serial] + self._extra_qemu_params
+		accelerators = {
+			line.strip()
+			for line in subprocess.check_output([qemu_binary, "-accel", "help"], text=True).splitlines()
+			if line and line.islower()
+		}
+		if 'kvm' in accelerators:
+			try:
+				with open('/dev/kvm', 'rb+'):
+					qemu_command.extend(['-accel', 'kvm'])
+			except OSError as e:
+				print(e)
+		elif 'hvf' in accelerators:
+			try:
+				for line in subprocess.check_output(['sysctl', 'kern.hv_support'], text=True).splitlines():
+					if not line:
+						continue
+					key, value = line.split(':')
+					if key == 'kern.hv_support' and bool(value):
+						qemu_command.extend(['-accel', 'hvf'])
+						break
+			except subprocess.CalledProcessError as e:
+				print(e)
+
 		# Note: shlex.join() does what we want, but requires python 3.8+.
 		print('Running tests with:\n$', ' '.join(shlex.quote(arg) for arg in qemu_command))
 		return subprocess.Popen(qemu_command,
diff --git a/tools/testing/kunit/qemu_configs/arm64.py b/tools/testing/kunit/qemu_configs/arm64.py
index d3ff27024755411441f910799be30399295c9541..5c44d3a87e6dd2cd6b086138186a277a1473585b 100644
--- a/tools/testing/kunit/qemu_configs/arm64.py
+++ b/tools/testing/kunit/qemu_configs/arm64.py
@@ -9,4 +9,4 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y''',
 			   qemu_arch='aarch64',
 			   kernel_path='arch/arm64/boot/Image.gz',
 			   kernel_command_line='console=ttyAMA0',
-			   extra_qemu_params=['-machine', 'virt', '-cpu', 'max,pauth-impdef=on'])
+			   extra_qemu_params=['-machine', 'virt', '-cpu', 'max'])

-- 
2.47.0