selftests: netdevsim: add devlink paramstests
Subsystems (5)
v3 cover selftests: netdevsim: add devlink paramstests
From: Jiri Pirko <[email protected]>
The first patch is just a helper addition as a dependency of the actual test in patch number two.
Jiri Pirko (2):
selftests: net: push jq workaround into separate helper
selftests: netdevsim: add devlink params tests
.../drivers/net/netdevsim/devlink.sh | 62 ++++++++++++++++++- tools/testing/selftests/net/forwarding/lib.sh | 19 ++++++ .../selftests/net/forwarding/tc_common.sh | 17 ++--- 3 files changed, 84 insertions(+), 14 deletions(-)
Signature · 1 line
2.21.0
PATCH v3 1/2 selftests: net: push jq workaround into separate helper
From: Jiri Pirko <[email protected]>
Push the jq return value workaround code into a separate helper so it could be used by the rest of the code.
---v2->v3:
-remove -e jq option and rather check for empty output and return error v1->v2:
-new patch
--- tools/testing/selftests/net/forwarding/lib.sh | 19 +++++++++++++++++++ .../selftests/net/forwarding/tc_common.sh | 17 ++++------------- 2 files changed, 23 insertions(+), 13 deletions(-)
tools/testing/selftests/net/forwarding/lib.sh +19 -0
@@ -250,6 +250,25 @@ setup_wait() sleep $WAIT_TIME } +cmd_jq() +{ + local cmd=$1 + local jq_exp=$2 + local ret + local output + + output="$($cmd)" + # it the command fails, return error right away + ret=$? + if [[ $ret -ne 0 ]]; then + return $ret + fi + output=$(echo $output | jq -r "$jq_exp") + echo $output + # return success only in case of non-empty output + [ ! -z "$output" ] +} + lldpad_app_wait_set() { local dev=$1; shift
tools/testing/selftests/net/forwarding/tc_common.sh +4 -13
@@ -8,18 +8,9 @@ tc_check_packets() local id=$1 local handle=$2 local count=$3 - local ret - output="$(tc -j -s filter show $id)" - # workaround the jq bug which causes jq to return 0 in case input is "" - ret=$? - if [[ $ret -ne 0 ]]; then - return $ret - fi - echo $output | \ - jq -e ".[] \ - | select(.options.handle == $handle) \ - | select(.options.actions[0].stats.packets == $count)" \ - &> /dev/null - return $? + cmd_jq "tc -j -s filter show $id" \ + ".[] | select(.options.handle == $handle) | \ + select(.options.actions[0].stats.packets == $count)" \ + &> /dev/null }
Signature · 1 line
2.21.0
PATCH v3 2/2 selftests: netdevsim: add devlink params tests
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Test recently added netdevsim devlink param implementation.
---v1->v2:
-using cmd_jq helper
--- .../drivers/net/netdevsim/devlink.sh | 62 ++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-)
tools/testing/selftests/drivers/net/netdevsim/devlink.sh +61 -1
@@ -3,7 +3,7 @@ lib_dir=$(dirname $0)/../../../net/forwarding -ALL_TESTS="fw_flash_test" +ALL_TESTS="fw_flash_test params_test" NUM_NETIFS=0 source $lib_dir/lib.sh
@@ -30,6 +30,66 @@ fw_flash_test() log_test "fw flash test" } +param_get() +{ + local name=$1 + + cmd_jq "devlink dev param show $DL_HANDLE name $name -j" \ + '.[][][].values[] | select(.cmode == "driverinit").value' +} + +param_set() +{ + local name=$1 + local value=$2 + + devlink dev param set $DL_HANDLE name $name cmode driverinit value $value +} + +check_value() +{ + local name=$1 + local phase_name=$2 + local expected_param_value=$3 + local expected_debugfs_value=$4 + local value + + value=$(param_get $name) + check_err $? "Failed to get $name param value" + [ "$value" == "$expected_param_value" ] + check_err $? "Unexpected $phase_name $name param value" + value=$(<$DEBUGFS_DIR/$name) + check_err $? "Failed to get $name debugfs value" + [ "$value" == "$expected_debugfs_value" ] + check_err $? "Unexpected $phase_name $name debugfs value" +} + +params_test() +{ + RET=0 + + local max_macs + local test1 + + check_value max_macs initial 32 32 + check_value test1 initial true Y + + param_set max_macs 16 + check_err $? "Failed to set max_macs param value" + param_set test1 false + check_err $? "Failed to set test1 param value" + + check_value max_macs post-set 16 32 + check_value test1 post-set false Y + + devlink dev reload $DL_HANDLE + + check_value max_macs post-reload 16 16 + check_value test1 post-reload false N + + log_test "params test" +} + setup_prepare() { modprobe netdevsim
Signature · 1 line
2.21.0
Re: [patch net-next v3 2/2] selftests: netdevsim: add devlink params tests
Quoted 5 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Test recently added netdevsim devlink param implementation.
Signed-off-by Jiri Pirko <[email protected]>
Thanks!
David Miller
maintainerFrom: Jiri Pirko <[email protected]>
Date: Thu, 15 Aug 2019 15:42:27 +0200
Quoted 4 lines
From: Jiri Pirko <[email protected]>
The first patch is just a helper addition as a dependency of the actual test in patch number two.
Series applied.