mptcp: add ADD_ADDR timeout test case and others
Subsystems (3)
Geliang Tang
v3 cover mptcp: add ADD_ADDR timeout test case and others
v3:
- rename run_add_addr_timeout_tests to run_tests_slow, it can be reused in other test cases.
v2:
- drop add_addr_echo sysctl in v1
- use iptables rules to drop ADD_ADDR echo packets.
Geliang Tang (2):
mptcp: add a new sysctl add_addr_timeout
selftests: mptcp: add ADD_ADDR timeout test case
net/mptcp/ctrl.c | 14 ++++++ net/mptcp/pm_netlink.c | 8 +++- net/mptcp/protocol.h | 1 + .../testing/selftests/net/mptcp/mptcp_join.sh | 43 +++++++++++++++++-- 4 files changed, 61 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
Geliang Tang
PATCH v3 1/2 mptcp: add a new sysctl add_addr_timeout
This patch added a new sysctl, named add_addr_timeout, to control the timeout value (in seconds) of the ADD_ADDR retransmission.
--- net/mptcp/ctrl.c | 14 ++++++++++++++ net/mptcp/pm_netlink.c | 8 ++++++-- net/mptcp/protocol.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)
net/mptcp/ctrl.c +14 -0
@@ -18,6 +18,7 @@ struct mptcp_pernet {struct ctl_table_header *ctl_table_hdr;int mptcp_enabled; +u32 add_addr_timeout; };static struct mptcp_pernet *mptcp_get_pernet (struct net *net)
@@ -30,6 +31,11 @@ int mptcp_is_enabled(struct net *net)return mptcp_get_pernet (net)->mptcp_enabled; } +unsigned long mptcp_get_add_addr_timeout (struct net *net) +{ +return jiffies +mptcp_get_pernet (net)->add_addr_timeout *HZ ; +} +static struct ctl_table mptcp_sysctl_table[] = { { .procname ="enabled" ,
@@ -40,12 +46,19 @@ static struct ctl_table mptcp_sysctl_table[] = {*/ .proc_handler = proc_dointvec, }, + { + .procname = "add_addr_timeout", + .maxlen = sizeof(u32), + .mode = 0644, + .proc_handler = proc_douintvec, + }, {} };static void mptcp_pernet_set_defaults (struct mptcp_pernet *pernet) { pernet->mptcp_enabled =1 ; + pernet->add_addr_timeout =TCP_RTO_MAX /HZ ; }static int mptcp_pernet_new_table (struct net *net,struct mptcp_pernet *pernet)
@@ -61,6 +74,7 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) } table[0 ].data = &pernet->mptcp_enabled; + table[1 ].data = &pernet->add_addr_timeout; hdr =register_net_sysctl (net,MPTCP_SYSCTL_PATH , table);if (!hdr)
net/mptcp/pm_netlink.c +6 -2
@@ -206,6 +206,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer)struct mptcp_pm_add_entry *entry =from_timer (entry, timer, add_timer);struct mptcp_sock *msk = entry->sock;struct sock *sk = (struct sock *)msk; +struct net *net =sock_net (sk); +unsigned long timeout =mptcp_get_add_addr_timeout (net);pr_debug ("msk=%p" , msk);
@@ -232,7 +234,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) }if (entry->retrans_times <ADD_ADDR_RETRANS_MAX ) -sk_reset_timer (sk, timer, jiffies +TCP_RTO_MAX ); +sk_reset_timer (sk, timer, timeout);spin_unlock_bh (&msk->pm.lock);
@@ -264,6 +266,8 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, {struct mptcp_pm_add_entry *add_entry =NULL ;struct sock *sk = (struct sock *)msk; +struct net *net =sock_net (sk); +unsigned long timeout =mptcp_get_add_addr_timeout (net);if (lookup_anno_list_by_saddr (msk, &entry->addr))return false;
@@ -279,7 +283,7 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times =0 ;timer_setup (&add_entry->add_timer, mptcp_pm_add_timer,0 ); -sk_reset_timer (sk, &add_entry->add_timer, jiffies +TCP_RTO_MAX ); +sk_reset_timer (sk, &add_entry->add_timer, timeout);return true; }
net/mptcp/protocol.h +1 -0
@@ -361,6 +361,7 @@ mptcp_subflow_get_mapped_dsn(const struct mptcp_subflow_context *subflow) }int mptcp_is_enabled (struct net *net); +unsigned long mptcp_get_add_addr_timeout (struct net *net);void mptcp_subflow_fully_established (struct mptcp_subflow_context *subflow,struct mptcp_options_received *mp_opt);bool mptcp_subflow_data_available (struct sock *sk);
Signature · 1 line
2.17.1
Geliang Tang
PATCH v3 2/2 selftests: mptcp: add ADD_ADDR timeout test case
In reply to Geliang TangThis patch added the test case for retransmitting ADD_ADDR when timeout occurs. It set NS1's add_addr_timeout to 1 second, and drop NS2's ADD_ADDR echo packets.
And we need to slow down the transfer process of all data to let the ADD_ADDR suboptions can be retransmitted three times.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +40 -3
@@ -82,6 +82,18 @@ reset_with_cookies() done } +reset_with_add_addr_timeout() +{ + reset + + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1 + ip netns exec $ns2 iptables -A OUTPUT -p tcp \ + -m tcp --tcp-option 30 \ + -m bpf --bytecode \ + "$(nfbpf_compile '(tcp[34] & 0xf0) == 0x30')" \ + -j DROP +} + for arg in "$@"; do if [ "$arg" = "-c" ]; then capture=1
@@ -135,6 +147,7 @@ do_transfer() connect_addr="$5" rm_nr_ns1="$6" rm_nr_ns2="$7" + slow="$8" port=$((10000+$TEST_COUNT)) TEST_COUNT=$((TEST_COUNT+1))
@@ -159,7 +172,7 @@ do_transfer() sleep 1 fi - if [[ $rm_nr_ns1 -eq 0 && $rm_nr_ns2 -eq 0 ]]; then + if [ $slow -eq 0 ]; then mptcp_connect="./mptcp_connect -j" else mptcp_connect="./mptcp_connect -r"
@@ -252,7 +265,22 @@ run_tests() connect_addr="$3" lret=0 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} 0 0 + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} 0 0 0 + lret=$? + if [ $lret -ne 0 ]; then + ret=$lret + return + fi +} + +run_tests_slow() +{ + listener_ns="$1" + connector_ns="$2" + connect_addr="$3" + lret=0 + + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} 0 0 1 lret=$? if [ $lret -ne 0 ]; then ret=$lret
@@ -269,7 +297,7 @@ run_remove_tests() rm_nr_ns2="$5" lret=0 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} 1 lret=$? if [ $lret -ne 0 ]; then ret=$lret
@@ -491,6 +519,15 @@ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows and signal" 3 3 3 chk_add_nr 1 1 +# add_addr timeout +reset_with_add_addr_timeout +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +run_tests_slow $ns1 $ns2 10.0.1.1 +chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1 +chk_add_nr 4 0 + # single subflow, remove reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.17.1
Paolo Abeni
[MPTCP] Re: [MPTCP][PATCH v3 mptcp-next 1/2] mptcp: add a new sysctl add_addr_timeout
In reply to Geliang TangQuoted 35 lines · Geliang Tang
This patch added a new sysctl, named
add_addr_timeout, to control the timeout value (in seconds) of theADD_ADDRretransmission.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>--- net/mptcp/ctrl.c | 14 ++++++++++++++ net/mptcp/pm_netlink.c | 8 ++++++-- net/mptcp/protocol.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)net/mptcp/ctrl.c +6
-0@@ -18,6 +18,7 @@ struct mptcp_pernet {struct ctl_table_header *ctl_table_hdr;int mptcp_enabled; +u32 add_addr_timeout; };static struct mptcp_pernet *mptcp_get_pernet (struct net *net)@@ -30,6 +31,11 @@ int mptcp_is_enabled(struct net *net)return mptcp_get_pernet (net)->mptcp_enabled; } +unsigned long mptcp_get_add_addr_timeout (struct net *net) +{ +return jiffies +mptcp_get_pernet (net)->add_addr_timeout *HZ ; +} +static struct ctl_table mptcp_sysctl_table[] = { { .procname ="enabled" ,
net/mptcp/ctrl.c static struct ctl_table mptcp_sysctl_table[] = { · line 53
Quoted 8 lines
net/mptcp/ctrl.c +5
-0@@ -40,12 +46,19 @@ static struct ctl_table mptcp_sysctl_table[] = {*/ .proc_handler = proc_dointvec, }, + { + .procname = "add_addr_timeout", + .maxlen = sizeof(u32), + .mode = 0644, + .proc_handler = proc_douintvec,
If you use proc_dointvec_jiffies() you will not need any additional conversion (*HZ or /HZ ) in the fast-path.
Quoted 26 lines
net/mptcp/ctrl.c +2
-0+ }, {} };static void mptcp_pernet_set_defaults (struct mptcp_pernet *pernet) { pernet->mptcp_enabled =1 ; + pernet->add_addr_timeout =TCP_RTO_MAX /HZ ; } static int mptcp_pernet_new_table(struct net *net, struct
mptcp_pernet*pernet)net/mptcp/ctrl.c +1
-0@@ -61,6 +74,7 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) } table[0 ].data = &pernet->mptcp_enabled; + table[1 ].data = &pernet->add_addr_timeout; hdr =register_net_sysctl (net,MPTCP_SYSCTL_PATH , table);net/mptcp/ctrl.c +0
-0if (!hdr)net/mptcp/pm_netlink.c +0
-0
net/mptcp/pm_netlink.c static void mptcp_pm_add_timer(struct timer_list · line 212
Quoted 7 lines
net/mptcp/pm_netlink.c +2
-0@@ -206,6 +206,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer)struct mptcp_pm_add_entry *entry =from_timer (entry, timer, add_timer);struct mptcp_sock *msk = entry->sock;struct sock *sk = (struct sock *)msk; +struct net *net =sock_net (sk); +unsigned long timeout =mptcp_get_add_addr_timeout (net);
Small nit: this breaks the reverse x-mas tree order, please move the initialization (or you can simply get rid of the local variable)
There is a similar issue below in mptcp_pm_alloc_anno_list()
/P
Paolo Abeni
[MPTCP] Re: [MPTCP][PATCH v3 mptcp-next 2/2] selftests: mptcp: add ADD_ADDR timeout test case
In reply to Geliang TangQuoted 24 lines · Geliang Tang
This patch added the test case for retransmitting
ADD_ADDRwhen timeout
occurs. It set NS1'sadd_addr_timeoutto 1 second, and drop NS2'sADD_ADDR
echo packets.And we need to slow down the transfer process of all data to let the
ADD_ADDRsuboptions can be retransmitted three times.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>--- .../testing/selftests/net/mptcp/mptcp_join.sh | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)tools/testing/selftests/net/mptcp/mptcp_join.sh +0
-0@@ -82,6 +82,18 @@ reset_with_cookies() done }
tools/testing/selftests/net/mptcp/mptcp_join.sh reset_with_cookies() · line 94
Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +10
-0+reset_with_add_addr_timeout() +{ + reset + + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1 + ip netns exec $ns2 iptables -A OUTPUT -p tcp \ + -m tcp --tcp-option 30 \ + -m bpf --bytecode \ + "$(nfbpf_compile '(tcp[34] & 0xf0) == 0x30')" \ + -j DROP
Beware: you also need to update the 'config' file with the required minimal dependencies.
perhpas it would be even nicer/with less deps using directly nft. @Florian is there a simpler nft equivalent test for the above?
Quoted 76 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +4
-2+} + for arg in "$@"; do if [ "$arg" = "-c" ]; then capture=1@@ -135,6 +147,7 @@ do_transfer() connect_addr="$5" rm_nr_ns1="$6" rm_nr_ns2="$7" + slow="$8" port=$((10000+$TEST_COUNT)) TEST_COUNT=$((TEST_COUNT+1))@@ -159,7 +172,7 @@ do_transfer() sleep 1 fi - if [[ $rm_nr_ns1 -eq 0 && $rm_nr_ns2 -eq 0 ]]; then + if [ $slow -eq 0 ]; then mptcp_connect="./mptcp_connect -j" else mptcp_connect="./mptcp_connect -r"@@ -252,7 +265,22 @@ run_tests() connect_addr="$3" lret=0 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP${connect_addr} 0 0
tools/testing/selftests/net/mptcp/mptcp_join.sh +1
-0+ do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP${connect_addr} 0 0 0
tools/testing/selftests/net/mptcp/mptcp_join.sh +15
-0+ lret=$? + if [ $lret -ne 0 ]; then + ret=$lret + return + fi +} + +run_tests_slow() +{ + listener_ns="$1" + connector_ns="$2" + connect_addr="$3" + lret=0 + + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP${connect_addr} 0 0 1
tools/testing/selftests/net/mptcp/mptcp_join.sh +1
-1lret=$? if [ $lret -ne 0 ]; then ret=$lret@@ -269,7 +297,7 @@ run_remove_tests() rm_nr_ns2="$5" lret=0 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} 1
tools/testing/selftests/net/mptcp/mptcp_join.sh +9
-0lret=$? if [ $lret -ne 0 ]; then ret=$lret@@ -491,6 +519,15 @@ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows and signal" 3 3 3 chk_add_nr 1 1 +# add_addr timeout +reset_with_add_addr_timeout +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +run_tests_slow $ns1 $ns2 10.0.1.1 +chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1 +chk_add_nr 4 0 + # single subflow, remove reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1