[v3,2/2] selftests: bpf: test_kmod.sh: use modprobe on target device

Message ID 1510072553-7753-2-git-send-email-naresh.kamboju@linaro.org
State New
Headers show
Series
  • Untitled series #5877
Related show

Commit Message

Naresh Kamboju Nov. 7, 2017, 4:35 p.m.
From: Naresh Kamboju <naresh.kamboju@linaro.org>


On ARM and ARM64 devices kernel source tree is not available so
insmod "$SRC_TREE/lib/test_bpf.ko" is not working.

On these target devices the test_bpf.ko is installed under
/lib/modules/`uname -r`/kernel/lib/
so use modprobe dry run to check for missing test_bpf.ko module and
insert for testing.

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

---
 tools/testing/selftests/bpf/test_kmod.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

-- 
2.14.2

Comments

Shuah Khan Nov. 7, 2017, 5:10 p.m. | #1
On 11/07/2017 09:35 AM, naresh.kamboju@linaro.org wrote:
> From: Naresh Kamboju <naresh.kamboju@linaro.org>


Odd to see this From: line in the patch. Could you take a look
and see where this is coming from? Your gitconfig perhaps.

I have to fix this up when I apply the patch which I would like
to avoid.

> 

> On ARM and ARM64 devices kernel source tree is not available so

> insmod "$SRC_TREE/lib/test_bpf.ko" is not working.

> 

> On these target devices the test_bpf.ko is installed under

> /lib/modules/`uname -r`/kernel/lib/

> so use modprobe dry run to check for missing test_bpf.ko module and

> insert for testing.

> 

> Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

> ---

>  tools/testing/selftests/bpf/test_kmod.sh | 10 ++++++++++

>  1 file changed, 10 insertions(+)

> 

> diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh

> index 2e5a1049e2f2..4757ca7d163c 100755

> --- a/tools/testing/selftests/bpf/test_kmod.sh

> +++ b/tools/testing/selftests/bpf/test_kmod.sh

> @@ -14,6 +14,16 @@ test_run()

>  		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

> +			echo "test_bpf: [SKIP]"

> +		elif /sbin/modprobe -q test_bpf; then

> +			echo "test_bpf: ok"

> +		else

> +			echo "test_bpf: [FAIL]"

> +			rc=1

> +		fi

>  	fi

>  	rmmod  test_bpf 2> /dev/null

>  	dmesg | grep FAIL

> 


Okay now I am with you on the changes you are making in Patch v3 1/2 and
this one.

Please collapse these two patches into one or fix the SRC_TREE problem first
and then fix the missing module case.

I would like to get an Ack from net-dev folks before getting these in.
Alexei and Daniel! Please review and let me know if you good with this
change.

thanks,
-- Shuah

Patch

diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index 2e5a1049e2f2..4757ca7d163c 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -14,6 +14,16 @@  test_run()
 		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
+			echo "test_bpf: [SKIP]"
+		elif /sbin/modprobe -q test_bpf; then
+			echo "test_bpf: ok"
+		else
+			echo "test_bpf: [FAIL]"
+			rc=1
+		fi
 	fi
 	rmmod  test_bpf 2> /dev/null
 	dmesg | grep FAIL