Skip to contentSkip to conversation

selftests: rds: add config file and config.sh -c option

PATCH Superseded Allison Henderson 4 participants 11 messages Mar 19 – Mar 20

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Allison Henderson

author maintainer
#0 lore raw

v2 cover selftests: rds: add config file and config.sh -c option

This series adds an RDS-specific config file for ksft CI and extends config.sh with a -c flag to specify an alternate config file path. Users can now specify the path of the config they want to update, or default to .config if none is specified.

Allison Henderson (2):
selftests: rds: add tools/testing/selftests/net/rds/config
selftests: rds: Add -c config option to rds/config.sh

 tools/testing/selftests/net/rds/Makefile  |  1 +
 tools/testing/selftests/net/rds/config    |  5 +++
 tools/testing/selftests/net/rds/config.sh | 37 ++++++++++++++---------
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 tools/testing/selftests/net/rds/config
Signature · 1 line
2.43.0
author maintainer
#1 lore raw

PATCH v2 1/2 selftests: rds: add tools/testing/selftests/net/rds/config

The ksft CI runtime needs an rds specific config file to build a minimal kernel with the right options enabled. This patch adds an rds selftest config containing the required CONFIG_RDS* and CONFIG_NET_* options.

---
 tools/testing/selftests/net/rds/Makefile | 1 +
 tools/testing/selftests/net/rds/config   | 5 +++++
 2 files changed, 6 insertions(+)
tools/testing/selftests/net/rds/Makefile +1 -0
index fe363be8e358..3eb0f633fd73 100644
@@ -9,6 +9,7 @@ TEST_FILES := \
 	include.sh \
 	settings \
 	test.py \
+	config \
 # end of TEST_FILES
 
 EXTRA_CLEAN := \
tools/testing/selftests/net/rds/config new file +5 -0
new file mode 100644
index 000000000000..103f9d941d10
@@ -0,0 +1,5 @@
+CONFIG_RDS=y
+CONFIG_RDS_TCP=y
+CONFIG_NET_NS=y
+CONFIG_VETH=y
+CONFIG_NET_SCH_NETEM=y
Signature · 1 line
2.43.0
author maintainer
#5 lore raw

PATCH v2 2/2 selftests: rds: Add -c config option to rds/config.sh

In reply to Allison Henderson

This patch adds a new -c flag to config.sh that enables callers to specify the file path of the config they would like to update. If no config is specified, the default will be the .config of the current directory.

---
 tools/testing/selftests/net/rds/config.sh | 37 ++++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)
tools/testing/selftests/net/rds/config.sh +22 -15
index 791c8dbe1095..e7a619d7cff0 100755
@@ -6,15 +6,20 @@ set -u
 set -x
 
 unset KBUILD_OUTPUT
+CONF_FILE=""
+FLAGS=""
 
 GENERATE_GCOV_REPORT=0
-while getopts "g" opt; do
+while getopts "gc:" opt; do
   case ${opt} in
     g)
       GENERATE_GCOV_REPORT=1
       ;;
+    c)
+      CONF_FILE=$OPTARG
+      ;;
     :)
-      echo "USAGE: config.sh [-g]"
+      echo "USAGE: config.sh [-g] [-c config]"
       exit 1
       ;;
     ?)
@@ -24,30 +29,32 @@ while getopts "g" opt; do
   esac
 done
 
-CONF_FILE="tools/testing/selftests/net/config"
+if [[ "$CONF_FILE" != "" ]]; then
+	FLAGS="--file $CONF_FILE"
+fi
 
 # no modules
-scripts/config --file "$CONF_FILE" --disable CONFIG_MODULES
+scripts/config $FLAGS --disable CONFIG_MODULES
 
 # enable RDS
-scripts/config --file "$CONF_FILE" --enable CONFIG_RDS
-scripts/config --file "$CONF_FILE" --enable CONFIG_RDS_TCP
+scripts/config $FLAGS --enable CONFIG_RDS
+scripts/config $FLAGS --enable CONFIG_RDS_TCP
 
 if [ "$GENERATE_GCOV_REPORT" -eq 1 ]; then
 	# instrument RDS and only RDS
-	scripts/config --file "$CONF_FILE" --enable CONFIG_GCOV_KERNEL
-	scripts/config --file "$CONF_FILE" --disable GCOV_PROFILE_ALL
-	scripts/config --file "$CONF_FILE" --enable GCOV_PROFILE_RDS
+	scripts/config $FLAGS --enable CONFIG_GCOV_KERNEL
+	scripts/config $FLAGS --disable GCOV_PROFILE_ALL
+	scripts/config $FLAGS --enable GCOV_PROFILE_RDS
 else
-	scripts/config --file "$CONF_FILE" --disable CONFIG_GCOV_KERNEL
-	scripts/config --file "$CONF_FILE" --disable GCOV_PROFILE_ALL
-	scripts/config --file "$CONF_FILE" --disable GCOV_PROFILE_RDS
+	scripts/config $FLAGS --disable CONFIG_GCOV_KERNEL
+	scripts/config $FLAGS --disable GCOV_PROFILE_ALL
+	scripts/config $FLAGS --disable GCOV_PROFILE_RDS
 fi
 
 # need network namespaces to run tests with veth network interfaces
-scripts/config --file "$CONF_FILE" --enable CONFIG_NET_NS
-scripts/config --file "$CONF_FILE" --enable CONFIG_VETH
+scripts/config $FLAGS --enable CONFIG_NET_NS
+scripts/config $FLAGS --enable CONFIG_VETH
 
 # simulate packet loss
-scripts/config --file "$CONF_FILE" --enable CONFIG_NET_SCH_NETEM
+scripts/config $FLAGS --enable CONFIG_NET_SCH_NETEM
 
Signature · 1 line
2.43.0
reviewer
#6 lore raw

Re: [net-next,v2,2/2] selftests: rds: Add -c config option to rds/config.sh

This is an AI-generated review of your patch. The human sending this email has considered the AI review valid, or at least plausible.

For local reproduction steps see https://netdev-ai.bots.linux.dev/ai-local.html
---
selftests: rds: Add -c config option to rds/config.sh

This patch adds a new -c flag to config.sh that enables callers to specify the file path of the config they would like to update. If no config is specified, the default will be the .config of the current directory.

Quoted 28 lines
tools/testing/selftests/net/rds/config.sh +7 -2
index 791c8dbe1095..e7a619d7cff0 100755
@@ -6,15 +6,20 @@ set -u
 set -x
 
 unset KBUILD_OUTPUT
+CONF_FILE=""
+FLAGS=""
 
 GENERATE_GCOV_REPORT=0
-while getopts "g" opt; do
+while getopts "gc:" opt; do
   case ${opt} in
     g)
       GENERATE_GCOV_REPORT=1
       ;;
+    c)
+      CONF_FILE=$OPTARG
+      ;;
     :)
-      echo "USAGE: config.sh [-g]"
+      echo "USAGE: config.sh [-g] [-c config]"
       exit 1
       ;;
     ?)

tools/testing/selftests/net/rds/config.sh while getopts "g" opt; do · line 34

Quoted 7 lines
tools/testing/selftests/net/rds/config.sh +3 -1
@@ -24,30 +29,32 @@ while getopts "g" opt; do
   esac
 done
 
-CONF_FILE="tools/testing/selftests/net/config"
+if [[ "$CONF_FILE" != "" ]]; then
+	FLAGS="--file $CONF_FILE"
+fi

This changes the default behavior - config.sh now modifies .config in the current directory when no -c option is provided, but the README.txt wasn't updated. Looking at README.txt:

# Create a suitable gcov enabled .config
tools/testing/selftests/net/rds/config.sh -g

# Alternatly create a gcov disabled .config
tools/testing/selftests/net/rds/config.sh

# build the kernel
vng --build --config tools/testing/selftests/net/config

Won't this workflow break? The old config.sh modified tools/testing/selftests/net/config, but the new version modifies .config. When following the README, config.sh now modifies .config, but vng builds using the unmodified tools/testing/selftests/net/config, so the kernel would be built with incorrect configuration (CONFIG_RDS, CONFIG_RDS_TCP, CONFIG_NET_NS, CONFIG_VETH, CONFIG_NET_SCH_NETEM may not be properly enabled, and CONFIG_MODULES may not be disabled).

Should the README examples be updated to either use
"-c tools/testing/selftests/net/config" or adjust the vng command to use ".config"?

Alternatively, for backward compatibility, the default could remain tools/testing/selftests/net/config and require "-c .config" for the new behavior.

Quoted 4 lines
tools/testing/selftests/net/rds/config.sh +1 -1
 # no modules
-scripts/config --file "$CONF_FILE" --disable CONFIG_MODULES
+scripts/config $FLAGS --disable CONFIG_MODULES

[ ... ]

reviewer
#9 lore raw

Re: [PATCH net-next v2 2/2] selftests: rds: Add -c config option to rds/config.sh

In reply to Allison Henderson
Quoted 6 lines · Allison Henderson

This patch adds a new -c flag to config.sh that enables callers to specify the file path of the config they would like to update. If no config is specified, the default will be the .config of the current directory.

Hi Allison,

Shell checks complains about unquoted variables (SC2086) in this patch. As the script was previously shellcheck clean it would be nice to keep it that way.

...

maintainer
#2 lore raw

Re: [PATCH net-next v2 1/2] selftests: rds: add tools/testing/selftests/net/rds/config

In reply to Allison Henderson
Quoted 16 lines · On Wed, 18 Mar 2026 17:46:17 -0700 Allison Henderson wrote:
tools/testing/selftests/net/rds/Makefile +1 -0
@@ -9,6 +9,7 @@ TEST_FILES := \
 	include.sh \
 	settings \
 	test.py \
+	config \
 # end of TEST_FILES
 
 EXTRA_CLEAN := \
tools/testing/selftests/net/rds/config new file +0 -0
new file mode 100644
index 000000000000..103f9d941d10

tools/testing/selftests/net/rds/config line 5

Quoted 5 lines
tools/testing/selftests/net/rds/config new file +5 -0
@@ -0,0 +1,5 @@
+CONFIG_RDS=y
+CONFIG_RDS_TCP=y
+CONFIG_NET_NS=y
+CONFIG_VETH=y
+CONFIG_NET_SCH_NETEM=y

Contents of both these files need to be sorted according to the whims of these scripts:
selftests: rds: add config file and config.sh -c option

#7 lore raw

Re: [net-next,v2,2/2] selftests: rds: Add -c config option to rds/config.sh

In reply to Simon Horman
Quoted 2 lines · Simon Horman

This is an AI-generated review of your patch. The human sending this email has considered the AI review valid, or at least plausible.

Alrighty, I will update the README. Thank you!

Allison

Quoted 80 lines

For local reproduction steps see https://urldefense.com/v3/__https://netdev-ai.bots.linux.dev/ai-local.html__;!!ACWV5N9M2RV99hQ!Nwy4iPSdRAP7B5dpWucPIupDV2txt0qJKgmHbXVPdiBg3MuD4r9odJvbg8VWDf84sQ-oj8P8yeDHPNh5nVU$
---
selftests: rds: Add -c config option to rds/config.sh

This patch adds a new -c flag to config.sh that enables callers to specify the file path of the config they would like to update. If no config is specified, the default will be the .config of the current directory.

Quoted 28 lines
tools/testing/selftests/net/rds/config.sh +7 -2
index 791c8dbe1095..e7a619d7cff0 100755
@@ -6,15 +6,20 @@ set -u
 set -x
 
 unset KBUILD_OUTPUT
+CONF_FILE=""
+FLAGS=""
 
 GENERATE_GCOV_REPORT=0
-while getopts "g" opt; do
+while getopts "gc:" opt; do
   case ${opt} in
     g)
       GENERATE_GCOV_REPORT=1
       ;;
+    c)
+      CONF_FILE=$OPTARG
+      ;;
     :)
-      echo "USAGE: config.sh [-g]"
+      echo "USAGE: config.sh [-g] [-c config]"
       exit 1
       ;;
     ?)

tools/testing/selftests/net/rds/config.sh while getopts "g" opt; do · line 34

Quoted 7 lines
tools/testing/selftests/net/rds/config.sh +3 -1
@@ -24,30 +29,32 @@ while getopts "g" opt; do
   esac
 done
 
-CONF_FILE="tools/testing/selftests/net/config"
+if [[ "$CONF_FILE" != "" ]]; then
+	FLAGS="--file $CONF_FILE"
+fi

This changes the default behavior - config.sh now modifies .config in the current directory when no -c option is provided, but the README.txt wasn't updated. Looking at README.txt:

# Create a suitable gcov enabled .config
tools/testing/selftests/net/rds/config.sh -g

# Alternatly create a gcov disabled .config
tools/testing/selftests/net/rds/config.sh

# build the kernel
vng --build --config tools/testing/selftests/net/config

Won't this workflow break? The old config.sh modified tools/testing/selftests/net/config, but the new version modifies .config. When following the README, config.sh now modifies .config, but vng builds using the unmodified tools/testing/selftests/net/config, so the kernel would be built with incorrect configuration (CONFIG_RDS, CONFIG_RDS_TCP, CONFIG_NET_NS, CONFIG_VETH, CONFIG_NET_SCH_NETEM may not be properly enabled, and CONFIG_MODULES may not be disabled).

Should the README examples be updated to either use
"-c tools/testing/selftests/net/config" or adjust the vng command to use ".config"?

Alternatively, for backward compatibility, the default could remain tools/testing/selftests/net/config and require "-c .config" for the new behavior.

Quoted 4 lines
tools/testing/selftests/net/rds/config.sh +1 -1
 # no modules
-scripts/config --file "$CONF_FILE" --disable CONFIG_MODULES
+scripts/config $FLAGS --disable CONFIG_MODULES

[ ... ]

#10 lore raw

Re: [PATCH net-next v2 2/2] selftests: rds: Add -c config option to rds/config.sh

In reply to Simon Horman
Quoted 6 lines · Simon Horman
Quoted 5 lines · Allison Henderson

This patch adds a new -c flag to config.sh that enables callers to specify the file path of the config they would like to update. If no config is specified, the default will be the .config of the current directory.

Quoted 7 lines
Quoted 1 line

Hi Allison,

Shell checks complains about unquoted variables (SC2086) in this patch. As the script was previously shellcheck clean it would be nice to keep it that way.

Ok, I will fix those then. Thank you!

Allison

Quoted 2 lines

...

#4 lore raw

Re: [PATCH net-next v2 1/2] selftests: rds: add tools/testing/selftests/net/rds/config

In reply to Jakub Kicinski
Quoted 7 lines · Jakub Kicinski
Quoted 3 lines · On Thu, 19 Mar 2026 16:54:35 -0700 Jakub Kicinski wrote:

Contents of both these files need to be sorted according to the whims of these scripts:
selftests: rds: add config file and config.sh -c option

paste fail, I meant this:
https://urldefense.com/v3/__https://github.com/linux-netdev/nipa/tree/main/tests/patch/check_selftest__;!!ACWV5N9M2RV99hQ!M3jZzuv3BDBCuz_YVyrkry1kfdvR-eqR0z6RnvQ1mauMbfZsiNUgqGbMZXP9s8BvDqADJA7OSaWddlO4XA$

Ok, I will take a look at those. Thank you!

Allison

reviewer
#8 lore raw

Re: [net-next,v2,2/2] selftests: rds: Add -c config option to rds/config.sh

In reply to Allison Henderson
Quoted 4 lines · Allison Henderson
Quoted 2 lines · Simon Horman

This is an AI-generated review of your patch. The human sending this email has considered the AI review valid, or at least plausible.

Alrighty, I will update the README. Thank you!

Thanks.

FWIIW, I do agree the code changes here in v2 are in line with the discussion around v1.

...