* [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod
@ 2018-02-07 18:15 naresh.kamboju
2018-02-07 18:15 ` Naresh Kamboju
2018-02-07 23:34 ` daniel
0 siblings, 2 replies; 4+ messages in thread
From: naresh.kamboju @ 2018-02-07 18:15 UTC (permalink / raw)
test_kmod.sh reported false failure when module not present.
Check test_bpf.ko is present in the path before loading it.
Two cases to be addressed here,
In the development process of test_bpf.c unit testing will be done by
developers by using "insmod $SRC_TREE/lib/test_bpf.ko"
On the other hand testers run full tests by installing modules on device
under test (DUT) and followed by modprobe to insert the modules accordingly.
Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org>
---
tools/testing/selftests/bpf/test_kmod.sh | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index ed4774d..35669cc 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -10,9 +10,21 @@ 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
+ 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.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod
2018-02-07 18:15 [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
@ 2018-02-07 18:15 ` Naresh Kamboju
2018-02-07 23:34 ` daniel
1 sibling, 0 replies; 4+ messages in thread
From: Naresh Kamboju @ 2018-02-07 18:15 UTC (permalink / raw)
test_kmod.sh reported false failure when module not present.
Check test_bpf.ko is present in the path before loading it.
Two cases to be addressed here,
In the development process of test_bpf.c unit testing will be done by
developers by using "insmod $SRC_TREE/lib/test_bpf.ko"
On the other hand testers run full tests by installing modules on device
under test (DUT) and followed by modprobe to insert the modules accordingly.
Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org>
---
tools/testing/selftests/bpf/test_kmod.sh | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index ed4774d..35669cc 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -10,9 +10,21 @@ 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
+ 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.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod
2018-02-07 18:15 [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
2018-02-07 18:15 ` Naresh Kamboju
@ 2018-02-07 23:34 ` daniel
2018-02-07 23:34 ` Daniel Borkmann
1 sibling, 1 reply; 4+ messages in thread
From: daniel @ 2018-02-07 23:34 UTC (permalink / raw)
On 02/07/2018 07:15 PM, Naresh Kamboju wrote:
> test_kmod.sh reported false failure when module not present.
> Check test_bpf.ko is present in the path before loading it.
>
> Two cases to be addressed here,
> In the development process of test_bpf.c unit testing will be done by
> developers by using "insmod $SRC_TREE/lib/test_bpf.ko"
>
> On the other hand testers run full tests by installing modules on device
> under test (DUT) and followed by modprobe to insert the modules accordingly.
>
> Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org>
Applied to bpf tree, thanks Naresh!
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod
2018-02-07 23:34 ` daniel
@ 2018-02-07 23:34 ` Daniel Borkmann
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Borkmann @ 2018-02-07 23:34 UTC (permalink / raw)
On 02/07/2018 07:15 PM, Naresh Kamboju wrote:
> test_kmod.sh reported false failure when module not present.
> Check test_bpf.ko is present in the path before loading it.
>
> Two cases to be addressed here,
> In the development process of test_bpf.c unit testing will be done by
> developers by using "insmod $SRC_TREE/lib/test_bpf.ko"
>
> On the other hand testers run full tests by installing modules on device
> under test (DUT) and followed by modprobe to insert the modules accordingly.
>
> Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org>
Applied to bpf tree, thanks Naresh!
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-07 23:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-07 18:15 [Linux-kselftest-mirror] [PATCH v2] selftests: bpf: test_kmod.sh: check the module path before insmod naresh.kamboju
2018-02-07 18:15 ` Naresh Kamboju
2018-02-07 23:34 ` daniel
2018-02-07 23:34 ` Daniel Borkmann
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).