From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A765A2356D9 for ; Thu, 23 Oct 2025 01:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181235; cv=none; b=ub/gN0RbOv+/XoXMWK3t1fo1MebxxzpnTrflHVmLrM2gLbYulYwPSg2LMMpOjEmTFjxKQFjj45oM0bSiw7pk235Po6rGaO7Of2mGyibQCb6QIxz9SacnVFZHqEKNCrHA4PtmgsQFuSEV9ZVxvPTyhOLU5+4/46zRzG7umZclzxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181235; c=relaxed/simple; bh=ldMhDtJSqTF6HhjHdYlIqeC6EPSyMpf4Tz0FTZQLeGE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RAczEoRKW+8nkim5vyANdgfEWHbvr8wJa5p0vrMRUJPoE7TVMvRfV9hiMBXFsoGpz55USZc667d5NjvBV7sQrx060G9lzJDiOBhWjpkYNtdQzey8L9gIn06ot5HGpegmxnt35N/vbhTtwHYe/yjg36G8BvNi+8nztsZBstYoS7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iG58bxwn; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iG58bxwn" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7833765433cso341056b3a.0 for ; Wed, 22 Oct 2025 18:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181233; x=1761786033; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jHfkVNY88Sc0q4SntuKgstPkJPF0CfHaltJaUqfEVbY=; b=iG58bxwnX7C7JqE/CWdLFV3SbWnqyj8cGBp6FVFwyVkxd1jxRh+kdAVmAILWTEVEU2 rLQwYY6sYmDHCPDoMXEQHeNepJ84oY2gtXJ8GVGtDR1QF1siAE06njR8pkzxwPLQrAIh ree/ZXUkR/U9HtzKtKp2KCfRCKZrfgS+4Axz5S501yITlFWngUKHbdgBGLJif7+gzsUY YL7HQ2I9QYUpfNzrqW/hAhCmvycrzD2G/vYc5M6hZwMqkpUjAS1PEdvrCN7hkm3CGIAG KTo4GvpZmxPzPmPfQ4Y3iM6eXAYob/PkMhhnJZQJzHzaGw5lskvCDbJ9v7MgwDNvjnDQ bsYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181233; x=1761786033; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jHfkVNY88Sc0q4SntuKgstPkJPF0CfHaltJaUqfEVbY=; b=UYviJc4HMXxB1e4e2eCvpvRGThfVn8RJPBwR8ycq8/IvUhUFL1otqOodUsIBr4UNwW 0F7/DSUiWY14IG1d/UglTEAXtXgpv7a4ecOYcTjezmrGM1uJdF/7BgMv0MT+KfVFUQ4r Arv01HbWbY+Ock6mujXEkesdqs6JWztd2bNpBm5KjZuGZCOZRmOZ/6Y4W0ysLVmDrNWe 7SSmwxUXBe/Iy7hFw02vm7OWOANq+7JdhHgD64gispwRyk1GXJy2MqcdSScdnlLjBWBk XR+tBgk/0/9Cfgsny3lc1bPYr/xCw+542UZXwbnurqor78Mi1L3Zt2x4dzyRkGuDFIQM WocA== X-Forwarded-Encrypted: i=1; AJvYcCU1oByZo5WgfyUxDHBn6gWZlc9Kq6hL5HSIeqkf8pLmD9cuHBvKP0+FBsZf9PLDoAcQQKBgpMAPeGwRmXH2iWY=@vger.kernel.org X-Gm-Message-State: AOJu0YwT3K7uD3Zvjp6gGohlnIrt6gJI5wu7LKedqZyNl6N0AMAyHZCu KcoVT4SrB28EULjK/SUKfJx3Ap7ToRclqYsDrjYroSFW9TTPIJYLemnYbkXb7mWS X-Gm-Gg: ASbGncvstj6xczIOL1NkNh128G4cfB+pPcOo90aOS7R/n1EvVxxH+rUWj9aGkrkhnUZ A77ZBlaKtlMd3Z8x/mee5kZScgQYRHE9ASoCOvo5vXvcRJfnHhWS4lAnWHMjb5HMRWTh0Otd+DD 9QTzBztvTbDNWj24kHVrC+5ZvzNo8/IEN/ojaXWJELFqaN9WH7Y/1dcOb9iwltNkb0JI9sxEfwN 6X1EFDdK/zWaA1jk6zUQl5vs3lO9V8J6zxTUmIAXQsK4NCanIclcsa8dsj7sTISNSL6IjN6MZNo TQPGRPvKIql8Jnx0KbjV12S/izyl8h6QGVZluZDluexCa6vd0eUZUeO7gHj9FPVM8e3EXsqFmqp kz9ITZmLOCD/yDsJ6cQg9vTXMcwxRuh8fqgKnz9pJu6G8d5+gM9irDahlda7ue47moV9Ggdo7 X-Google-Smtp-Source: AGHT+IEmheK4A1ko5QFpEBWLeWSltnMrHAw98m3F5BI5tqmt9PtwcLSEEh61GZCfGXRvh2RHxgaMVg== X-Received: by 2002:a05:6a20:1611:b0:334:a820:be1b with SMTP id adf61e73a8af0-334a8565b08mr28701692637.17.1761181232651; Wed, 22 Oct 2025 18:00:32 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6cf4c0e4e6sm362698a12.11.2025.10.22.18.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:31 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:12 -0700 Subject: [PATCH net-next 08/12] selftests/vsock: identify and execute tests that can re-use VM Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251022-vsock-selftests-fixes-and-improvements-v1-8-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman 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 --- 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