mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
selftests: mptcp: drop sflags parameter
run_tests() accepts too many optional parameters. Before this modification,
it was required to set all of then when only the last one had to be
changed. That's not clear to see all these 0 and it makes the maintenance
harder:
run_tests $ns1 $ns2 10.0.1.1 1 2 3 slow
Instead, the parameter can be set as an env var with a limited scope:
foo=1 bar=2 next=3 \
run_tests $ns1 $ns2 10.0.1.1 slow
This patch switches to key/value "sflags=*" instead of positional parameter
sflags of do_transfer() and run_tests().
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230623-send-net-next-20230623-v1-6-a883213c8ba9@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Geliang Tang
Jakub Kicinski
parent
595ef566a2
commit
1534f87ee0
1 changed files with 22 additions and 17 deletions
|
|
@ -53,6 +53,7 @@ export FAILING_LINKS=""
|
|||
export test_linkfail=0
|
||||
export addr_nr_ns1=0
|
||||
export addr_nr_ns2=0
|
||||
export sflags=""
|
||||
|
||||
# generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) == 0x30) ||
|
||||
# (ip6 && (ip6[74] & 0xf0) == 0x30)'"
|
||||
|
|
@ -829,7 +830,6 @@ do_transfer()
|
|||
local srv_proto="$4"
|
||||
local connect_addr="$5"
|
||||
local speed="$6"
|
||||
local sflags="${7}"
|
||||
|
||||
local port=$((10000 + TEST_COUNT - 1))
|
||||
local cappid
|
||||
|
|
@ -1147,7 +1147,6 @@ run_tests()
|
|||
local connector_ns="$2"
|
||||
local connect_addr="$3"
|
||||
local speed="${4:-fast}"
|
||||
local sflags="${5:-""}"
|
||||
|
||||
local size
|
||||
|
||||
|
|
@ -1191,8 +1190,7 @@ run_tests()
|
|||
make_file "$sinfail" "server" $size
|
||||
fi
|
||||
|
||||
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \
|
||||
${speed} ${sflags}
|
||||
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${speed}
|
||||
}
|
||||
|
||||
dump_stats()
|
||||
|
|
@ -2687,7 +2685,8 @@ backup_tests()
|
|||
pm_nl_set_limits $ns1 0 1
|
||||
pm_nl_set_limits $ns2 0 1
|
||||
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow nobackup
|
||||
sflags=nobackup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 1 1 1
|
||||
chk_prio_nr 0 1
|
||||
fi
|
||||
|
|
@ -2698,7 +2697,8 @@ backup_tests()
|
|||
pm_nl_set_limits $ns1 0 1
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
|
||||
pm_nl_set_limits $ns2 1 1
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow backup
|
||||
sflags=backup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 1 1 1
|
||||
chk_add_nr 1 1
|
||||
chk_prio_nr 1 1
|
||||
|
|
@ -2710,7 +2710,8 @@ backup_tests()
|
|||
pm_nl_set_limits $ns1 0 1
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
|
||||
pm_nl_set_limits $ns2 1 1
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow backup
|
||||
sflags=backup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 1 1 1
|
||||
chk_add_nr 1 1
|
||||
chk_prio_nr 1 1
|
||||
|
|
@ -2736,7 +2737,8 @@ backup_tests()
|
|||
if reset "mpc switch to backup" &&
|
||||
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
|
||||
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow backup
|
||||
sflags=backup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 0 0 0
|
||||
chk_prio_nr 0 1
|
||||
fi
|
||||
|
|
@ -2745,7 +2747,8 @@ backup_tests()
|
|||
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
|
||||
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow
|
||||
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow backup
|
||||
sflags=backup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 0 0 0
|
||||
chk_prio_nr 1 1
|
||||
fi
|
||||
|
|
@ -3120,8 +3123,8 @@ fullmesh_tests()
|
|||
pm_nl_set_limits $ns1 4 4
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
|
||||
pm_nl_set_limits $ns2 4 4
|
||||
addr_nr_ns2=1 \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow fullmesh
|
||||
addr_nr_ns2=1 sflags=fullmesh \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 2 2 2
|
||||
chk_rm_nr 0 1
|
||||
fi
|
||||
|
|
@ -3132,8 +3135,8 @@ fullmesh_tests()
|
|||
pm_nl_set_limits $ns1 4 4
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
|
||||
pm_nl_set_limits $ns2 4 4
|
||||
addr_nr_ns2=fullmesh_1 \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow nofullmesh
|
||||
addr_nr_ns2=fullmesh_1 sflags=nofullmesh \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 2 2 2
|
||||
chk_rm_nr 0 1
|
||||
fi
|
||||
|
|
@ -3144,8 +3147,8 @@ fullmesh_tests()
|
|||
pm_nl_set_limits $ns1 4 4
|
||||
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
|
||||
pm_nl_set_limits $ns2 4 4
|
||||
addr_nr_ns2=1 run_tests \
|
||||
$ns1 $ns2 10.0.1.1 slow backup,fullmesh
|
||||
addr_nr_ns2=1 sflags=backup,fullmesh \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 2 2 2
|
||||
chk_prio_nr 0 1
|
||||
chk_rm_nr 0 1
|
||||
|
|
@ -3157,7 +3160,8 @@ fullmesh_tests()
|
|||
pm_nl_set_limits $ns1 4 4
|
||||
pm_nl_set_limits $ns2 4 4
|
||||
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow nobackup,nofullmesh
|
||||
sflags=nobackup,nofullmesh \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 2 2 2
|
||||
chk_prio_nr 0 1
|
||||
chk_rm_nr 0 1
|
||||
|
|
@ -3332,7 +3336,8 @@ userspace_tests()
|
|||
pm_nl_set_limits $ns1 1 1
|
||||
pm_nl_set_limits $ns2 1 1
|
||||
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow backup
|
||||
sflags=backup \
|
||||
run_tests $ns1 $ns2 10.0.1.1 slow
|
||||
chk_join_nr 1 1 0
|
||||
chk_prio_nr 0 0
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue