* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
@ 2018-08-20 11:23 Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-08-20 11:23 UTC (permalink / raw)
To: ltp
The drivers are checked with modprobe. If modprobe is not available
on the system, the checks are silently skipped.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
v2: * moved tst_check_driver() from tst_test.h to tst_kernel.h
* added the new option description to the doc and comment to tst_kernel.h
* iterating over the driver list moved out from tst_check_drivers(), the
function renamed accordingly.
doc/test-writing-guidelines.txt | 10 ++++++++++
include/tst_kernel.h | 8 ++++++++
include/tst_test.h | 3 +++
lib/tst_kernel.c | 9 +++++++++
lib/tst_test.c | 9 +++++++++
testcases/lib/.gitignore | 1 +
testcases/lib/Makefile | 2 +-
testcases/lib/tst_check_drivers.c | 24 ++++++++++++++++++++++++
8 files changed, 65 insertions(+), 1 deletions(-)
create mode 100644 testcases/lib/tst_check_drivers.c
diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
index a169724..7a458d5 100644
--- a/doc/test-writing-guidelines.txt
+++ b/doc/test-writing-guidelines.txt
@@ -1449,6 +1449,16 @@ https://www.kernel.org/doc/html/latest/admin-guide/tainted-kernels.html
CRC32c checksum generation is supported by LTP. In order to use it, the
test should include "tst_checksum.h" header, then can call tst_crc32c().
+2.2.26 Checking kernel for the driver support
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Someties test needs certain drivers to be available in the kernel and must
+end with TCONF if any are missing. For this task there is the '.needs_drivers'
+option which accepts NULL-terminated array of the drivers names.
+
+Since it relies on modprobe command, the check will be skipped if the command
+itself is not available on the system.
+
2.3 Writing a testcase in shell
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/include/tst_kernel.h b/include/tst_kernel.h
index 5d5c04c..88941e1 100644
--- a/include/tst_kernel.h
+++ b/include/tst_kernel.h
@@ -23,4 +23,12 @@
*/
int tst_kernel_bits(void);
+/**
+ * Checks support for the kernel driver.
+ *
+ * @param name The name of the driver.
+ * @return Returns 0 if the kernel has the driver or modprobe is missing.
+ */
+int tst_check_driver(const char *name);
+
#endif /* TST_KERNEL_H__ */
diff --git a/include/tst_test.h b/include/tst_test.h
index 98dacf3..55c1418 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -170,6 +170,9 @@ struct tst_test {
/* NULL terminated array of resource file names */
const char *const *resource_files;
+
+ /* NULL terminated array of needed kernel drivers */
+ const char * const *needs_drivers;
};
/*
diff --git a/lib/tst_kernel.c b/lib/tst_kernel.c
index 42d64cb..ad00d2d 100644
--- a/lib/tst_kernel.c
+++ b/lib/tst_kernel.c
@@ -45,3 +45,12 @@ int tst_kernel_bits(void)
return kernel_bits;
}
+
+int tst_check_driver(const char *name)
+{
+ const char * const argv[] = { "modprobe", name, NULL };
+ int res = tst_run_cmd_(NULL, argv, "/dev/null", "/dev/null", 1);
+
+ /* 255 - it looks like modprobe not available */
+ return (res == 255) ? 0 : res;
+}
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 2f3d357..dcc4088 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -767,6 +767,15 @@ static void do_setup(int argc, char *argv[])
if (tst_test->min_kver)
check_kver();
+ if (tst_test->needs_drivers) {
+ const char *name;
+ int i;
+
+ for (i = 0; (name = tst_test->needs_drivers[i]); ++i)
+ if (tst_check_driver(name))
+ tst_brk(TCONF, "%s driver not available", name);
+ }
+
if (tst_test->format_device)
tst_test->needs_device = 1;
diff --git a/testcases/lib/.gitignore b/testcases/lib/.gitignore
index a9034e4..d83a48e 100644
--- a/testcases/lib/.gitignore
+++ b/testcases/lib/.gitignore
@@ -1,5 +1,6 @@
/tst_sleep
/tst_random
+/tst_check_drivers
/tst_checkpoint
/tst_rod
/tst_kvcmp
diff --git a/testcases/lib/Makefile b/testcases/lib/Makefile
index 3547e16..e1dea3b 100644
--- a/testcases/lib/Makefile
+++ b/testcases/lib/Makefile
@@ -28,6 +28,6 @@ INSTALL_TARGETS := *.sh
MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\
tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\
- tst_getconf tst_supported_fs
+ tst_getconf tst_supported_fs tst_check_drivers
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/lib/tst_check_drivers.c b/testcases/lib/tst_check_drivers.c
new file mode 100644
index 0000000..c1d879d
--- /dev/null
+++ b/testcases/lib/tst_check_drivers.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Copyright (c) 2018 Oracle and/or its affiliates. All Rights Reserved. */
+
+#include <stdio.h>
+#include "tst_kernel.h"
+
+int main(int argc, const char *argv[])
+{
+ const char *name;
+ int i;
+
+ if (argc < 2) {
+ fprintf(stderr, "Please provide kernel driver list\n");
+ return 1;
+ }
+
+ for (i = 1; (name = argv[i]); ++i)
+ if (tst_check_driver(name)) {
+ fprintf(stderr, "%s", name);
+ return 1;
+ }
+
+ return 0;
+}
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
@ 2018-08-20 11:23 ` Alexey Kodanev
2018-08-22 15:42 ` Petr Vorel
2018-09-13 12:35 ` Cyril Hrubis
2018-08-20 11:23 ` [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function Alexey Kodanev
` (4 subsequent siblings)
5 siblings, 2 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-08-20 11:23 UTC (permalink / raw)
To: ltp
The drivers are checked with 'tst_check_drivers' command.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
v2: add a check for empty TST_NEEDS_DRIVERS
doc/test-writing-guidelines.txt | 1 +
testcases/lib/tst_test.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
index 7a458d5..8ebff5f 100644
--- a/doc/test-writing-guidelines.txt
+++ b/doc/test-writing-guidelines.txt
@@ -1653,6 +1653,7 @@ simply by setting right '$TST_NEEDS_FOO'.
| 'TST_NEEDS_CMDS' | String with command names that has to be present for
the test (see below).
| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below).
+| 'TST_NEEDS_DRIVERS'| Checks kernel drivers support for the test.
|=============================================================================
Checking for presence of commands
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index e553b49..23d66eb 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -285,6 +285,16 @@ tst_check_cmds()
return 0
}
+tst_test_drivers()
+{
+ [ $# -eq 0 ] && return 0
+
+ local drv="$(tst_check_drivers $@ 2>&1)"
+
+ [ -n "$drv" ] && tst_brk TCONF "$drv driver not available"
+ return 0
+}
+
tst_is_int()
{
[ "$1" -eq "$1" ] 2>/dev/null
@@ -332,6 +342,7 @@ tst_run()
OPTS|USAGE|PARSE_ARGS|POS_ARGS);;
NEEDS_ROOT|NEEDS_TMPDIR|NEEDS_DEVICE|DEVICE);;
NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);;
+ NEEDS_DRIVERS);;
IPV6|IPVER|TEST_DATA|TEST_DATA_IFS);;
RETRY_FUNC|RETRY_FN_EXP_BACKOFF);;
*) tst_res TWARN "Reserved variable TST_$_tst_i used!";;
@@ -369,6 +380,7 @@ tst_run()
fi
tst_test_cmds $TST_NEEDS_CMDS
+ tst_test_drivers $TST_NEEDS_DRIVERS
if [ -n "$TST_MIN_KVER" ]; then
tst_kvcmp -lt "$TST_MIN_KVER" && \
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
@ 2018-08-20 11:23 ` Alexey Kodanev
2018-09-13 13:00 ` Petr Vorel
2018-08-20 11:23 ` [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK() Alexey Kodanev
` (3 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Alexey Kodanev @ 2018-08-20 11:23 UTC (permalink / raw)
To: ltp
It should parse iproute commands output and exit the test with TCONF
if there are certain messages returned from iproute/RTNETLINK.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
v2: no changes
testcases/lib/tst_test.sh | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index 23d66eb..6837eb1 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -202,6 +202,22 @@ TST_RETRY_FUNC()
return $2
}
+TST_RTNL_CHK()
+{
+ local msg1="RTNETLINK answers: Function not implemented"
+ local msg2="RTNETLINK answers: Operation not supported"
+ local output="$($@ 2>&1 || echo 'LTP_ERR')"
+ local msg
+
+ echo "$output" | grep -q "LTP_ERR" || return 0
+
+ for msg in "$msg1" "$msg2"; do
+ echo "$output" | grep -q "$msg" && tst_brk TCONF "'$@': $msg"
+ done
+
+ tst_brk TBROK "$@ failed: $output"
+}
+
tst_umount()
{
local device="$1"
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK()
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function Alexey Kodanev
@ 2018-08-20 11:23 ` Alexey Kodanev
2018-08-22 15:45 ` Petr Vorel
2018-09-13 13:02 ` Petr Vorel
2018-08-22 15:41 ` [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Petr Vorel
` (2 subsequent siblings)
5 siblings, 2 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-08-20 11:23 UTC (permalink / raw)
To: ltp
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
v2: fixed missing ip before TST_RTNL_CHK
testcases/network/stress/ipsec/ipsec_lib.sh | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh
index aedba9b..b099fde 100644
--- a/testcases/network/stress/ipsec/ipsec_lib.sh
+++ b/testcases/network/stress/ipsec/ipsec_lib.sh
@@ -157,21 +157,6 @@ ipsec_set_algoline()
esac
}
-ipsec_try()
-{
- local output="$($@ 2>&1 || echo 'TERR')"
-
- if echo "$output" | grep -q "TERR"; then
- echo "$output" | grep -q \
- 'RTNETLINK answers: Function not implemented' && \
- tst_brk TCONF "'$@': not implemented"
- echo "$output" | grep -q \
- 'RTNETLINK answers: Operation not supported' && \
- tst_brk TCONF "'$@': not supported (maybe missing 'ip${TST_IPV6}_vti' kernel module)"
- tst_brk TBROK "$@ failed: $output"
- fi
-}
-
# tst_ipsec target src_addr dst_addr: config ipsec
#
# target: target of the configuration host ( lhost / rhost )
@@ -195,7 +180,7 @@ tst_ipsec()
if [ $target = lhost ]; then
local spi_1="0x$SPI"
local spi_2="0x$(( $SPI + 1 ))"
- ipsec_try ip xfrm state add src $src dst $dst spi $spi_1 \
+ TST_RTNL_CHK ip xfrm state add src $src dst $dst spi $spi_1 \
$p $ALG mode $mode sel src $src dst $dst
ROD ip xfrm state add src $dst dst $src spi $spi_2 \
$p $ALG mode $mode sel src $dst dst $src
@@ -257,12 +242,12 @@ tst_ipsec_vti()
cleanup_vti=$vti
if [ $target = lhost ]; then
- ipsec_try ip li add $vti $type local $src remote $dst $key $d
+ TST_RTNL_CHK ip li add $vti $type local $src remote $dst $key $d
ROD ip li set $vti up
local spi_1="spi 0x$SPI"
local spi_2="spi 0x$(( $SPI + 1 ))"
- ipsec_try $ipx st add $o_dir $p $spi_1 $ALG $m
+ TST_RTNL_CHK $ipx st add $o_dir $p $spi_1 $ALG $m
ROD $ipx st add $i_dir $p $spi_2 $ALG $m
ROD $ipx po add dir out tmpl $o_dir $p $m $mrk
ROD $ipx po add dir in tmpl $i_dir $p $m $mrk
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
` (2 preceding siblings ...)
2018-08-20 11:23 ` [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK() Alexey Kodanev
@ 2018-08-22 15:41 ` Petr Vorel
2018-08-27 10:44 ` Alexey Kodanev
2018-09-06 17:53 ` Petr Vorel
2018-09-13 12:27 ` Cyril Hrubis
5 siblings, 1 reply; 15+ messages in thread
From: Petr Vorel @ 2018-08-22 15:41 UTC (permalink / raw)
To: ltp
Hi Alexey,
> The drivers are checked with modprobe. If modprobe is not available
> on the system, the checks are silently skipped.
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
> ---
> v2: * moved tst_check_driver() from tst_test.h to tst_kernel.h
> * added the new option description to the doc and comment to tst_kernel.h
> * iterating over the driver list moved out from tst_check_drivers(), the
> function renamed accordingly.
...
> +2.2.26 Checking kernel for the driver support
> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> +
> + Someties test needs certain drivers to be available in the kernel and must
Typo Sometimes
> +end with TCONF if any are missing. For this task there is the '.needs_drivers'
> +option which accepts NULL-terminated array of the drivers names.
> +
> +Since it relies on modprobe command, the check will be skipped if the command
> +itself is not available on the system.
> +++ b/testcases/lib/tst_check_drivers.c
...
> + if (argc < 2) {
> + fprintf(stderr, "Please provide kernel driver list\n");
> + return 1;
> + }
> +
> + for (i = 1; (name = argv[i]); ++i)
> + if (tst_check_driver(name)) {
> + fprintf(stderr, "%s", name);
> + return 1;
> + }
> +
> + return 0;
> +}
It'd be handy to be able to load module with parameters. E.g.:
tcrypt sec=1 mode=200
We have 2 options: to name strig by spaces to b:
./tst_check_drivers "tcrypt sec=1 mode=200" other_module
Or handle in tst_check_drivers.c just one module and call it several times.
None of them is elegant.
Otherwise LGTM.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
@ 2018-08-22 15:42 ` Petr Vorel
2018-09-13 12:35 ` Cyril Hrubis
1 sibling, 0 replies; 15+ messages in thread
From: Petr Vorel @ 2018-08-22 15:42 UTC (permalink / raw)
To: ltp
Hi Alexey,
> The drivers are checked with 'tst_check_drivers' command.
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Petr Vorel <pvorel@suse.cz>
Thanks for the docs.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK()
2018-08-20 11:23 ` [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK() Alexey Kodanev
@ 2018-08-22 15:45 ` Petr Vorel
2018-09-13 13:02 ` Petr Vorel
1 sibling, 0 replies; 15+ messages in thread
From: Petr Vorel @ 2018-08-22 15:45 UTC (permalink / raw)
To: ltp
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Petr Vorel <pvorel@suse.cz>
> ---
> v2: fixed missing ip before TST_RTNL_CHK
I was just going to report it :-).
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
2018-08-22 15:41 ` [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Petr Vorel
@ 2018-08-27 10:44 ` Alexey Kodanev
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-08-27 10:44 UTC (permalink / raw)
To: ltp
On 08/22/2018 06:41 PM, Petr Vorel wrote:
> Hi Alexey,
>
>> The drivers are checked with modprobe. If modprobe is not available
>> on the system, the checks are silently skipped.
>
>> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
> Reviewed-by: Petr Vorel <pvorel@suse.cz>
>
Hi Petr,
>> ---
>> v2: * moved tst_check_driver() from tst_test.h to tst_kernel.h
>> * added the new option description to the doc and comment to tst_kernel.h
>> * iterating over the driver list moved out from tst_check_drivers(), the
>> function renamed accordingly.
>
> ...
>> +2.2.26 Checking kernel for the driver support
>> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>> +
>> + Someties test needs certain drivers to be available in the kernel and must
> Typo Sometimes
>
>> +end with TCONF if any are missing. For this task there is the '.needs_drivers'
>> +option which accepts NULL-terminated array of the drivers names.
>> +
>> +Since it relies on modprobe command, the check will be skipped if the command
>> +itself is not available on the system.
>
>
>> +++ b/testcases/lib/tst_check_drivers.c
> ...
>> + if (argc < 2) {
>> + fprintf(stderr, "Please provide kernel driver list\n");
>> + return 1;
>> + }
>> +
>> + for (i = 1; (name = argv[i]); ++i)
>> + if (tst_check_driver(name)) {
>> + fprintf(stderr, "%s", name);
>> + return 1;
>> + }
>> +
>> + return 0;
>> +}
> It'd be handy to be able to load module with parameters. E.g.:
> tcrypt sec=1 mode=200
>
Do you want to start tcrypt module in the test setup? It's probably
better to add the -n/--dry-run option, so at first we verify that
the kernel actually has it, then either end with TCONF or continue.
That's the purpose of the 'needs_drivers'.
Moreover, if the failure occurs during the loading instead, the test
must return TBROK, not TCONF, right?
> We have 2 options: to name strig by spaces to b:
> ./tst_check_drivers "tcrypt sec=1 mode=200" other_module
>
> Or handle in tst_check_drivers.c just one module and call it several times.
like modprobe?
>
> None of them is elegant.
>
> Otherwise LGTM.
>
>
> Kind regards,
> Petr
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
` (3 preceding siblings ...)
2018-08-22 15:41 ` [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Petr Vorel
@ 2018-09-06 17:53 ` Petr Vorel
2018-09-13 12:27 ` Cyril Hrubis
5 siblings, 0 replies; 15+ messages in thread
From: Petr Vorel @ 2018-09-06 17:53 UTC (permalink / raw)
To: ltp
Hi Alexey,
> The drivers are checked with modprobe. If modprobe is not available
> on the system, the checks are silently skipped.
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
> ---
> v2: * moved tst_check_driver() from tst_test.h to tst_kernel.h
> * added the new option description to the doc and comment to tst_kernel.h
> * iterating over the driver list moved out from tst_check_drivers(), the
> function renamed accordingly.
> doc/test-writing-guidelines.txt | 10 ++++++++++
> include/tst_kernel.h | 8 ++++++++
> include/tst_test.h | 3 +++
> lib/tst_kernel.c | 9 +++++++++
> lib/tst_test.c | 9 +++++++++
> testcases/lib/.gitignore | 1 +
> testcases/lib/Makefile | 2 +-
> testcases/lib/tst_check_drivers.c | 24 ++++++++++++++++++++++++
> 8 files changed, 65 insertions(+), 1 deletions(-)
> create mode 100644 testcases/lib/tst_check_drivers.c
I'd like this whole patchset being merged before git freeze.
Do you plan it?
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
` (4 preceding siblings ...)
2018-09-06 17:53 ` Petr Vorel
@ 2018-09-13 12:27 ` Cyril Hrubis
2018-09-14 11:41 ` Alexey Kodanev
5 siblings, 1 reply; 15+ messages in thread
From: Cyril Hrubis @ 2018-09-13 12:27 UTC (permalink / raw)
To: ltp
Hi!
> +2.2.26 Checking kernel for the driver support
> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> +
> +Someties test needs certain drivers to be available in the kernel and must
> +end with TCONF if any are missing. For this task there is the '.needs_drivers'
> +option which accepts NULL-terminated array of the drivers names.
Maybe we should explicitly say here that this works for both drivers
that are compiled-in and modules, since otherwise this may confuse the
users, especially since we talk about modprobe in the next paragraph.
I would write something as:
"Some tests may need specific kernel drivers, either compiled in, or
loaded as a module. If .need_drivers points to a NULL-terminated array
of kernel module names these are all checked and the test exits with
TCONF on first missing driver."
> +Since it relies on modprobe command, the check will be skipped if the command
> +itself is not available on the system.
> +
> 2.3 Writing a testcase in shell
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> diff --git a/include/tst_kernel.h b/include/tst_kernel.h
> index 5d5c04c..88941e1 100644
> --- a/include/tst_kernel.h
> +++ b/include/tst_kernel.h
> @@ -23,4 +23,12 @@
> */
> int tst_kernel_bits(void);
>
> +/**
> + * Checks support for the kernel driver.
> + *
> + * @param name The name of the driver.
> + * @return Returns 0 if the kernel has the driver or modprobe is missing.
> + */
> +int tst_check_driver(const char *name);
> +
> #endif /* TST_KERNEL_H__ */
> diff --git a/include/tst_test.h b/include/tst_test.h
> index 98dacf3..55c1418 100644
> --- a/include/tst_test.h
> +++ b/include/tst_test.h
> @@ -170,6 +170,9 @@ struct tst_test {
>
> /* NULL terminated array of resource file names */
> const char *const *resource_files;
> +
> + /* NULL terminated array of needed kernel drivers */
> + const char * const *needs_drivers;
> };
>
> /*
> diff --git a/lib/tst_kernel.c b/lib/tst_kernel.c
> index 42d64cb..ad00d2d 100644
> --- a/lib/tst_kernel.c
> +++ b/lib/tst_kernel.c
> @@ -45,3 +45,12 @@ int tst_kernel_bits(void)
>
> return kernel_bits;
> }
> +
> +int tst_check_driver(const char *name)
> +{
> + const char * const argv[] = { "modprobe", name, NULL };
> + int res = tst_run_cmd_(NULL, argv, "/dev/null", "/dev/null", 1);
> +
> + /* 255 - it looks like modprobe not available */
> + return (res == 255) ? 0 : res;
> +}
> diff --git a/lib/tst_test.c b/lib/tst_test.c
> index 2f3d357..dcc4088 100644
> --- a/lib/tst_test.c
> +++ b/lib/tst_test.c
> @@ -767,6 +767,15 @@ static void do_setup(int argc, char *argv[])
> if (tst_test->min_kver)
> check_kver();
>
> + if (tst_test->needs_drivers) {
> + const char *name;
> + int i;
> +
> + for (i = 0; (name = tst_test->needs_drivers[i]); ++i)
> + if (tst_check_driver(name))
> + tst_brk(TCONF, "%s driver not available", name);
> + }
> +
> if (tst_test->format_device)
> tst_test->needs_device = 1;
>
> diff --git a/testcases/lib/.gitignore b/testcases/lib/.gitignore
> index a9034e4..d83a48e 100644
> --- a/testcases/lib/.gitignore
> +++ b/testcases/lib/.gitignore
> @@ -1,5 +1,6 @@
> /tst_sleep
> /tst_random
> +/tst_check_drivers
> /tst_checkpoint
> /tst_rod
> /tst_kvcmp
> diff --git a/testcases/lib/Makefile b/testcases/lib/Makefile
> index 3547e16..e1dea3b 100644
> --- a/testcases/lib/Makefile
> +++ b/testcases/lib/Makefile
> @@ -28,6 +28,6 @@ INSTALL_TARGETS := *.sh
>
> MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\
> tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\
> - tst_getconf tst_supported_fs
> + tst_getconf tst_supported_fs tst_check_drivers
>
> include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/lib/tst_check_drivers.c b/testcases/lib/tst_check_drivers.c
> new file mode 100644
> index 0000000..c1d879d
> --- /dev/null
> +++ b/testcases/lib/tst_check_drivers.c
> @@ -0,0 +1,24 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/* Copyright (c) 2018 Oracle and/or its affiliates. All Rights Reserved. */
> +
> +#include <stdio.h>
> +#include "tst_kernel.h"
> +
> +int main(int argc, const char *argv[])
> +{
> + const char *name;
> + int i;
> +
> + if (argc < 2) {
> + fprintf(stderr, "Please provide kernel driver list\n");
> + return 1;
> + }
> +
> + for (i = 1; (name = argv[i]); ++i)
> + if (tst_check_driver(name)) {
> + fprintf(stderr, "%s", name);
> + return 1;
> + }
I would be happier if we put a curly braces around large blocks inside
of other blocks as LKML prefers to do, since this piece of code is
starting to look a bit like python...
Other than that this looks very good.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
2018-08-22 15:42 ` Petr Vorel
@ 2018-09-13 12:35 ` Cyril Hrubis
2018-09-14 11:54 ` Alexey Kodanev
1 sibling, 1 reply; 15+ messages in thread
From: Cyril Hrubis @ 2018-09-13 12:35 UTC (permalink / raw)
To: ltp
Hi!
> +tst_test_drivers()
> +{
> + [ $# -eq 0 ] && return 0
> +
> + local drv="$(tst_check_drivers $@ 2>&1)"
Wouldn't it be easier to just redirect the stderr into /dev/null here
and check the $? instead of [ -n "$drv" ] ?
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function
2018-08-20 11:23 ` [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function Alexey Kodanev
@ 2018-09-13 13:00 ` Petr Vorel
0 siblings, 0 replies; 15+ messages in thread
From: Petr Vorel @ 2018-09-13 13:00 UTC (permalink / raw)
To: ltp
Hi Alexey,
> It should parse iproute commands output and exit the test with TCONF
> if there are certain messages returned from iproute/RTNETLINK.
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
> ---
> v2: no changes
Merged your patch to have it for the release.
Thanks a lot!
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK()
2018-08-20 11:23 ` [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK() Alexey Kodanev
2018-08-22 15:45 ` Petr Vorel
@ 2018-09-13 13:02 ` Petr Vorel
1 sibling, 0 replies; 15+ messages in thread
From: Petr Vorel @ 2018-09-13 13:02 UTC (permalink / raw)
To: ltp
Hi Alexey,
> Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
> ---
> v2: fixed missing ip before TST_RTNL_CHK
Merged your patch to have it for the release.
Thanks a lot!
NOTE: I'm going to leave the 1st and 2nd patch, as there is currently no test
using it. I guess we'd like to use it in tst_net.sh for netns.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd
2018-09-13 12:27 ` Cyril Hrubis
@ 2018-09-14 11:41 ` Alexey Kodanev
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-09-14 11:41 UTC (permalink / raw)
To: ltp
On 09/13/2018 03:27 PM, Cyril Hrubis wrote:
> Hi!
>> +2.2.26 Checking kernel for the driver support
>> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>> +
>> +Someties test needs certain drivers to be available in the kernel and must
>> +end with TCONF if any are missing. For this task there is the '.needs_drivers'
>> +option which accepts NULL-terminated array of the drivers names.
>
> Maybe we should explicitly say here that this works for both drivers
> that are compiled-in and modules, since otherwise this may confuse the
> users, especially since we talk about modprobe in the next paragraph.
>
> I would write something as:
>
> "Some tests may need specific kernel drivers, either compiled in, or
> loaded as a module. If .need_drivers points to a NULL-terminated array
> of kernel module names these are all checked and the test exits with
> TCONF on first missing driver."
>
OK, thanks! I guess this also correlates with using the --dry-run option
of modprobe that I'm going to add in the 3rd version [1], if there are no
objections.
[1] http://lists.linux.it/pipermail/ltp/2018-August/009128.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter
2018-09-13 12:35 ` Cyril Hrubis
@ 2018-09-14 11:54 ` Alexey Kodanev
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Kodanev @ 2018-09-14 11:54 UTC (permalink / raw)
To: ltp
On 09/13/2018 03:35 PM, Cyril Hrubis wrote:
> Hi!
>> +tst_test_drivers()
>> +{
>> + [ $# -eq 0 ] && return 0
>> +
>> + local drv="$(tst_check_drivers $@ 2>&1)"
>
> Wouldn't it be easier to just redirect the stderr into /dev/null here
> and check the $? instead of [ -n "$drv" ] ?
>
It's better to print the error message if any, including the driver name that
is missing. And checking $? should work here too, will change that.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-09-14 11:54 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-20 11:23 [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 2/4] lib/tst_test.sh: add TST_NEEDS_DRIVERS parameter Alexey Kodanev
2018-08-22 15:42 ` Petr Vorel
2018-09-13 12:35 ` Cyril Hrubis
2018-09-14 11:54 ` Alexey Kodanev
2018-08-20 11:23 ` [LTP] [PATCH v2 3/4] lib/tst_test.sh: add TST_RTNL_CHK() helper function Alexey Kodanev
2018-09-13 13:00 ` Petr Vorel
2018-08-20 11:23 ` [LTP] [PATCH v2 4/4] network/ipsec: replace ipsec_try() with TST_RTNL_CHK() Alexey Kodanev
2018-08-22 15:45 ` Petr Vorel
2018-09-13 13:02 ` Petr Vorel
2018-08-22 15:41 ` [LTP] [PATCH v2 1/4] lib/tst_test.c: add 'needs_drivers' option with tst_check_drivers cmd Petr Vorel
2018-08-27 10:44 ` Alexey Kodanev
2018-09-06 17:53 ` Petr Vorel
2018-09-13 12:27 ` Cyril Hrubis
2018-09-14 11:41 ` Alexey Kodanev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.