[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Radoslav Kolev]

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.

Signed-off-by: Radoslav Kolev <radoslav.kolev@suse.com>
---
 testcases/lib/tst_test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index c6aa2c487..0458c90c2 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -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
 
-- 
2.26.2

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Petr Vorel]

Hi Radoslav,

> 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.

LGTM.
Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

> Signed-off-by: Radoslav Kolev <radoslav.kolev@suse.com>
> ---
>  testcases/lib/tst_test.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

> diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
> index c6aa2c487..0458c90c2 100644
> --- a/testcases/lib/tst_test.sh
> +++ b/testcases/lib/tst_test.sh
> @@ -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

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Radoslav Kolev]

On 7/22/21 10:49 AM, Petr Vorel wrote:
> Hi Radoslav,
>
>> 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.
> LGTM.
> Reviewed-by: Petr Vorel <pvorel@suse.cz>

Thanks for the review, Petr!

Alexey, please let me know if you have any comments.


Regards,

Radoslav

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Alexey Kodanev]

Hi Radoslav,
On 27.07.2021 11:20, Radoslav Kolev wrote:
> On 7/22/21 10:49 AM, Petr Vorel wrote:
>> Hi Radoslav,
>>
>>> 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.
>> LGTM.
>> Reviewed-by: Petr Vorel <pvorel@suse.cz>
> 
> 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.

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Petr Vorel]

Hi Alexey, Radoslav,

> Hi Radoslav,

> On 27.07.2021 11:20, Radoslav Kolev wrote:
> > On 7/22/21 10:49 AM, Petr Vorel wrote:
> >> Hi Radoslav,

> >>> 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.
> >> LGTM.
> >> Reviewed-by: Petr Vorel <pvorel@suse.cz>

> > 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.

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

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Alexey Kodanev]

On 27.07.2021 13:02, Petr Vorel wrote:
> Hi Alexey, Radoslav,
> 
>> Hi Radoslav,
> 
>> On 27.07.2021 11:20, Radoslav Kolev wrote:
>>> On 7/22/21 10:49 AM, Petr Vorel wrote:
>>>> Hi Radoslav,
> 
>>>>> 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.
>>>> LGTM.
>>>> Reviewed-by: Petr Vorel <pvorel@suse.cz>
> 
>>> 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.
> 
> 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)"

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Petr Vorel]

> On 27.07.2021 13:02, Petr Vorel wrote:
> > Hi Alexey, Radoslav,

> >> Hi Radoslav,

> >> On 27.07.2021 11:20, Radoslav Kolev wrote:
> >>> On 7/22/21 10:49 AM, Petr Vorel wrote:
> >>>> Hi Radoslav,

> >>>>> 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.
> >>>> LGTM.
> >>>> Reviewed-by: Petr Vorel <pvorel@suse.cz>

> >>> 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.

> > 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".
Sure, more effective ways are always welcome.

> 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

[LTP] [PATCH v1] lib/tst_test.sh: skip test if ip returns "Error: Unknown device type"

[Radoslav Kolev]

On 7/28/21 4:06 PM, Petr Vorel wrote:
> 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?

Agreed that the proposed by Alexey is a better approach. Yes, patch is 
coming.

[LTP] [PATCH v2] ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests

[Radoslav Kolev]

In 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.

Signed-off-by: Radoslav Kolev <radoslav.kolev@suse.com>
---
 testcases/network/stress/ipsec/ipsec_lib.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh
index e395e1ff3..fce05622d 100644
--- a/testcases/network/stress/ipsec/ipsec_lib.sh
+++ b/testcases/network/stress/ipsec/ipsec_lib.sh
@@ -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
 
-- 
2.26.2

[LTP] [PATCH v2] ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests

[Petr Vorel]

Hi Radoslav,

...
> +	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"

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

[LTP] [PATCH v2] ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests

[Alexey Kodanev]

On 30.07.2021 10:08, Petr Vorel wrote:
> Hi Radoslav,
> 
> ...
>> +	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"
> 
> Reviewed-by: Petr Vorel <pvorel@suse.cz>

Thanks Radoslav, Petr!

Reviewed-by: Alexey Kodanev <aleksei.kodanev@bell-sw.com>

[LTP] [PATCH v2] ipsec_lib.sh: check ip_vti/ip6_vti are enabled or skip tests

[Petr Vorel]

Hi Radoslav, Alexey,

thanks a lot both, merged.

Kind regards,
Petr