virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Bobby Eshleman <bobbyeshleman@gmail.com>
To: Stefano Garzarella <sgarzare@redhat.com>,
	Shuah Khan <shuah@kernel.org>,
	 Bobby Eshleman <bobbyeshleman@gmail.com>,
	Jakub Kicinski <kuba@kernel.org>
Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org,
	 linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Bobby Eshleman <bobbyeshleman@meta.com>
Subject: [PATCH net-next 08/12] selftests/vsock: identify and execute tests that can re-use VM
Date: Wed, 22 Oct 2025 18:00:12 -0700	[thread overview]
Message-ID: <20251022-vsock-selftests-fixes-and-improvements-v1-8-edeb179d6463@meta.com> (raw)
In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com>

From: Bobby Eshleman <bobbyeshleman@meta.com>

In preparation for future patches that introduce tests that cannot
re-use the same VM, add functions to identify those that *can* re-use a
VM.

By continuing to re-use the same VM for these tests we can save time by
avoiding the delay of booting a VM for every test.

Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
---
 tools/testing/selftests/vsock/vmtest.sh | 63 ++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh
index 0957d6a41d08..a728958c58ee 100755
--- a/tools/testing/selftests/vsock/vmtest.sh
+++ b/tools/testing/selftests/vsock/vmtest.sh
@@ -45,6 +45,8 @@ readonly TEST_DESCS=(
 	"Run vsock_test using the loopback transport in the VM."
 )
 
+readonly USE_SHARED_VM=(vm_server_host_client vm_client_host_server vm_loopback)
+
 VERBOSE=0
 
 usage() {
@@ -454,7 +456,44 @@ test_vm_loopback() {
 	return "${KSFT_PASS}"
 }
 
-run_test() {
+shared_vm_test() {
+	local tname
+
+	tname="${1}"
+
+	for testname in "${USE_SHARED_VM[@]}"; do
+		if [[ "${tname}" == "${testname}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+shared_vm_tests_requested() {
+	for arg in "$@"; do
+		if shared_vm_test "${arg}"; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+run_shared_vm_tests() {
+	local arg
+
+	for arg in "$@"; do
+		if ! shared_vm_test "${arg}"; then
+			continue
+		fi
+
+		run_shared_vm_test "${arg}"
+		check_result $?
+	done
+}
+
+run_shared_vm_test() {
 	local host_oops_cnt_before
 	local host_warn_cnt_before
 	local vm_oops_cnt_before
@@ -528,23 +567,21 @@ handle_build
 
 echo "1..${#ARGS[@]}"
 
-log_host "Booting up VM"
-pidfile="$(mktemp -u $PIDFILE_TEMPLATE)"
-vm_start "${pidfile}"
-vm_wait_for_ssh
-log_host "VM booted up"
-
 cnt_pass=0
 cnt_fail=0
 cnt_skip=0
 cnt_total=0
-for arg in "${ARGS[@]}"; do
-	run_test "${arg}"
-	rc=$?
-	check_result ${rc}
-done
 
-terminate_pidfiles "${pidfile}"
+if shared_vm_tests_requested "${ARGS[@]}"; then
+	log_host "Booting up VM"
+	pidfile=$(mktemp $PIDFILE_TEMPLATE)
+	vm_start "${pidfile}"
+	vm_wait_for_ssh
+	log_host "VM booted up"
+
+	run_shared_vm_tests "${ARGS[@]}"
+	terminate_pidfiles "${pidfile}"
+fi
 
 echo "SUMMARY: PASS=${cnt_pass} SKIP=${cnt_skip} FAIL=${cnt_fail}"
 echo "Log: ${LOG}"

-- 
2.47.3


  parent reply	other threads:[~2025-10-23  1:00 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-23  1:00 [PATCH net-next 00/12] selftests/vsock: refactor and improve vmtest infrastructure Bobby Eshleman
2025-10-23  1:00 ` [PATCH net-next 01/12] selftests/vsock: improve logging in vmtest.sh Bobby Eshleman
2025-10-27 16:45   ` Simon Horman
2025-10-27 17:28     ` Bobby Eshleman
2025-10-23  1:00 ` [PATCH net-next 02/12] selftests/vsock: make wait_for_listener() work even if pipefail is on Bobby Eshleman
2025-10-27 16:48   ` Simon Horman
2025-10-27 17:55     ` Bobby Eshleman
2025-10-29 16:56       ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 03/12] selftests/vsock: reuse logic for vsock_test through wrapper functions Bobby Eshleman
2025-10-27 16:58   ` Simon Horman
2025-10-27 18:01     ` Bobby Eshleman
2025-10-27 19:08       ` Bobby Eshleman
2025-10-27 23:22         ` Jakub Kicinski
2025-10-28 18:20           ` Bobby Eshleman
2025-10-29 16:58         ` Simon Horman
2025-10-29 17:00           ` Bobby Eshleman
2025-10-23  1:00 ` [PATCH net-next 04/12] selftests/vsock: avoid multi-VM pidfile collisions with QEMU Bobby Eshleman
2025-10-27 16:57   ` Simon Horman
2025-10-27 18:01     ` Bobby Eshleman
2025-10-23  1:00 ` [PATCH net-next 05/12] selftests/vsock: do not unconditionally die if qemu fails Bobby Eshleman
2025-10-29 16:58   ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 06/12] selftests/vsock: speed up tests by reducing the QEMU pidfile timeout Bobby Eshleman
2025-10-29 16:59   ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 07/12] selftests/vsock: add check_result() for pass/fail counting Bobby Eshleman
2025-10-29 16:59   ` Simon Horman
2025-10-23  1:00 ` Bobby Eshleman [this message]
2025-10-29 16:59   ` [PATCH net-next 08/12] selftests/vsock: identify and execute tests that can re-use VM Simon Horman
2025-10-23  1:00 ` [PATCH net-next 09/12] selftests/vsock: add BUILD=0 definition Bobby Eshleman
2025-10-27 17:45   ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 10/12] selftests/vsock: avoid false-positives when checking dmesg Bobby Eshleman
2025-10-29 17:00   ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 11/12] selftests/vsock: add 1.37 to tested virtme-ng versions Bobby Eshleman
2025-10-29 17:01   ` Simon Horman
2025-10-23  1:00 ` [PATCH net-next 12/12] selftests/vsock: add vsock_loopback module loading Bobby Eshleman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251022-vsock-selftests-fixes-and-improvements-v1-8-edeb179d6463@meta.com \
    --to=bobbyeshleman@gmail.com \
    --cc=bobbyeshleman@meta.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sgarzare@redhat.com \
    --cc=shuah@kernel.org \
    --cc=virtualization@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).