Skip to contentSkip to conversation

selftests: bpf: test_kmod.sh: pass parameter to the module

PATCH Superseded Yauheni Kaliuta 3 participants 5 messages Sep 5, 2022 – Sep 22, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests: bpf: test_kmod.sh: pass parameter to the module

It's possible to specify particular tests for test_bpf.ko with module parameters. Make it possible to pass a module parameter as the first test_kmod.sh argument, example:

test_kmod.sh test_range=1,3

Since magnitude tests take long time it can be reasonable to skip them.

---
 tools/testing/selftests/bpf/test_kmod.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_kmod.sh +5 -3
index 4f6444bcd53f..3cb52ba20db8 100755
@@ -4,6 +4,8 @@
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
+MOD_PARAM="$1"
+
 msg="skip all tests:"
 if [ "$(id -u)" != "0" ]; then
 	echo $msg please run this as root >&2
@@ -26,15 +28,15 @@ test_run()
 	echo "[ JIT enabled:$1 hardened:$2 ]"
 	dmesg -C
 	if [ -f ${OUTPUT}/lib/test_bpf.ko ]; then
-		insmod ${OUTPUT}/lib/test_bpf.ko 2> /dev/null
+		insmod ${OUTPUT}/lib/test_bpf.ko $MOD_PARAM 2> /dev/null
 		if [ $? -ne 0 ]; then
 			rc=1
 		fi
 	else
 		# Use modprobe dry run to check for missing test_bpf module
-		if ! /sbin/modprobe -q -n test_bpf; then
+		if ! /sbin/modprobe -q -n test_bpf $MOD_PARAM; then
 			echo "test_bpf: [SKIP]"
-		elif /sbin/modprobe -q test_bpf; then
+		elif /sbin/modprobe -q test_bpf $MOD_PARAM; then
 			echo "test_bpf: ok"
 		else
 			echo "test_bpf: [FAIL]"
Signature · 1 line
2.34.1
reviewer
#1 lore raw
Quoted 20 lines · Yauheni Kaliuta

It's possible to specify particular tests for test_bpf.ko with module parameters. Make it possible to pass a module parameter as the first test_kmod.sh argument, example:

test_kmod.sh test_range=1,3

Since magnitude tests take long time it can be reasonable to skip them.

---
 tools/testing/selftests/bpf/test_kmod.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_kmod.sh +0 -0
index 4f6444bcd53f..3cb52ba20db8 100755

tools/testing/selftests/bpf/test_kmod.sh line 7

Quoted 4 lines
tools/testing/selftests/bpf/test_kmod.sh +1 -0
@@ -4,6 +4,8 @@
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
+MOD_PARAM="$1"

Shall we use $@ to pass all remaining arguments to insmod/modprobe? Otherwise, users may get confused when some parameters don't get passed.

We should also add a help/usage message or at least a comment in the script.

Thanks,
Song

Quoted 26 lines
tools/testing/selftests/bpf/test_kmod.sh +4 -4
+
 msg="skip all tests:"
 if [ "$(id -u)" != "0" ]; then
        echo $msg please run this as root >&2
@@ -26,15 +28,15 @@ test_run()
        echo "[ JIT enabled:$1 hardened:$2 ]"
        dmesg -C
        if [ -f ${OUTPUT}/lib/test_bpf.ko ]; then
-               insmod ${OUTPUT}/lib/test_bpf.ko 2> /dev/null
+               insmod ${OUTPUT}/lib/test_bpf.ko $MOD_PARAM 2> /dev/null
                if [ $? -ne 0 ]; then
                        rc=1
                fi
        else
                # Use modprobe dry run to check for missing test_bpf module
-               if ! /sbin/modprobe -q -n test_bpf; then
+               if ! /sbin/modprobe -q -n test_bpf $MOD_PARAM; then
                        echo "test_bpf: [SKIP]"
-               elif /sbin/modprobe -q test_bpf; then
+               elif /sbin/modprobe -q test_bpf $MOD_PARAM; then
                        echo "test_bpf: ok"
                else
                        echo "test_bpf: [FAIL]"
--

2.34.1

#2 lore raw

PATCH v2 1/1 selftests: bpf: test_kmod.sh: pass parameters to the module

In reply to Yauheni Kaliuta

It's possible to specify particular tests for test_bpf.ko with module parameters. Make it possible to pass the module parameters, example:

test_kmod.sh test_range=1,3

Since magnitude tests take long time it can be reasonable to skip them.

---
v1->v2: pass all the parameters, "$@", not only the first one.

---
 tools/testing/selftests/bpf/test_kmod.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_kmod.sh +3 -3
index 4f6444bcd53f..6550d523b04a 100755
@@ -26,15 +26,15 @@ test_run()
 	echo "[ JIT enabled:$1 hardened:$2 ]"
 	dmesg -C
 	if [ -f ${OUTPUT}/lib/test_bpf.ko ]; then
-		insmod ${OUTPUT}/lib/test_bpf.ko 2> /dev/null
+		insmod ${OUTPUT}/lib/test_bpf.ko "$@" 2> /dev/null
 		if [ $? -ne 0 ]; then
 			rc=1
 		fi
 	else
 		# Use modprobe dry run to check for missing test_bpf module
-		if ! /sbin/modprobe -q -n test_bpf; then
+		if ! /sbin/modprobe -q -n test_bpf "$@"; then
 			echo "test_bpf: [SKIP]"
-		elif /sbin/modprobe -q test_bpf; then
+		elif /sbin/modprobe -q test_bpf "$@"; then
 			echo "test_bpf: ok"
 		else
 			echo "test_bpf: [FAIL]"
Signature · 1 line
2.37.3
#3 lore raw

PATCH v3 1/1 selftests: bpf: test_kmod.sh: pass parameters to the module

In reply to Yauheni Kaliuta

It's possible to specify particular tests for test_bpf.ko with module parameters. Make it possible to pass the module parameters, example:

test_kmod.sh test_range=1,3

Since magnitude tests take long time it can be reasonable to skip them.

---
v2->v3: add usage comment.
v1->v2: pass all the parameters, "$@", not only the first one.

---
 tools/testing/selftests/bpf/test_kmod.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/test_kmod.sh +8 -3
index 4f6444bcd53f..d4a4279c0181 100755
@@ -1,6 +1,11 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+# Usage:
+# ./test_kmod.sh [module_param]...
+# Ex.: ./test_kmod.sh test_range=1,3
+# All the parameters are passed to the kernel module.
+
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
@@ -26,15 +31,15 @@ test_run()
 	echo "[ JIT enabled:$1 hardened:$2 ]"
 	dmesg -C
 	if [ -f ${OUTPUT}/lib/test_bpf.ko ]; then
-		insmod ${OUTPUT}/lib/test_bpf.ko 2> /dev/null
+		insmod ${OUTPUT}/lib/test_bpf.ko "$@" 2> /dev/null
 		if [ $? -ne 0 ]; then
 			rc=1
 		fi
 	else
 		# Use modprobe dry run to check for missing test_bpf module
-		if ! /sbin/modprobe -q -n test_bpf; then
+		if ! /sbin/modprobe -q -n test_bpf "$@"; then
 			echo "test_bpf: [SKIP]"
-		elif /sbin/modprobe -q test_bpf; then
+		elif /sbin/modprobe -q test_bpf "$@"; then
 			echo "test_bpf: ok"
 		else
 			echo "test_bpf: [FAIL]"
Signature · 1 line
2.37.3
#4 lore raw

Re: [PATCH bpf-next v3] selftests: bpf: test_kmod.sh: pass parameters to the module

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 10 lines · On Thu, 8 Sep 2022 15:01:46 +0300 you wrote:

It's possible to specify particular tests for test_bpf.ko with module parameters. Make it possible to pass the module parameters, example:

test_kmod.sh test_range=1,3

Since magnitude tests take long time it can be reasonable to skip them.

[...]

Here is the summary with links:
- [bpf-next,v3] selftests: bpf: test_kmod.sh: pass parameters to the module

    https://git.kernel.org/bpf/bpf-next/c/272d1f4cfa3c

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html