From nobody Mon Dec 1 22:41:03 2025 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.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 D94D02E8B7C for ; Fri, 28 Nov 2025 22:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764367721; cv=none; b=LaIukGaW++kwD8OWWLuk4OCob1Z+i67Wiow5s6ap1RI+a02ijkgK0OzJ3m/l/NJnGzdHXGF5xueT/gaMMN2opNfPxIMeYVN9lQsGxvgXEr/h9TF8huC7szCrF9ydfQ3uRTj01EElNxvzCtMCFCCzZK7HLSNUKbzihsRa1GsA2Pc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764367721; c=relaxed/simple; bh=hn/kxg8v9iI6fPhbZcD8Tj+G//s0QmgoWLVA/hu8hV4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LSCuLxWG2hNLr18BkIyZDiiD6mUGJihzHm0yFNCIbtYzq9ZyvnXK8FOUGVF+rU6tKjdqcujFbMAJv+vRHrbu3tFNJsfIgXAckr1ywYe2XLC63GuJos2vA7BOzxE4BdTU1O6hhNUYBfewD4A/JjHviKVuhHV8Ju1WGrF2XG1hyog= 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=E+qFHD+U; arc=none smtp.client-ip=209.85.210.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="E+qFHD+U" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7aae5f2633dso2737638b3a.3 for ; Fri, 28 Nov 2025 14:08:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764367719; x=1764972519; 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=3/fAPe5zn1MJUzjr0NdBaLTd5ohKsQq+JKoQHPiFo9E=; b=E+qFHD+U3Qx0NvVgJkjGAto3C4uPyVjVbHCApsEOUSyV/H2yKoelUWvpnua3NnA2uS R6QWxiSj9Hep8AieHC4c+WF4ZzLU2YjMGk8+aTkCWTvhc+em6Qx4spq73sqtFrJvcLY5 afV9jsvgyTYK2V1C8hyeVOPlbXdmO/FdLpgcQMKWR2LvxktBW2LX+FzCWqu2SyOGHH+W 2SH5kC4TV0G9Jgb9T3m3JG+DdQzjLSMHYfq2ImIQHYBM5cq/tPWcM0Qv949FCc8M3YtS JIdcCvroOHLsj3f6krgjSb5Jej0lrJT3seXVUXoLIN5JfazcvMjH5ZFkp1FATlJzWZ3a 3C2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764367719; x=1764972519; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3/fAPe5zn1MJUzjr0NdBaLTd5ohKsQq+JKoQHPiFo9E=; b=FDGdr4H/Y7Ss1rz8FaQetO5Z4cktsH48Io/+WdPunBBxJ2Snqh80cTa4bU1HymIGjW dsQ3d+Uu2MgZCWi9etnfsTzixJXqe46gKxMex7AdSP5PMduyYj66Nh1JLyYtXI4CgmF2 DIRig2sS86uegO86HX7NcAlT9RX9Ek1PUY+xgblEyyxHYbvO96Y6uIa7xvWZI5tzdRcr dziUngLalXsRo+8HMtpM3dn6Bn/UJyKpGxIBpuyo9YG41rop2kglyKBJB96dyD5clTUN vL9ylO2/YcV/Ki++LnXy6469ZG71uzQB9ZEy0YmBoqj6DHSn7NvYZyyQVnLBxJYzFevb 64/A== X-Forwarded-Encrypted: i=1; AJvYcCXxuMz0NFZnMORmMJ4hGFKxyLbPAL9dF/umyvosEAlA/ThSWqVve9FACJe69HK4i0DWppDA3vPVxY1BeNY=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq96LOWhQXENBmGy+WPAR1T39qP0QLLgvGCLDDb+Na35Ia1ytD 8T/Ayf6GihGPboMS8EuYS3oxG5OtmqmiA46r2ztmIZG+Hn/gYFjRJ+Ux X-Gm-Gg: ASbGncuLC3qQ9C0ZhZ+A8/MQcPubvqu5EuhZFzRngUBHlRqgn2LeRBk8/jTtsiGKIPO yr4SdPMWMlJZvd8f4KmlwRKIs4O2jRBk8dld8YqiSiNWPDGzA833j8bfOEKd473WfgIHHmwQCm2 0aeBk882QGwI+93fU6ksrtT2gU1LKB4c6vYdVND1Rg1nGrk6Xqk0iQAUhzJksJ5114z/G34UYf+ 01+b7Crib0TBSsMvmR09Vi8XCco3oayFW9J2P5fAnI40lJemlQgwL45+xbWDzBB/bVVOg3sepSr 0ogUYGgoTGGCVlrjw6PwXcyEZaVMx5avz5nemhTjCESPmGtY/+QBU/bk3Fdg120GlIBr0InGFka NsJeTsI451Bbd+N1xW+RBb08kGKJoaUpfGmaSDmeIMBbKYch3KqIGY3IoESX0k9Qby/KkzBIqFz ipYNYQMnYv8ig2+yz1yQ== X-Google-Smtp-Source: AGHT+IGHZEWFQ0KjoUVeTZE930c9/q5lskB5MxuqjPefp4lXxRMi5yyhmjD7WBYkTxgYnWwGS6AQuA== X-Received: by 2002:a05:7022:f691:b0:119:e569:fba1 with SMTP id a92af1059eb24-11c9d717970mr22737261c88.16.1764367718821; Fri, 28 Nov 2025 14:08:38 -0800 (PST) Received: from [192.168.15.94] ([2804:7f1:ebc3:752f:12e1:8eff:fe46:88b8]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11dcaee660asm26824205c88.3.2025.11.28.14.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 14:08:38 -0800 (PST) From: Andre Carvalho Date: Fri, 28 Nov 2025 22:08:04 +0000 Subject: [PATCH net-next v8 5/5] selftests: netconsole: validate target resume 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: <20251128-netcons-retrigger-v8-5-0bccbf4c6385@gmail.com> References: <20251128-netcons-retrigger-v8-0-0bccbf4c6385@gmail.com> In-Reply-To: <20251128-netcons-retrigger-v8-0-0bccbf4c6385@gmail.com> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Andre Carvalho X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764367687; l=6537; i=asantostc@gmail.com; s=20250807; h=from:subject:message-id; bh=hn/kxg8v9iI6fPhbZcD8Tj+G//s0QmgoWLVA/hu8hV4=; b=VBxaoFHaw3juwU/yfhuN3hXGZCPa6kWgBe5dOdchPvA9SX5oc+t8abLbQaC4QQ/ZJ/0ZDfq3+ wGabWcqagPaChRFU4W0zBmvb/ijfQ9oxfLm1jS4CsFar1iUVhOsE6yz X-Developer-Key: i=asantostc@gmail.com; a=ed25519; pk=eWre+RwFHCxkiaQrZLsjC67mZ/pZnzSM/f7/+yFXY4Q= Introduce a new netconsole selftest to validate that netconsole is able to resume a deactivated target when the low level interface comes back. The test setups the network using netdevsim, creates a netconsole target and then remove/add netdevsim in order to bring the same interfaces back. Afterwards, the test validates that the target works as expected. Targets are created via cmdline parameters to the module to ensure that we are able to resume targets that were bound by mac and interface name. Reviewed-by: Breno Leitao Signed-off-by: Andre Carvalho --- tools/testing/selftests/drivers/net/Makefile | 1 + .../selftests/drivers/net/lib/sh/lib_netcons.sh | 35 ++++++-- .../selftests/drivers/net/netcons_resume.sh | 97 ++++++++++++++++++= ++++ 3 files changed, 128 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index f5c71d993750..3eba569b3366 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -19,6 +19,7 @@ TEST_PROGS :=3D \ netcons_cmdline.sh \ netcons_fragmented_msg.sh \ netcons_overflow.sh \ + netcons_resume.sh \ netcons_sysdata.sh \ netcons_torture.sh \ netpoll_basic.py \ diff --git a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh b/to= ols/testing/selftests/drivers/net/lib/sh/lib_netcons.sh index 87f89fd92f8c..239f44d4a45d 100644 --- a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh +++ b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh @@ -203,19 +203,21 @@ function do_cleanup() { function cleanup_netcons() { # delete netconsole dynamic reconfiguration # do not fail if the target is already disabled - if [[ ! -d "${NETCONS_PATH}" ]] + local TARGET_PATH=3D${1:-${NETCONS_PATH}} + + if [[ ! -d "${TARGET_PATH}" ]] then # in some cases this is called before netcons path is created return fi - if [[ $(cat "${NETCONS_PATH}"/enabled) !=3D 0 ]] + if [[ $(cat "${TARGET_PATH}"/enabled) !=3D 0 ]] then - echo 0 > "${NETCONS_PATH}"/enabled || true + echo 0 > "${TARGET_PATH}"/enabled || true fi # Remove all the keys that got created during the selftest - find "${NETCONS_PATH}/userdata/" -mindepth 1 -type d -delete + find "${TARGET_PATH}/userdata/" -mindepth 1 -type d -delete # Remove the configfs entry - rmdir "${NETCONS_PATH}" + rmdir "${TARGET_PATH}" } =20 function cleanup() { @@ -377,6 +379,29 @@ function check_netconsole_module() { fi } =20 +function wait_target_state() { + local TARGET=3D${1} + local STATE=3D${2} + local TARGET_PATH=3D"${NETCONS_CONFIGFS}"/"${TARGET}" + local ENABLED=3D0 + + if [ "${STATE}" =3D=3D "enabled" ] + then + ENABLED=3D1 + fi + + if [ ! -d "$TARGET_PATH" ]; then + echo "FAIL: Target does not exist." >&2 + exit "${ksft_fail}" + fi + + local CHECK_CMD=3D"grep \"$ENABLED\" \"$TARGET_PATH/enabled\"" + slowwait 2 sh -c "test -n \"\$($CHECK_CMD)\"" || { + echo "FAIL: ${TARGET} is not ${STATE}." >&2 + exit "${ksft_fail}" + } +} + # A wrapper to translate protocol version to udp version function wait_for_port() { local NAMESPACE=3D${1} diff --git a/tools/testing/selftests/drivers/net/netcons_resume.sh b/tools/= testing/selftests/drivers/net/netcons_resume.sh new file mode 100755 index 000000000000..383ad1149271 --- /dev/null +++ b/tools/testing/selftests/drivers/net/netcons_resume.sh @@ -0,0 +1,97 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: GPL-2.0 + +# This test validates that netconsole is able to resume a target that was +# deactivated when its interface was removed when the interface is brought +# back up. +# +# The test configures a netconsole target and then removes netdevsim modul= e to +# cause the interface to disappear. Targets are configured via cmdline to = ensure +# targets bound by interface name and mac address can be resumed. +# The test verifies that the target moved to disabled state before adding +# netdevsim and the interface back. +# +# Finally, the test verifies that the target is re-enabled automatically a= nd +# the message is received on the destination interface. +# +# Author: Andre Carvalho + +set -euo pipefail + +SCRIPTDIR=3D$(dirname "$(readlink -e "${BASH_SOURCE[0]}")") + +source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh + +modprobe netdevsim 2> /dev/null || true +rmmod netconsole 2> /dev/null || true + +check_netconsole_module + +function cleanup() { + cleanup_netcons "${NETCONS_CONFIGFS}/cmdline0" + do_cleanup + rmmod netconsole +} + +trap cleanup EXIT + +# Run the test twice, with different cmdline parameters +for BINDMODE in "ifname" "mac" +do + echo "Running with bind mode: ${BINDMODE}" >&2 + # Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5) + echo "6 5" > /proc/sys/kernel/printk + + # Create one namespace and two interfaces + set_network + + # Create the command line for netconsole, with the configuration from + # the function above + CMDLINE=3D$(create_cmdline_str "${BINDMODE}") + + # The content of kmsg will be save to the following file + OUTPUT_FILE=3D"/tmp/${TARGET}-${BINDMODE}" + + # Load the module, with the cmdline set + modprobe netconsole "${CMDLINE}" + # Expose cmdline target in configfs + mkdir "${NETCONS_CONFIGFS}/cmdline0" + + # Target should be enabled + wait_target_state "cmdline0" "enabled" + + # Remove low level module + rmmod netdevsim + # Target should be disabled + wait_target_state "cmdline0" "disabled" + + # Add back low level module + modprobe netdevsim + # Recreate namespace and two interfaces + set_network + # Target should be enabled again + wait_target_state "cmdline0" "enabled" + + # Listen for netconsole port inside the namespace and destination + # interface + listen_port_and_save_to "${OUTPUT_FILE}" & + # Wait for socat to start and listen to the port. + wait_local_port_listen "${NAMESPACE}" "${PORT}" udp + # Send the message + echo "${MSG}: ${TARGET}" > /dev/kmsg + # Wait until socat saves the file to disk + busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" + # Make sure the message was received in the dst part + # and exit + validate_msg "${OUTPUT_FILE}" + + # kill socat in case it is still running + pkill_socat + # Cleanup & unload the module + cleanup + + echo "${BINDMODE} : Test passed" >&2 +done + +trap - EXIT +exit "${EXIT_STATUS}" --=20 2.52.0