selftests: mlxsw: A couple of fixes
Subsystems (4)
Ido Schimmel
maintainercover selftests: mlxsw: A couple of fixes
Patch #1 fixes a breakage due to a change in iproute2 output. The real problem is not iproute2, but the fact that the check was not strict enough. Fixed by using JSON output instead. Targeting at net so that the test will pass as part of old and new kernels regardless of iproute2 version.
Patch #2 fixes an issue uncovered by the first one.
Amit Cohen (2):
selftests: mlxsw: tc_police_scale: Make test more robust
selftests: mlxsw: resource_scale: Fix return value
.../selftests/drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- tools/testing/selftests/drivers/net/mlxsw/tc_police_scale.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 1/2 selftests: mlxsw: tc_police_scale: Make test more robust
From: Amit Cohen <[email protected]>
The test adds tc filters and checks how many of them were offloaded by grepping for 'in_hw'.
iproute2 commit f4cd4f127047 ("tc: add skip_hw and skip_sw to control action offload") added offload indication to tc actions, producing the following output:
$ tc filter show dev swp2 ingress
...
filter protocol ipv6 pref 1000 flower chain 0 handle 0x7c0
eth_type ipv6
dst_ip 2001:db8:1::7bf
skip_sw
in_hw in_hw_count 1
action order 1: police 0x7c0 rate 10Mbit burst 100Kb mtu 2Kb action drop overhead 0b
ref 1 bind 1
not_in_hw
used_hw_stats immediateThe current grep expression matches on both 'in_hw' and 'not_in_hw', resulting in incorrect results.
Fix that by using JSON output instead.
--- tools/testing/selftests/drivers/net/mlxsw/tc_police_scale.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/drivers/net/mlxsw/tc_police_scale.sh +2 -1
@@ -60,7 +60,8 @@ __tc_police_test() tc_police_rules_create $count $should_fail - offload_count=$(tc filter show dev $swp1 ingress | grep in_hw | wc -l) + offload_count=$(tc -j filter show dev $swp1 ingress | + jq "[.[] | select(.options.in_hw == true)] | length") ((offload_count == count)) check_err_fail $should_fail $? "tc police offload count" }
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 2/2 selftests: mlxsw: resource_scale: Fix return value
In reply to Ido SchimmelFrom: Amit Cohen <[email protected]>
The test runs several test cases and is supposed to return an error in case at least one of them failed.
Currently, the check of the return value of each test case is in the wrong place, which can result in the wrong return value. For example:
# TESTS='tc_police' ./resource_scale.sh
TEST: 'tc_police' [default] 968 [FAIL]
tc police offload count failed
Error: mlxsw_spectrum: Failed to allocate policer index. We have an error talking to the kernel
Command failed /tmp/tmp.i7Oc5HwmXY:969
TEST: 'tc_police' [default] overflow 969 [ OK ]
...
TEST: 'tc_police' [ipv4_max] overflow 969 [ OK ]
$ echo $? 0
Fix this by moving the check to be done after each test case.
--- .../selftests/drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh +1 -1
@@ -50,8 +50,8 @@ for current_test in ${TESTS:-$ALL_TESTS}; do else log_test "'$current_test' [$profile] overflow $target" fi + RET_FIN=$(( RET_FIN || RET )) done - RET_FIN=$(( RET_FIN || RET )) done done current_test=""
Signature · 1 line
2.33.1
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 2 Mar 2022 18:14:45 +0200 you wrote:
Patch #1 fixes a breakage due to a change in iproute2 output. The real problem is not iproute2, but the fact that the check was not strict enough. Fixed by using JSON output instead. Targeting at net so that the test will pass as part of old and new kernels regardless of iproute2 version.
Patch #2 fixes an issue uncovered by the first one.
[...]
Here is the summary with links:
- [net,1/2] selftests: mlxsw: tc_police_scale: Make test more robust
https://git.kernel.org/netdev/net/c/dc9752075341 - [net,2/2] selftests: mlxsw: resource_scale: Fix return value https://git.kernel.org/netdev/net/c/196f9bc050cb
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html