From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7362035C1A6; Wed, 27 May 2026 02:34:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779849273; cv=none; b=CldmxUwP4fTl0QMHDZYofiskuGvnShxtFF98fYi+XxOrz3DOLUV/Xg6onubQQrFLUy2TCzWB4/HJ8orCwh4m/79m7qiZENQrVeEwRk5vK07ktSMMLy1JeX0RducpVCYdIKQWsqv6vIBJaaz8Chyz5qunoFQ/n9q3RkXNS19HLz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779849273; c=relaxed/simple; bh=tYVsJhTUS+sMC6nbfjIHboPa9IV0Rm4W53DgRbRLsOo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VgxraofKJovnTIS78muye33CaG8+EOCEtkLVQj4itbgwePuxGux6fwZtWh64EY2Eob5yDaHM4evu3PttvWMQK6iPA1XBJxFbrXGt3Gaa7Db9mWw368BlUe+1bgWTMuS14oUlKNfyaQJLczpAlNw0zrA6S/nmyriY9OsK6+6UTnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aQTT9a2u; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aQTT9a2u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 610301F000E9; Wed, 27 May 2026 02:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779849267; bh=c3rqBuqfTbpRzjBmL15p5tC+verPIoUWd5EY+4qfZeI=; h=From:To:Subject:Date:In-Reply-To:References; b=aQTT9a2u1FkwKSdS+QaXtUnykrEHRPSI5moK/0IR94/laDD/1FEdoWiwubRmOHiZ6 z/Ng8BXOeWgIbekmFKT+0wKVO9iapAOdNcs+I5LeqxZH1oO/jKMCiP9e6djS0flh2v QQ6jD/PEFNq/+bcPnTFF4fUeusB/U6TbMUg2jWZT8rNg0HT1zlJgHdKxnWretriWnF FlXHSIBofUvM6EGNUbhAxPpQTYuM6x82hjidVIVOhUyWNZFJQnM85IiTBsUMa4Jy2U aQA7mPGpJ7tIx4/6tHJVQrOO4wXCKLqsxrxQaPUvOlryPbe6yRSin9l95fuP0lsfE5 /uz+5l/Q54YHg== From: Allison Henderson To: netdev@vger.kernel.org, pabeni@redhat.com, edumazet@google.com, kuba@kernel.org, horms@kernel.org, linux-rdma@vger.kernel.org, achender@kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org Subject: [PATCH net-next v2 3/4] selftests: rds: support RDS built as loadable modules Date: Tue, 26 May 2026 19:34:22 -0700 Message-Id: <20260527023423.387792-4-achender@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260527023423.387792-1-achender@kernel.org> References: <20260527023423.387792-1-achender@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 92cc6708f4a2 ("selftests: rds: config: disable modules") set CONFIG_MODULES=n since run.sh required this kconfig. But disabling modules also forces every =m option to =n rather than =y, which can silently drop unrelated features. This patch removes CONFIG_MODULES=n from the rds selftest config and updates the check_*conf_enabled() routines to accept a config as either built-in (=y) or modular (=m). A new probe_module() function is added to load the backing module when a component is set to be modular (=m). rds.ko itself is auto-loaded on socket creation, and rds_rdma.ko is auto-loaded when SO_RDS_TRANSPORT is set with RDS_TRANS_IB, but the TCP transport (rds_tcp.ko) is not auto-loaded on the bind path, so the backing modules are loaded explicitly here. Signed-off-by: Allison Henderson --- tools/testing/selftests/net/rds/config | 1 - tools/testing/selftests/net/rds/rds_run.sh | 60 ++++++++++++++-------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/net/rds/config b/tools/testing/selftests/net/rds/config index 3d62d0c750a80..97db7ecb892aa 100644 --- a/tools/testing/selftests/net/rds/config +++ b/tools/testing/selftests/net/rds/config @@ -1,4 +1,3 @@ -CONFIG_MODULES=n CONFIG_NET_NS=y CONFIG_NET_SCH_NETEM=y CONFIG_RDS=y diff --git a/tools/testing/selftests/net/rds/rds_run.sh b/tools/testing/selftests/net/rds/rds_run.sh index ef16039be1ae5..c16b30dbdd169 100755 --- a/tools/testing/selftests/net/rds/rds_run.sh +++ b/tools/testing/selftests/net/rds/rds_run.sh @@ -93,38 +93,58 @@ check_gcov_conf() fi } +# Checks if a kconfig is enabled (set to =y or =m) +# $1: kconfig symbol to check +# $2: (optional) module name backing $1 +# Ex: check_conf_enabled CONFIG_RDS_TCP rds_tcp +# Modules for configs set to =m will be probed +# If omitted, only a built-in (=y) config is accepted. +# Returns on success. exits 4 on failure # Kselftest framework requirement - SKIP code is 4. check_conf_enabled() { - if ! grep -x "$1=y" "$kconfig" > /dev/null 2>&1; then - echo "selftests: [SKIP] This test requires $1 enabled" - echo "Please run tools/testing/selftests/net/rds/config.sh and rebuild the kernel" - exit 4 + if grep -x "$1=y" "$kconfig" > /dev/null 2>&1; then + return fi + if [ -n "${2:-}" ] && grep -x "$1=m" "$kconfig" > /dev/null 2>&1; then + probe_module "$2" + return + fi + echo "selftests: [SKIP] This test requires $1 enabled" + echo "Please run" \ + "tools/testing/selftests/net/rds/config.sh and rebuild the kernel" + exit 4 } check_rdma_conf_enabled() { - if ! grep -x "$1=y" "$kconfig" > /dev/null 2>&1; then - echo "selftests: [SKIP] rdma transport requires $1 enabled" - echo "To enable, run " \ - "tools/testing/selftests/net/rds/config.sh -r and rebuild" - exit 4 + if grep -x "$1=y" "$kconfig" > /dev/null 2>&1; then + return + fi + if [ -n "${2:-}" ] && grep -x "$1=m" "$kconfig" > /dev/null 2>&1; then + probe_module "$2" + return fi + echo "selftests: [SKIP] rdma transport requires $1 enabled" + echo "To enable, run" \ + "tools/testing/selftests/net/rds/config.sh -r and rebuild" + exit 4 } -check_conf_disabled() { - if grep -x "$1=y" "$kconfig" > /dev/null 2>&1; then - echo "selftests: [SKIP] This test requires $1 disabled" - echo "Please run tools/testing/selftests/net/rds/config.sh and rebuild the kernel" +# Load the module backing a config that is built as a loadable module +# (=m). Built-in (=y) configs are already available and don't reach +# here. Exits with the SKIP code if a required module cannot be loaded. +probe_module() { + if ! modprobe -q "$1"; then + echo "selftests: [SKIP] could not load required module $1" exit 4 fi } + check_conf() { - check_conf_enabled CONFIG_NET_SCH_NETEM - check_conf_enabled CONFIG_VETH + check_conf_enabled CONFIG_NET_SCH_NETEM sch_netem + check_conf_enabled CONFIG_VETH veth check_conf_enabled CONFIG_NET_NS - check_conf_enabled CONFIG_RDS_TCP - check_conf_enabled CONFIG_RDS - check_conf_disabled CONFIG_MODULES + check_conf_enabled CONFIG_RDS_TCP rds_tcp + check_conf_enabled CONFIG_RDS rds } # Check kernel config and host environment for RDS-RDMA support. @@ -139,8 +159,8 @@ check_rdma_conf() # Kconfig will enforce CONFIG_INFINIBAND_* as dependencies # of CONFIG_RDMA_RXE - check_rdma_conf_enabled CONFIG_RDMA_RXE - check_rdma_conf_enabled CONFIG_RDS_RDMA + check_rdma_conf_enabled CONFIG_RDMA_RXE rdma_rxe + check_rdma_conf_enabled CONFIG_RDS_RDMA rds_rdma if ! which rdma > /dev/null 2>&1; then echo "selftests: [SKIP] rdma transport requires the 'rdma'" \ -- 2.25.1