test_net.sh: add tst_set_sysctl()
PATCH 1/2 test_net.sh: add tst_set_sysctl()
It can handle the case when sysctl is not namespaceified.
--- testcases/lib/test_net.sh | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-)
testcases/lib/test_net.sh +21 -0
@@ -390,6 +390,27 @@ tst_ping() return $ret } +# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe="" + + local add_opt= + [ "$TST_USE_NETNS" = "yes" ] && add_opt="-e" + + if [ "$safe" ]; then + ROD sysctl -qw $name=$value + else + sysctl -qw $name=$value + fi + + tst_rhost_run $safe -c "sysctl -qw $add_opt $name=$value" +} + # Management Link [ -z "$RHOST" ] && TST_USE_NETNS="yes" export RHOST="$RHOST"
Signature · 1 line
1.7.1
PATCH 2/2 net: dctcp01: apply tst_set_sysctl()
--- testcases/network/dctcp/dctcp01.sh | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
testcases/network/dctcp/dctcp01.sh +3 -6
@@ -29,16 +29,13 @@ set_cong_alg() local alg=$1 tst_resm TINFO "setting $alg" - ROD sysctl -q -w net.ipv4.tcp_congestion_control=$alg - tst_rhost_run -s -c "sysctl -q -w net.ipv4.tcp_congestion_control=$alg" + tst_set_sysctl net.ipv4.tcp_congestion_control $alg safe } cleanup() { if [ "$prev_cong_ctl" ]; then - sysctl -q -w net.ipv4.tcp_congestion_control=$prev_alg - tst_rhost_run -c \ - "sysctl -q -w net.ipv4.tcp_congestion_control=$prev_alg" + tst_set_sysctl net.ipv4.tcp_congestion_control $prev_alg fi tst_rmdir tc qdisc del dev $(tst_iface) root netem loss 0.03% ecn
@@ -61,7 +58,7 @@ setup() tst_tmpdir - prev_alg="$(cat /proc/sys/net/ipv4/tcp_congestion_control)" + prev_alg="$(sysctl -n net.ipv4.tcp_congestion_control)" } test_run()
Signature · 1 line
1.7.1
PATCH 1/2 test_net.sh: add tst_set_sysctl()
In reply to Alexey KodanevHi!
testcases/lib/test_net.sh tst_ping() · line 400
Quoted 8 lines
testcases/lib/test_net.sh +8
-0+# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe=""
Uh, this syntax is confusing, besides isn't safe set to empty string anyway?
testcases/lib/test_net.sh tst_ping() · line 412
Quoted 11 lines
testcases/lib/test_net.sh +11
-0+ local add_opt= + [ "$TST_USE_NETNS" = "yes" ] && add_opt="-e" + + if [ "$safe" ]; then + ROD sysctl -qw $name=$value + else + sysctl -qw $name=$value + fi + + tst_rhost_run $safe -c "sysctl -qw $add_opt $name=$value" +}
And maybe the function name should say that we are changing the parameter both on local and remote machine. Maybe just rename the function to tst_set_sysctls().
Quoted 9 lines
# Management Link
[ -z "$RHOST" ] && TST_USE_NETNS="yes"
export RHOST="$RHOST"Signature · 5 lines
1.7.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/2 test_net.sh: add tst_set_sysctl()
Hi,
Quoted 11 lines · Cyril Hrubis
Hi!
Review
Quoted 8 lines
(quoted diff) +8
-0+# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe=""Uh, this syntax is confusing, besides isn't safe set to empty string anyway?
What if we set TST_NO_CLEANUP just before calling cleanup() or unset TST_CLEANUP... then we can use ROD, etc. in cleanup?
testcases/lib/tst_test.sh +1 -0
@@ -35,6 +35,7 @@ tst_do_exit() if [ -n "$TST_SETUP_STARTED" -a -n "$TST_CLEANUP" -a \ -z "$TST_NO_CLEANUP" ]; then + export TST_NO_CLEANUP="yes" $TST_CLEANUP fi
Quoted 15 lines
Review
Quoted 12 lines
(quoted diff) +11
-0+ local add_opt= + [ "$TST_USE_NETNS" = "yes" ] && add_opt="-e" + + if [ "$safe" ]; then + ROD sysctl -qw $name=$value + else + sysctl -qw $name=$value + fi + + tst_rhost_run $safe -c "sysctl -qw $add_opt $name=$value" +}And maybe the function name should say that we are changing the parameter both on local and remote machine. Maybe just rename the function to
tst_set_sysctls().
OK
Thanks,
Alexey
PATCH 1/2 test_net.sh: add tst_set_sysctl()
Hi!
Quoted 11 lines
Quoted 10 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe=""Uh, this syntax is confusing, besides isn't safe set to empty string anyway?
Quoted 2 lines
What if we set
TST_NO_CLEANUPjust before callingcleanup()or unsetTST_CLEANUP... then we can use ROD, etc. in cleanup?
You lost me here. How is this connected to the code I've commented?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/2 test_net.sh: add tst_set_sysctl()
Quoted 11 lines · Cyril Hrubis
Hi!
Quoted 10 lines
Quoted 10 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe=""Uh, this syntax is confusing, besides isn't safe set to empty string anyway?
Quoted 3 lines
Quoted 2 lines
What if we set
TST_NO_CLEANUPjust before callingcleanup()or unsetTST_CLEANUP... then we can use ROD, etc. in cleanup?You lost me here. How is this connected to the code I've commented?
In the 2nd patch, 'safe' option is used like this:
do_cleanup()
{
tst_set_sysctl net.ipv4.tcp_cong...
}do_test()
{
tst_set_sysctl net.ipv4.tcp_cong... safe
}
So, the main reason for splitting the code with 'safe' option is to be able to call this function inside cleanup. But if we handle cleanup recursion inside the shell library, we can get rid of 'safe' option and simplify tst_set_sysctls().
Thanks,
Alexey
PATCH 1/2 test_net.sh: add tst_set_sysctl()
Hi!
Quoted 26 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+# tst_set_sysctl NAME VALUE [safe] +# It can handle netns case when sysctl not namespaceified. +tst_set_sysctl() +{ + local name="$1" + local value="$2" + local safe= + [ "$3" = "safe" ] && safe="-s" || safe=""Uh, this syntax is confusing, besides isn't safe set to empty string anyway?
Quoted 3 lines
Quoted 2 lines
What if we set
TST_NO_CLEANUPjust before callingcleanup()or unsetTST_CLEANUP... then we can use ROD, etc. in cleanup?You lost me here. How is this connected to the code I've commented?
In the 2nd patch, 'safe' option is used like this:
do_cleanup(){ tst_set_sysctl net.ipv4.tcp_cong... }
do_test()
{
tst_set_sysctlnet.ipv4.tcp_cong... safe
}
Quoted 4 lines
So, the main reason for splitting the code with 'safe' option is to be able to call this function inside cleanup. But if we handle cleanup recursion inside the shell library, we can get rid of 'safe' option and simplify
tst_set_sysctls().
Ah, I wasn't clear enough. I only meant that setting safe to empty string, i.e. || safe="" does not seem to have any effect at all, since it's empty anyway, or isn't it?
Also we may be able to handle recursion in the shell library, but the main reason I avoided doing that is to keep the C library and shell library consistent. And the C library cannot be fixed until we get rid of last testcase using the old library (tst_res.c). Or at least I did not figured out how to do that. But maybe converting all oldlib testcases that use pthreads and getting rid of locking in tst_res.c would suffice...
Signature · 2 lines
Cyril Hrubis [email protected]