* [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod
@ 2017-11-07 16:35 naresh.kamboju
2017-11-07 16:35 ` [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device naresh.kamboju
2017-11-07 17:02 ` [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod Shuah Khan
0 siblings, 2 replies; 4+ messages in thread
From: naresh.kamboju @ 2017-11-07 16:35 UTC (permalink / raw)
To: shuahkh, shuah, linux-kselftest
Cc: daniel, alexei.starovoitov, netdev, linux-kernel
From: Naresh Kamboju <naresh.kamboju@linaro.org>
test_kmod.sh reported false failure when module not present.
Instead check test_bpf.ko is present in the path before loading it.
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
---
tools/testing/selftests/bpf/test_kmod.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index 6d58cca8e235..2e5a1049e2f2 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -9,9 +9,11 @@ test_run()
echo "[ JIT enabled:$1 hardened:$2 ]"
dmesg -C
- insmod $SRC_TREE/lib/test_bpf.ko 2> /dev/null
- if [ $? -ne 0 ]; then
- rc=1
+ if [ -f ${SRC_TREE}/lib/test_bpf.ko ]; then
+ insmod ${SRC_TREE}/lib/test_bpf.ko 2> /dev/null
+ if [ $? -ne 0 ]; then
+ rc=1
+ fi
fi
rmmod test_bpf 2> /dev/null
dmesg | grep FAIL
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device
2017-11-07 16:35 [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
@ 2017-11-07 16:35 ` naresh.kamboju
2017-11-07 17:10 ` Shuah Khan
2017-11-07 17:02 ` [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod Shuah Khan
1 sibling, 1 reply; 4+ messages in thread
From: naresh.kamboju @ 2017-11-07 16:35 UTC (permalink / raw)
To: shuahkh, shuah, linux-kselftest
Cc: daniel, alexei.starovoitov, netdev, linux-kernel
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(+)
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
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod
2017-11-07 16:35 [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
2017-11-07 16:35 ` [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device naresh.kamboju
@ 2017-11-07 17:02 ` Shuah Khan
1 sibling, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2017-11-07 17:02 UTC (permalink / raw)
To: naresh.kamboju, shuah, linux-kselftest
Cc: daniel, alexei.starovoitov, netdev, linux-kernel, Shuah Khan
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.
>
> test_kmod.sh reported false failure when module not present.
> Instead check test_bpf.ko is present in the path before loading it.
>
> Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> ---
> tools/testing/selftests/bpf/test_kmod.sh | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
> index 6d58cca8e235..2e5a1049e2f2 100755
> --- a/tools/testing/selftests/bpf/test_kmod.sh
> +++ b/tools/testing/selftests/bpf/test_kmod.sh
> @@ -9,9 +9,11 @@ test_run()
>
> echo "[ JIT enabled:$1 hardened:$2 ]"
> dmesg -C
> - insmod $SRC_TREE/lib/test_bpf.ko 2> /dev/null
> - if [ $? -ne 0 ]; then
> - rc=1
> + if [ -f ${SRC_TREE}/lib/test_bpf.ko ]; then
> + insmod ${SRC_TREE}/lib/test_bpf.ko 2> /dev/null
Hmm. Are you sure SRC_TREE is defined in all use-cases? What happens
when "cd tools/testing/selftests/bpf; make run_tests" is run?
> + if [ $? -ne 0 ]; then
> + rc=1
> + fi
> fi
> rmmod test_bpf 2> /dev/null
> dmesg | grep FAIL
>
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device
2017-11-07 16:35 ` [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device naresh.kamboju
@ 2017-11-07 17:10 ` Shuah Khan
0 siblings, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2017-11-07 17:10 UTC (permalink / raw)
To: naresh.kamboju, shuah, linux-kselftest, daniel, alexei.starovoitov
Cc: netdev, linux-kernel, Shuah Khan
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-07 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-07 16:35 [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
2017-11-07 16:35 ` [PATCH v3 2/2] selftests: bpf: test_kmod.sh: use modprobe on target device naresh.kamboju
2017-11-07 17:10 ` Shuah Khan
2017-11-07 17:02 ` [PATCH v3 1/2] selftests: bpf: test_kmod.sh: check the module path before insmod Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).