| 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
| ||
|
Message-ID: <f7oeyneht4vxtfolrgv36b5tu4zreffcwztimc6s5jixszjt75@yjkhcuhuwbpi>
Date: Tue, 30 Sep 2025 10:26:55 +0200
From: Stefano Garzarella <sgarzare@...hat.com>
To: Bobby Eshleman <bobbyeshleman@...il.com>
Cc: Shuah Khan <shuah@...nel.org>, "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>,
Stefan Hajnoczi <stefanha@...hat.com>, "Michael S. Tsirkin" <mst@...hat.com>,
Jason Wang <jasowang@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
Eugenio Pérez <eperezma@...hat.com>, "K. Y. Srinivasan" <kys@...rosoft.com>,
Haiyang Zhang <haiyangz@...rosoft.com>, Wei Liu <wei.liu@...nel.org>, Dexuan Cui <decui@...rosoft.com>,
Bryan Tan <bryan-bt.tan@...adcom.com>, Vishnu Dasa <vishnu.dasa@...adcom.com>,
Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>, virtualization@...ts.linux.dev, netdev@...r.kernel.org,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org, kvm@...r.kernel.org,
linux-hyperv@...r.kernel.org, berrange@...hat.com, Bobby Eshleman <bobbyeshleman@...a.com>
Subject: Re: [PATCH net-next v6 7/9] selftests/vsock: improve logging in
vmtest.sh
On Tue, Sep 16, 2025 at 04:43:51PM -0700, Bobby Eshleman wrote:
>From: Bobby Eshleman <bobbyeshleman@...a.com>
>
>Improve logging by adding configurable log levels. Additionally, 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.
>
>Signed-off-by: Bobby Eshleman <bobbyeshleman@...a.com>
>---
> tools/testing/selftests/vsock/vmtest.sh | 75 ++++++++++++++++-----------------
> 1 file changed, 37 insertions(+), 38 deletions(-)
>
>diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh
>index edacebfc1632..183647a86c8a 100755
>--- a/tools/testing/selftests/vsock/vmtest.sh
>+++ b/tools/testing/selftests/vsock/vmtest.sh
>@@ -51,7 +51,12 @@ readonly TEST_DESCS=(
> "Run vsock_test using the loopback transport in the VM."
> )
>
>-VERBOSE=0
>+readonly LOG_LEVEL_DEBUG=0
>+readonly LOG_LEVEL_INFO=1
>+readonly LOG_LEVEL_WARN=2
>+readonly LOG_LEVEL_ERROR=3
>+
>+VERBOSE="${LOG_LEVEL_WARN}"
If the default is 2, how the user can set 3 (error) ?
BTW I find a bit strange the reverse order.
Is this something specific to selftest?
The rest LGTM.
Thanks,
Stefano
>
> usage() {
> local name
>@@ -196,7 +201,7 @@ vm_start() {
>
> qemu=$(command -v "${QEMU}")
>
>- if [[ "${VERBOSE}" -eq 1 ]]; then
>+ if [[ ${VERBOSE} -le ${LOG_LEVEL_DEBUG} ]]; then
> verbose_opt="--verbose"
> logfile=/dev/stdout
> fi
>@@ -271,60 +276,56 @@ EOF
>
> host_wait_for_listener() {
> wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}"
>-}
>-
>-__log_stdin() {
>- cat | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }'
>-}
>
>-__log_args() {
>- echo "$*" | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }'
> }
>
> log() {
>- local prefix="$1"
>+ local redirect
>+ local prefix
>
>- shift
>- local redirect=
>- if [[ ${VERBOSE} -eq 0 ]]; then
>+ if [[ ${VERBOSE} -gt ${LOG_LEVEL_INFO} ]]; then
> redirect=/dev/null
> else
> redirect=/dev/stdout
> fi
>
>+ prefix="${LOG_PREFIX:-}"
>+
> if [[ "$#" -eq 0 ]]; then
>- __log_stdin | tee -a "${LOG}" > ${redirect}
>+ if [[ -n "${prefix}" ]]; then
>+ cat | awk -v prefix="${prefix}" '{printf "%s: %s\n", prefix, $0}'
>+ else
>+ cat
>+ fi
> else
>- __log_args "$@" | tee -a "${LOG}" > ${redirect}
>- fi
>+ if [[ -n "${prefix}" ]]; then
>+ echo "${prefix}: " "$@"
>+ else
>+ echo "$@"
>+ fi
>+ fi | tee -a "${LOG}" > ${redirect}
> }
>
>-log_setup() {
>- log "setup" "$@"
>+log_host() {
>+ LOG_PREFIX=host log $@
> }
>
>-log_host() {
>- local testname=$1
>+log_guest() {
>+ LOG_PREFIX=guest log $@
>+}
>
>- shift
>- log "test:${testname}:host" "$@"
> }
>
>-log_guest() {
>- local testname=$1
>
>- shift
>- log "test:${testname}:guest" "$@"
> }
>
> test_vm_server_host_client() {
>- local testname="${FUNCNAME[0]#test_}"
>
> vm_ssh -- "${VSOCK_TEST}" \
> --mode=server \
> --control-port="${TEST_GUEST_PORT}" \
> --peer-cid=2 \
>- 2>&1 | log_guest "${testname}" &
>+ 2>&1 | log_guest &
>
> vm_wait_for_listener "${TEST_GUEST_PORT}"
>
>@@ -332,18 +333,17 @@ test_vm_server_host_client() {
> --mode=client \
> --control-host=127.0.0.1 \
> --peer-cid="${VSOCK_CID}" \
>- --control-port="${TEST_HOST_PORT}" 2>&1 | log_host "${testname}"
>+ --control-port="${TEST_HOST_PORT}" 2>&1 | log_host
>
> return $?
> }
>
> test_vm_client_host_server() {
>- local testname="${FUNCNAME[0]#test_}"
>
> ${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 &
>
> host_wait_for_listener
>
>@@ -351,19 +351,18 @@ test_vm_client_host_server() {
> --mode=client \
> --control-host=10.0.2.2 \
> --peer-cid=2 \
>- --control-port="${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest "${testname}"
>+ --control-port="${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest
>
> return $?
> }
>
> test_vm_loopback() {
>- local testname="${FUNCNAME[0]#test_}"
> local port=60000 # non-forwarded local port
>
> vm_ssh -- "${VSOCK_TEST}" \
> --mode=server \
> --control-port="${port}" \
>- --peer-cid=1 2>&1 | log_guest "${testname}" &
>+ --peer-cid=1 2>&1 | log_guest &
>
> vm_wait_for_listener "${port}"
>
>@@ -371,7 +370,7 @@ test_vm_loopback() {
> --mode=client \
> --control-host="127.0.0.1" \
> --control-port="${port}" \
>- --peer-cid=1 2>&1 | log_guest "${testname}"
>+ --peer-cid=1 2>&1 | log_guest
>
> return $?
> }
>@@ -429,7 +428,7 @@ QEMU="qemu-system-$(uname -m)"
> while getopts :hvsq:b o
> do
> case $o in
>- v) VERBOSE=1;;
>+ v) VERBOSE=$(( VERBOSE - 1 ));;
> b) BUILD=1;;
> q) QEMU=$OPTARG;;
> h|*) usage;;
>@@ -452,10 +451,10 @@ handle_build
>
> echo "1..${#ARGS[@]}"
>
>-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"
>
> cnt_pass=0
> cnt_fail=0
>
>--
>2.47.3
>
Powered by blists - more mailing lists