lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
In network stress test groups there are tests expecting CONFIG_NET_IPVTI to be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.
--- testcases/lib/tst_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
testcases/lib/tst_test.sh +2 -1
@@ -241,12 +241,13 @@ TST_RTNL_CHK() local msg1="RTNETLINK answers: Function not implemented" local msg2="RTNETLINK answers: Operation not supported" local msg3="RTNETLINK answers: Protocol not supported" + local msg4="Error: Unknown device type" local output="$($@ 2>&1 || echo 'LTP_ERR')" local msg echo "$output" | grep -q "LTP_ERR" || return 0 - for msg in "$msg1" "$msg2" "$msg3"; do + for msg in "$msg1" "$msg2" "$msg3" "$msg4"; do echo "$output" | grep -q "$msg" && tst_brk TCONF "'$@': $msg" done
Signature · 1 line
2.26.2
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.
LGTM.
Kind regards,
Petr
Quoted 23 lines
Signed-off-by Radoslav Kolev <[email protected]>--- testcases/lib/tst_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)testcases/lib/tst_test.sh +2
-1@@ -241,12 +241,13 @@ TST_RTNL_CHK() local msg1="RTNETLINK answers: Function not implemented" local msg2="RTNETLINK answers: Operation not supported" local msg3="RTNETLINK answers: Protocol not supported" + local msg4="Error: Unknown device type" local output="$($@ 2>&1 || echo 'LTP_ERR')" local msg echo "$output" | grep -q "LTP_ERR" || return 0 - for msg in "$msg1" "$msg2" "$msg3"; do + for msg in "$msg1" "$msg2" "$msg3" "$msg4"; do echo "$output" | grep -q "$msg" && tst_brk TCONF "'$@': $msg" done
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Quoted 9 lines · Petr Vorel
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.LGTM.
Reviewed-by Petr Vorel <[email protected]>
Thanks for the review, Petr!
Alexey, please let me know if you have any comments.
Regards,
Radoslav
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Hi Radoslav,
Quoted 8 lines · Radoslav Kolev
Quoted 7 lines · Petr Vorel
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.
Quoted 8 lines
Quoted 2 lines
LGTM.
Reviewed-by Petr Vorel <[email protected]>Thanks for the review, Petr!
Alexey, please let me know if you have any comments.
What about checking vti drivers in stress/ipsec/ipsec_lib.sh:tst_ipsec_setup_vti() Similar to the checks for xfrm_user driver there...
For example:
tst_net_run -q "tst_check_drivers ip_vti ip6_vti" || \
tst_brk TCONF "vti driver not available on lhost or rhost"
I think this should work for wireguard02 test as well.
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Hi Alexey, Radoslav,
Quoted 23 lines
Hi Radoslav,
Quoted 8 lines · Radoslav Kolev
Quoted 7 lines · Petr Vorel
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.Quoted 6 lines
Quoted 2 lines
LGTM.
Reviewed-by Petr Vorel <[email protected]>Thanks for the review, Petr!
Alexey, please let me know if you have any comments.
What about checking vti drivers in stress/ipsec/ipsec_lib.sh:tst_ipsec_setup_vti() Similar to the checks for
xfrm_userdriver there...
Quoted 7 lines
For example:
tst_net_run-q "tst_check_driversip_vtiip6_vti" || \
tst_brkTCONF "vti driver not available on lhost or rhost"I think this should work for wireguard02 test as well.
The above LGTM, Radoslav, do you have time to look into it?
Alexey, do we also accept this patch? IMHO this error should be mostly TCONF and it'd work for other possible drivers.
Kind regards,
Petr
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Quoted 31 lines · Petr Vorel
Hi Alexey, Radoslav,
Quoted 27 lines
Hi Radoslav,
Quoted 8 lines · Radoslav Kolev
Quoted 7 lines · Petr Vorel
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.Quoted 6 lines
Quoted 2 lines
LGTM.
Reviewed-by Petr Vorel <[email protected]>Thanks for the review, Petr!
Alexey, please let me know if you have any comments.
What about checking vti drivers in stress/ipsec/ipsec_lib.sh:tst_ipsec_setup_vti() Similar to the checks for
xfrm_userdriver there...For example:
tst_net_run-q "tst_check_driversip_vtiip6_vti" || \
tst_brkTCONF "vti driver not available on lhost or rhost"
Quoted 6 lines
Quoted 1 line
I think this should work for wireguard02 test as well.
The above LGTM, Radoslav, do you have time to look into it?
Alexey, do we also accept this patch? IMHO this error should be mostly TCONF and it'd work for other possible drivers.
Not sure if we really want to add the new patterns every time the error message from ip changes. For example depending on the ip/libc the error can be "Error: Unknown device type." or "RTNETLINK answers:
Not supported".
We could also save the error message in setup by passing the wrong type and then compare it during the test:
no_dev_msg="$(ip link add ltp0 type ltp0 2>&1)"
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Quoted 39 lines · Petr Vorel
Quoted 31 lines
Hi Alexey, Radoslav,
Quoted 27 lines
Hi Radoslav,
Quoted 8 lines · Radoslav Kolev
Quoted 7 lines · Petr Vorel
Hi Radoslav,
Quoted 5 lines
In network stress test groups there are tests expecting
CONFIG_NET_IPVTIto be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if vti device type is not known by the kernel.Quoted 6 lines
Quoted 2 lines
LGTM.
Reviewed-by Petr Vorel <[email protected]>Thanks for the review, Petr!
Alexey, please let me know if you have any comments.
What about checking vti drivers in stress/ipsec/ipsec_lib.sh:tst_ipsec_setup_vti() Similar to the checks for
xfrm_userdriver there...For example:
tst_net_run-q "tst_check_driversip_vtiip6_vti" || \
tst_brkTCONF "vti driver not available on lhost or rhost"Quoted 5 lines
Quoted 1 line
I think this should work for wireguard02 test as well.
The above LGTM, Radoslav, do you have time to look into it?
Alexey, do we also accept this patch? IMHO this error should be mostly TCONF and it'd work for other possible drivers.
Quoted 4 lines
Not sure if we really want to add the new patterns every time the error message from ip changes. For example depending on the ip/libc the error can be "Error: Unknown device type." or "RTNETLINK answers:
Not supported".
Sure, more effective ways are always welcome.
Quoted 4 lines
We could also save the error message in setup by passing the wrong type and then compare it during the test:
no_dev_msg="$(ip link add ltp0 type ltp0 2>&1)"
Yep, that'd be safer. But your original proposal to check ip_vti ip6_vti is IMHO the best solution. Radoslav, would you send a new patch with it?
Kind regards,
Petr
PATCH 1/1 lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"
Quoted 2 lines · Petr Vorel
Yep, that'd be safer. But your original proposal to check
ip_vtiip6_vtiis IMHO the best solution. Radoslav, would you send a new patch with it?
Agreed that the proposed by Alexey is a better approach. Yes, patch is coming.
PATCH v2 1/1 ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests
In reply to Petr VorelIn network stress test groups there are tests expecting CONFIG_NET_IPVTI/CONFIG_IPV6_VTI to be enabled in the kernel, and if it's not they fail. There is a check for VTI support in the ip utility, but not for the kernel. Skip these tests if there is no ip_vti/ip6_vti support in the kernel.
--- testcases/network/stress/ipsec/ipsec_lib.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
testcases/network/stress/ipsec/ipsec_lib.sh +8 -0
@@ -292,6 +292,14 @@ tst_ipsec_setup_vti() tst_res TINFO "Test vti$TST_IPV6 + IPsec[$IPSEC_PROTO/$IPSEC_MODE]" + if [ "$TST_IPV6" ]; then + tst_net_run -q "tst_check_drivers ip6_vti" || \ + tst_brk TCONF "ip6_vti driver not available on lhost or rhost" + else + tst_net_run -q "tst_check_drivers ip_vti" || \ + tst_brk TCONF "ip_vti driver not available on lhost or rhost" + fi + tst_ipsec_vti lhost $ip_loc $ip_rmt $tst_vti tst_ipsec_vti rhost $ip_rmt $ip_loc $tst_vti
Signature · 1 line
2.26.2
PATCH v2 1/1 ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests
Hi Radoslav,
...
testcases/network/stress/ipsec/ipsec_lib.sh tst_ipsec_setup_vti() · line 301
Quoted 7 lines
testcases/network/stress/ipsec/ipsec_lib.sh +7
-0+ if [ "$TST_IPV6" ]; then + tst_net_run -q "tst_check_drivers ip6_vti" || \ + tst_brk TCONF "ip6_vti driver not available on lhost or rhost" + else + tst_net_run -q "tst_check_drivers ip_vti" || \ + tst_brk TCONF "ip_vti driver not available on lhost or rhost" + fi
nit: broken indentation, but that'll be fix during merge.
LGTM, but I'm going to merge shorter version (we have $TST_IPV6 for this purpose).
tst_net_run -q "tst_check_drivers ip${TST_IPV6}_vti" || \
tst_brk TCONF "ip${TST_IPV6}_vti driver not available on lhost or rhost"Kind regards,
Petr
PATCH v2 1/1 ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests
Quoted 12 lines · Petr Vorel
Hi Radoslav,
...
testcases/network/stress/ipsec/ipsec_lib.sh tst_ipsec_setup_vti() · line 301
Quoted 7 lines
testcases/network/stress/ipsec/ipsec_lib.sh +7
-0+ if [ "$TST_IPV6" ]; then + tst_net_run -q "tst_check_drivers ip6_vti" || \ + tst_brk TCONF "ip6_vti driver not available on lhost or rhost" + else + tst_net_run -q "tst_check_drivers ip_vti" || \ + tst_brk TCONF "ip_vti driver not available on lhost or rhost" + finit: broken indentation, but that'll be fix during merge.
Quoted 7 lines
LGTM, but I'm going to merge shorter version (we have $TST_IPV6 for this purpose).
tst_net_run -q "tst_check_drivers ip${TST_IPV6}_vti" || \ tst_brk TCONF "ip${TST_IPV6}_vti driver not available on lhost or rhost"Reviewed-by Petr Vorel <[email protected]>
Thanks Radoslav, Petr!
PATCH v2 1/1 ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests
Hi Radoslav, Alexey,
thanks a lot both, merged.
Kind regards,
Petr