From nobody Tue Feb 10 13:16:29 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 2BB0919F135 for ; Thu, 23 Oct 2025 01:00:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181228; cv=none; b=KVsFQhmFye65UcSbrMHCfZDPcbfDy2bzAB8RyBKeHJ7lGQQ11WMG3pYYPQCQVXwysSHOBuZ8zbCwHG67nJXp5BI2LuukvTA/3+ZzAuFH3ML8ncesXGxiaj+utBw+2HKY6SFxBji6W7MkLW5ZZ6CBeah+kLDZ4hJtp0DVrtIeXP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181228; c=relaxed/simple; bh=U0+iogbO2NAE9Gz/LUnVfHwQ3vHz0eclu+dJB7jTvdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ucFpqh6Vlt1u/DV0iKGyPuY7Rm5NKfHXQZQwYSYY3/3QfVfY9R57c89DGfNbBrpgPUZEYFox7APP3Mhr568e4kdtftuUAl84kE4iQsPLZa2jxvZh13RUxk+/GgoPrkQupSMF8Aj3dcB2EBUZNbRIB0Jlaw4wGjuYeWF0ApCgFuI= 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=lityToyL; arc=none smtp.client-ip=209.85.214.172 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="lityToyL" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-290cd62acc3so2595705ad.2 for ; Wed, 22 Oct 2025 18:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181225; x=1761786025; 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=oW0MnMyTuve6rQX9Tu+VETj6VkCGFjnMpCoeDie56zE=; b=lityToyLvMUq8FlSUl6Tsxm1qVzadU4iTan/Sy0y02mIdMe8/NyGkcc9Uw13L1Q9Z1 Z3Zr8RJdu43IArHWkdWmLS0XOinSs6TcBTwyCC3kzhS8PpZhaLpSkrxS0E4vN1tIlrre QK5o1x8E059pa1Cva1o4ryPlWKX49Tb2JaBe7pvsZNJ1VMZj4mIdWkU+AEtUB2bKlxXQ RnU3TqseRWA4TmG6WlXy6SMunph7OmDWh+JyTqFCok/WnaSdIiYJCHCde4eo1k9N0sQj HztylMnXU98k6JmEJTc4BT0SABWPg9iy+IVqfs605WZuZWaJvGN+GQXEHaPo4vZnXjs0 04DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181225; x=1761786025; 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=oW0MnMyTuve6rQX9Tu+VETj6VkCGFjnMpCoeDie56zE=; b=oWf4lIth0d1xEigxcrD87El0eGB4l1tDqTG5SrRAt7YmxNYXsDFlIiYYcG8lnO3Ul/ e3c++YY8oKSAOLCHqVltNTb/ezJnkHp6MpWy567Qab3mqTDsjCZ6RS4P3KvCu/vH+/W8 B0ttYfMEwe6hXoc/G+j9iDTAy3pG3Pc5hYqoH/f6VvkkTnDZQ3HgH9mo6lRbZejvV93Y 9uwvkJjQV8GW0IoIUijRqgF7+OqPQnjXwRB7SX7SFAlQtmh2Dnbn+arvkAN9RJhN/rp3 ws6Lt4T9ppLSIZd6vq6W/q7sgmPYeO9V9bPaF2uftgHQo4vKbvnYN0Vbf+YU/27BK//1 MUfA== X-Forwarded-Encrypted: i=1; AJvYcCVg3mLWWFxoQplCF2UJ9OPVTkdgdEsdJtjyuyv7TJMxbJaEU6vcwO3i+ZgG+bj66JZLnnz/tUNqkOmCmLY=@vger.kernel.org X-Gm-Message-State: AOJu0YxfVwXNAO1kRrsAB/YQ2P/L+Zkz7q8Ngl9nzlPq3yEjBM2Tk1AZ E23w77UXSWzIEj7gK3KHCKBkILRFidTmKRIAjvjG8qBLShXG4mt+xVe8 X-Gm-Gg: ASbGncuvQvYPRcEm2LMJVJNN1xtZmkUTByRInoRNk9vpKovQDT7rmrvltc5zEROGxPj /WaSqz/tB/ppuE5iKbSDj28ryYaMLgqGgkgDNZzg6noCIdwKAiwRaqwNx3Oj8LJrLEeMZmvt+yn 7+i9M+1EFlRZ7cSgk1Nwhxla3p8J5ZUmJrcKLF6HrENIsZkLiX1Uu6bbPW/1n+fWYdGdGPiPcLH dEqx0iOD2WpTo84gKzIrvu15SmfEYqSOR9cIn6L4kyw/jq6bkS9v64++dxTo0xP1/PxJPO+caH9 FLH0mUMKqUORFixvXv3Ca7+YDFThr5/dur/FDH4imnx8XZUDHMV4XnPZlEDKN3QgiTLjqKrVxQC ueVDtTVgB7S4HdulP8MUGhvIlpOWj+Ynyw+iUONfpC2PM7cbxHxTZRFRwV5JSCEKsFuO9sJKeLT llgXfHP30= X-Google-Smtp-Source: AGHT+IHG++8q7Kb1lCEC8iKHKpMzuHPgGkCaxiytL35YQPpXEzIYeu+Im2bo6LwrLWNlMz3x3oU9yA== X-Received: by 2002:a17:902:d492:b0:293:623:3246 with SMTP id d9443c01a7336-29306233744mr52514715ad.13.1761181225265; Wed, 22 Oct 2025 18:00:25 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2946dda86f8sm4582525ad.1.2025.10.22.18.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:24 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:05 -0700 Subject: [PATCH net-next 01/12] selftests/vsock: improve logging in vmtest.sh Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251022-vsock-selftests-fixes-and-improvements-v1-1-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 Improve usability of logging functions. Remove the test name prefix from logging functions so that logging calls can be made deeper into the call stack without passing down the test name or setting some global. Teach log function to accept a LOG_PREFIX variable to avoid unnecessary argument shifting. Remove log_setup() and instead use log_host(). The host/guest prefixes are useful to show whether a failure happened on the guest or host side, but "setup" doesn't really give additional useful information. Since all log_setup() calls happen on the host, lets just use log_host() instead. Signed-off-by: Bobby Eshleman --- Changes from previous series: - do not use log levels, keep as on/off switch, after revising the other patch series the levels became unnecessary. --- tools/testing/selftests/vsock/vmtest.sh | 69 ++++++++++++++---------------= ---- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index edacebfc1632..561600814bef 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -271,60 +271,51 @@ EOF =20 host_wait_for_listener() { wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_MAX}" -} - -__log_stdin() { - cat | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' -} =20 -__log_args() { - echo "$*" | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' } =20 log() { - local prefix=3D"$1" + local redirect + local prefix =20 - shift - local redirect=3D if [[ ${VERBOSE} -eq 0 ]]; then redirect=3D/dev/null else redirect=3D/dev/stdout fi =20 + prefix=3D"${LOG_PREFIX:-}" + if [[ "$#" -eq 0 ]]; then - __log_stdin | tee -a "${LOG}" > ${redirect} + if [[ -n "${prefix}" ]]; then + cat | awk -v prefix=3D"${prefix}" '{printf "%s: %s\n", prefix, $0}' + else + cat + fi else - __log_args "$@" | tee -a "${LOG}" > ${redirect} - fi -} - -log_setup() { - log "setup" "$@" + if [[ -n "${prefix}" ]]; then + echo "${prefix}: " "$@" + else + echo "$@" + fi + fi | tee -a "${LOG}" > ${redirect} } =20 log_host() { - local testname=3D$1 - - shift - log "test:${testname}:host" "$@" + LOG_PREFIX=3Dhost log $@ } =20 log_guest() { - local testname=3D$1 - - shift - log "test:${testname}:guest" "$@" + LOG_PREFIX=3Dguest log $@ } =20 test_vm_server_host_client() { - local testname=3D"${FUNCNAME[0]#test_}" =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${TEST_GUEST_PORT}" \ --peer-cid=3D2 \ - 2>&1 | log_guest "${testname}" & + 2>&1 | log_guest & =20 vm_wait_for_listener "${TEST_GUEST_PORT}" =20 @@ -332,18 +323,17 @@ test_vm_server_host_client() { --mode=3Dclient \ --control-host=3D127.0.0.1 \ --peer-cid=3D"${VSOCK_CID}" \ - --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host "${testname}" + --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host =20 return $? } =20 test_vm_client_host_server() { - local testname=3D"${FUNCNAME[0]#test_}" =20 ${VSOCK_TEST} \ --mode "server" \ --control-port "${TEST_HOST_PORT_LISTENER}" \ - --peer-cid "${VSOCK_CID}" 2>&1 | log_host "${testname}" & + --peer-cid "${VSOCK_CID}" 2>&1 | log_host & =20 host_wait_for_listener =20 @@ -351,19 +341,18 @@ test_vm_client_host_server() { --mode=3Dclient \ --control-host=3D10.0.2.2 \ --peer-cid=3D2 \ - --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest "${testna= me}" + --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest =20 return $? } =20 test_vm_loopback() { - local testname=3D"${FUNCNAME[0]#test_}" local port=3D60000 # non-forwarded local port =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" & + --peer-cid=3D1 2>&1 | log_guest & =20 vm_wait_for_listener "${port}" =20 @@ -371,7 +360,7 @@ test_vm_loopback() { --mode=3Dclient \ --control-host=3D"127.0.0.1" \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" + --peer-cid=3D1 2>&1 | log_guest =20 return $? } @@ -399,25 +388,25 @@ run_test() { =20 host_oops_cnt_after=3D$(dmesg | grep -i 'Oops' | wc -l) if [[ ${host_oops_cnt_after} -gt ${host_oops_cnt_before} ]]; then - echo "FAIL: kernel oops detected on host" | log_host "${name}" + echo "FAIL: kernel oops detected on host" | log_host rc=3D$KSFT_FAIL fi =20 host_warn_cnt_after=3D$(dmesg --level=3Dwarn | wc -l) if [[ ${host_warn_cnt_after} -gt ${host_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on host" | log_host "${name}" + echo "FAIL: kernel warning detected on host" | log_host rc=3D$KSFT_FAIL fi =20 vm_oops_cnt_after=3D$(vm_ssh -- dmesg | grep -i 'Oops' | wc -l) if [[ ${vm_oops_cnt_after} -gt ${vm_oops_cnt_before} ]]; then - echo "FAIL: kernel oops detected on vm" | log_host "${name}" + echo "FAIL: kernel oops detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 vm_warn_cnt_after=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on vm" | log_host "${name}" + echo "FAIL: kernel warning detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 @@ -452,10 +441,10 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_setup "Booting up VM" +log_host "Booting up VM" vm_start vm_wait_for_ssh -log_setup "VM booted up" +log_host "VM booted up" =20 cnt_pass=3D0 cnt_fail=3D0 --=20 2.47.3