mptcp: improve subflow creation on errors
Subsystems (3)
Paolo Abeni
maintainercover mptcp: improve subflow creation on errors
Currently when a subflow connection fails - either the TCP connection is reset by the peer, or the MPJ handshake never completes - the in kernel PM don't perform any further action. Notably no additional subflow creation is attempted.
This series is aimed at improving the in-kernel path manager behavior in the above scenario: on failure we try to move to the next subflow, if any.
The first patch is minor cleanup, the feature is implemented by patch 2/3. The last patch adds a specific self-tests.
This should possibly address/close:
https://github.com/multipath-tcp/mptcp_net-next/issues/235
https://github.com/multipath-tcp/mptcp_net-next/issues/242
@Phil: could you please have a spin in your testbed and see if this is enough to fit you?
Paolo Abeni (3):
mptcp: clean-up MPJ option writing.
mptcp: do not block subflows creation on errors
selftests: mptcp: add tests for subflow creation failure
net/mptcp/options.c | 63 ++++++++++++------- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 12 +++- .../testing/selftests/net/mptcp/mptcp_join.sh | 10 +++ 4 files changed, 61 insertions(+), 25 deletions(-)
Signature · 1 line
2.33.1
Paolo Abeni
maintainerPATCH 1/3 mptcp: clean-up MPJ option writing.
Check for all MPJ variant at once, this reduces the number of conditionals traversed on average and will simplify the next patch.
No functional change intended.
--- net/mptcp/options.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
net/mptcp/options.c +23 -21
@@ -1381,27 +1381,29 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,/* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; - }else if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_SYN , - opts->backup, opts->join_id); -put_unaligned_be32 (opts->token, ptr); - ptr +=1 ; -put_unaligned_be32 (opts->nonce, ptr); - ptr +=1 ; - }else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_SYNACK , - opts->backup, opts->join_id); -put_unaligned_be64 (opts->thmac, ptr); - ptr +=2 ; -put_unaligned_be32 (opts->nonce, ptr); - ptr +=1 ; - }else if (OPTION_MPTCP_MPJ_ACK & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_ACK ,0 ,0 ); -memcpy (ptr, opts->hmac,MPTCPOPT_HMAC_LEN ); - ptr +=5 ; + }else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_SYN , + opts->backup, opts->join_id); +put_unaligned_be32 (opts->token, ptr); + ptr +=1 ; +put_unaligned_be32 (opts->nonce, ptr); + ptr +=1 ; + }else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_SYNACK , + opts->backup, opts->join_id); +put_unaligned_be64 (opts->thmac, ptr); + ptr +=2 ; +put_unaligned_be32 (opts->nonce, ptr); + ptr +=1 ; + }else { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_ACK ,0 ,0 ); +memcpy (ptr, opts->hmac,MPTCPOPT_HMAC_LEN ); + ptr +=5 ; + } }else if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {u8 len =TCPOLEN_MPTCP_ADD_ADDR_BASE ;u8 echo =MPTCP_ADDR_ECHO ;
Signature · 1 line
2.33.1
Re: [PATCH mptcp-next 1/3] mptcp: clean-up MPJ option writing.
Hi Paolo,
Quoted 7 lines · Paolo Abeni
Check for all MPJ variant at once, this reduces the number of conditionals traversed on average and will simplify the next patch.
No functional change intended.
Signed-off-by Paolo Abeni <[email protected]>
Good idea!
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Paolo Abeni
maintainerPATCH 2/3 mptcp: do not block subflows creation on errors
In reply to Paolo AbeniIf the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
Let's trigger subflow creation on both the above event. Note that we don't need an additional timer to catch timeout and/or long delay in connection completion: we just need to measure the time elapsed since the subflow creation every time we emit an MPJ sub-option.
--- net/mptcp/options.c | 19 ++++++++++++++++--- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 12 +++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-)
net/mptcp/options.c +16 -3
@@ -1257,10 +1257,10 @@ static u16 mptcp_make_csum(const struct mptcp_ext *mpext)void mptcp_write_options (__be32 *ptr,const struct tcp_sock *tp,struct mptcp_out_options *opts) { -if (unlikely (OPTION_MPTCP_FAIL & opts->suboptions)) { -const struct sock *ssk = (const struct sock *)tp; -struct mptcp_subflow_context *subflow; +const struct sock *ssk = (const struct sock *)tp; +struct mptcp_subflow_context *subflow; +if (unlikely (OPTION_MPTCP_FAIL & opts->suboptions)) { subflow =mptcp_subflow_ctx (ssk); subflow->send_mp_fail =0 ;
@@ -1382,6 +1382,19 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,/* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; }else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { +if (ssk) { + subflow =mptcp_subflow_ctx (ssk); +if (subflow->start_stamp && +unlikely (after (tcp_jiffies32, subflow->start_stamp +HZ /10 ))) { +/* we are not established yet and "a lot" of time passed +* e.g. due to syn retranmissions. We can attempt next +* subflow creation +*/ +mptcp_pm_subflow_established (mptcp_sk (subflow->conn)); + subflow->start_stamp =0 ; + } + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,
net/mptcp/protocol.h +1 -0
@@ -432,6 +432,7 @@ struct mptcp_subflow_context { stale :1 ;/* unable to snd/rcv data, do not use for xmit */ enum mptcp_data_avail data_avail;u32 remote_nonce; +u32 start_stamp;u64 thmac;u32 local_nonce;u32 remote_token;
net/mptcp/subflow.c +11 -1
@@ -1273,7 +1273,16 @@ void __mptcp_error_report(struct sock *sk)static void subflow_error_report (struct sock *ssk) { -struct sock *sk =mptcp_subflow_ctx (ssk)->conn; +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); +struct sock *sk = subflow->conn; + +/* subflow aborted before reaching the fully_established status +* attempt the creation of the next subflow +*/ +if (unlikely (!subflow->fully_established && subflow->start_stamp)) { +mptcp_pm_subflow_established (mptcp_sk (sk)); + subflow->start_stamp =0 ; + }mptcp_data_lock (sk);if (!sock_owned_by_user (sk))
@@ -1444,6 +1453,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->remote_id = remote_id; subflow->request_join =1 ; subflow->request_bkup = !!(flags &MPTCP_PM_ADDR_FLAG_BACKUP ); + subflow->start_stamp = tcp_jiffies32;mptcp_info2sockaddr (remote, &addr, ssk->sk_family);mptcp_add_pending_subflow (msk, subflow);
Signature · 1 line
2.33.1
Re: [PATCH mptcp-next 2/3] mptcp: do not block subflows creation on errors
Hi Paolo,
Quoted 5 lines · Paolo Abeni
If the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
Thank you for looking at that!
Why the PM could not try to establish all possible paths "in parallel"? Is it because we have this limit of allowed subflows and we wait to know if a path is established to count it as used subflow? But if here we mark a path as established if it has an issue, does it still make sense? I probably missed something here :)
Quoted 5 lines
Let's trigger subflow creation on both the above event. Note that we don't need an additional timer to catch timeout and/or long delay in connection completion: we just need to measure the time elapsed since the subflow creation every time we emit an MPJ sub-option.
Just to be sure: can we do that because we always expect a retransmission?
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1388
Quoted 8 lines
net/mptcp/options.c +4
-0@@ -1382,6 +1382,19 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,/* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; }else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { +if (ssk) { + subflow =mptcp_subflow_ctx (ssk); +if (subflow->start_stamp && +unlikely (after (tcp_jiffies32, subflow->start_stamp +HZ /10 ))) {
Small detail: checkpatch asks to have space around "/". I can add them when applying the patch if only this needs to be modified.
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1391
Quoted 3 lines
net/mptcp/options.c +3
-0+/* we are not established yet and "a lot" of time passed +* e.g. due to syn retranmissions. We can attempt next +* subflow creation
That's strange to tell the PM "yes, the subflow is established now" while there is potentially (or clearly in case of error (RST) below) an issue :)
Should we eventually have another function name doing the same and resetting the stamp variable?
Quoted 17 lines
net/mptcp/options.c +6
-0+*/ +mptcp_pm_subflow_established (mptcp_sk (subflow->conn)); + subflow->start_stamp =0 ; + } + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,net/mptcp/subflow.c +0
-0@@ -1273,7 +1273,16 @@ void __mptcp_error_report(struct sock *sk)static void subflow_error_report (struct sock *ssk) {
net/mptcp/subflow.c void __mptcp_error_report(struct sock *sk) · line 1284
Quoted 10 lines
net/mptcp/subflow.c +9
-1-struct sock *sk =mptcp_subflow_ctx (ssk)->conn; +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); +struct sock *sk = subflow->conn; + +/* subflow aborted before reaching the fully_established status +* attempt the creation of the next subflow +*/ +if (unlikely (!subflow->fully_established && subflow->start_stamp)) { +mptcp_pm_subflow_established (mptcp_sk (sk)); + subflow->start_stamp =0 ;
Detail: do you need to set it to 0 here?
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Paolo Abeni
maintainerRe: [PATCH mptcp-next 2/3] mptcp: do not block subflows creation on errors
Quoted 9 lines · Matthieu Baerts
Hi Paolo,
Quoted 5 lines · Paolo Abeni
If the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
Quoted 5 lines
Thank you for looking at that!
Why the PM could not try to establish all possible paths "in parallel"? Is it because we have this limit of allowed subflows and we wait to know if a path is established to count it as used subflow?
IIRC, that design choice is to avoid that an MPTCP endpoint could easily become a DDoS bot, generating "a lot" of syn in response to action from possibly untrusted peer.
Quoted 3 lines
But if here we
mark a path as established if it has an issue, does it still make sense? I probably missed something here :)
With this patch we don't mark the path as astablished, we try to pick the next one.
Quoted 27 lines
Quoted 5 lines
Let's trigger subflow creation on both the above event. Note that we don't need an additional timer to catch timeout and/or long delay in connection completion: we just need to measure the time elapsed since the subflow creation every time we emit an MPJ sub-option.
Just to be sure: can we do that because we always expect a retransmission?
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1388
Quoted 8 lines
net/mptcp/options.c +4
-0@@ -1382,6 +1382,19 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,/* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; }else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { +if (ssk) { + subflow =mptcp_subflow_ctx (ssk); +if (subflow->start_stamp && +unlikely (after (tcp_jiffies32, subflow->start_stamp +HZ /10 ))) {Small detail: checkpatch asks to have space around "/". I can add them when applying the patch if only this needs to be modified.
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1391
Quoted 3 lines
net/mptcp/options.c +3
-0+/* we are not established yet and "a lot" of time passed +* e.g. due to syn retranmissions. We can attempt next +* subflow creation That's strange to tell the PM "yes, the subflow is established now" while there is potentially (or clearly in case of error (RST) below) an issue :)
Quoted 2 lines
Should we eventually have another function name doing the same and resetting the stamp variable?
Yes, in v2 I'll add another pm helper for that.
Side note: do we still need the pm -> pm_netlink additional layering? That was initially introduced to allow multiple in-kernel PM, but afaics we are now considering a single in kernel one and e.v. an user- space one. Perhpas we can remove some intermediate abstraction?
(not in this series!)
Quoted 15 lines
Quoted 15 lines
net/mptcp/options.c +6
-0+*/ +mptcp_pm_subflow_established (mptcp_sk (subflow->conn)); + subflow->start_stamp =0 ; + } + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,net/mptcp/subflow.c +0
-0@@ -1273,7 +1273,16 @@ void __mptcp_error_report(struct sock *sk)
Quoted 14 lines
net/mptcp/subflow.c void __mptcp_error_report(struct sock *sk) · line 1284
Quoted 12 lines
net/mptcp/subflow.c +9
-1static void subflow_error_report (struct sock *ssk) { -struct sock *sk =mptcp_subflow_ctx (ssk)->conn; +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); +struct sock *sk = subflow->conn; + +/* subflow aborted before reaching the fully_established status +* attempt the creation of the next subflow +*/ +if (unlikely (!subflow->fully_established && subflow->start_stamp)) { +mptcp_pm_subflow_established (mptcp_sk (sk)); + subflow->start_stamp =0 ;Detail: do you need to set it to 0 here?
So we call mptcp_pm_subflow_established() at most once due to subflow timeout or reset. I feared a malicius peer could trigger a lot of activity with a e.g. a burst of icmp unreachable.
Thanks!
Paolo
Re: [PATCH mptcp-next 2/3] mptcp: do not block subflows creation on errors
Quoted 12 lines · Paolo Abeni
Quoted 11 lines · Matthieu Baerts
Hi Paolo,
Quoted 5 lines · Paolo Abeni
If the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
Thank you for looking at that!
Quoted 7 lines
Quoted 3 lines
Why the PM could not try to establish all possible paths "in parallel"? Is it because we have this limit of allowed subflows and we wait to know if a path is established to count it as used subflow?
IIRC, that design choice is to avoid that an MPTCP endpoint could easily become a DDoS bot, generating "a lot" of syn in response to action from possibly untrusted peer.
The endpoint will only be able to produce a very few SYN+MPJ depending on the limit that is in place.
Should we maybe do a distinction between local addresses and remote ones? I mean when the MPTCP connection is established, the PM could open all paths using different local addresses and then the remote ones one at a time?
Quoted 8 lines
Quoted 8 lines
net/mptcp/options.c void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, · line 1391
Quoted 3 lines
net/mptcp/options.c +3
-0+/* we are not established yet and "a lot" of time passed +* e.g. due to syn retranmissions. We can attempt next +* subflow creation That's strange to tell the PM "yes, the subflow is established now" while there is potentially (or clearly in case of error (RST) below) an issue :)
Quoted 4 lines
Quoted 2 lines
Should we eventually have another function name doing the same and resetting the stamp variable?
Yes, in v2 I'll add another pm helper for that.
Thank you!
Quoted 4 lines
Side note: do we still need the pm ->
pm_netlinkadditional layering? That was initially introduced to allow multiple in-kernel PM, but afaics we are now considering a single in kernel one and e.v. an user- space one. Perhpas we can remove some intermediate abstraction?
I think we should keep it. It still makes sense to have a PM controlled with eBPF for servers having to support a lot of connections and always doing the same action. Maybe the in-kernel PM can already cover all use cases for a server, mainly announcing addresses. Or maybe more might be needed, e.g. announcing an IP or another depending on the initial one, etc. and in this case, a controlled with eBPF would be interesting (but could be done as an extension of the in-kernel PM one?)
Quoted 1 line
(not in this series!)
Of course!
Quoted 30 lines
Quoted 15 lines
Quoted 15 lines
net/mptcp/options.c +6
-0+*/ +mptcp_pm_subflow_established (mptcp_sk (subflow->conn)); + subflow->start_stamp =0 ; + } + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,net/mptcp/subflow.c +0
-0@@ -1273,7 +1273,16 @@ void __mptcp_error_report(struct sock *sk)Quoted 14 lines
net/mptcp/subflow.c void __mptcp_error_report(struct sock *sk) · line 1284
Quoted 12 lines
net/mptcp/subflow.c +9
-1static void subflow_error_report (struct sock *ssk) { -struct sock *sk =mptcp_subflow_ctx (ssk)->conn; +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); +struct sock *sk = subflow->conn; + +/* subflow aborted before reaching the fully_established status +* attempt the creation of the next subflow +*/ +if (unlikely (!subflow->fully_established && subflow->start_stamp)) { +mptcp_pm_subflow_established (mptcp_sk (sk)); + subflow->start_stamp =0 ;Detail: do you need to set it to 0 here?
Quoted 3 lines
So we call
mptcp_pm_subflow_established()at most once due to subflow timeout or reset. I feared a malicius peer could trigger a lot of activity with a e.g. a burst of icmp unreachable.
Good point, thank you for your reply. I thought subflow_error_report() would be called only once per ssk but then yes, safer to add this check.
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Paolo Abeni
maintainerRe: [PATCH mptcp-next 2/3] mptcp: do not block subflows creation on errors
Quoted 21 lines · Matthieu Baerts
Quoted 12 lines · Paolo Abeni
Quoted 11 lines · Matthieu Baerts
Hi Paolo,
Quoted 5 lines · Paolo Abeni
If the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
Thank you for looking at that!
Quoted 7 lines
Quoted 3 lines
Why the PM could not try to establish all possible paths "in parallel"? Is it because we have this limit of allowed subflows and we wait to know if a path is established to count it as used subflow?
IIRC, that design choice is to avoid that an MPTCP endpoint could easily become a DDoS bot, generating "a lot" of syn in response to action from possibly untrusted peer.
Quoted 8 lines
The endpoint will only be able to produce a very few SYN+MPJ depending on the limit that is in place.
Should we maybe do a distinction between local addresses and remote ones? I mean when the MPTCP connection is established, the PM could open all paths using different local addresses and then the remote ones one at a time?
Quoted 1 line
Quoted 1 line
I *think* that kind of change will be more invasive - we would have to revisit the non trivial mptcp_pm_create_subflow_or_signal_addr() and AFAICS we would still need to cope with subflow creation failure.
All the above IMHO !
Cheers,
Paolo
Paolo Abeni
maintainerPATCH 3/3 selftests: mptcp: add tests for subflow creation failure
In reply to Paolo AbeniVerify that, when multiple endpoints are available, subflows creation proceed even when the first additional subflow creation fails - due to packet drop on the relevant link
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +10 -0
@@ -1023,6 +1023,16 @@ subflows_tests() run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows, limited by server" 2 2 1 + # multiple subflows, with subflow creation error + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT + run_tests $ns1 $ns2 10.0.1.1 + chk_join_nr "multiple subflows, with failing subflow" 1 1 1 + # single subflow, dev reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.33.1
Re: [PATCH mptcp-next 3/3] selftests: mptcp: add tests for subflow creation failure
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Verify that, when multiple endpoints are available, subflows creation proceed even when the first additional subflow creation fails - due to packet drop on the relevant link
Here you don't drop the packet but you reset it. Should we have a test for both (REJECT/DROP) (or with an additional subflow where packets are dropped)?
Quoted 5 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +0
-0
tools/testing/selftests/net/mptcp/mptcp_join.sh subflows_tests() · line 1032
Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +7
-0@@ -1023,6 +1023,16 @@ subflows_tests() run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows, limited by server" 2 2 1 + # multiple subflows, with subflow creation error + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
I guess we should then add "CONFIG_IP_NF_TARGET_REJECT" in the config file :)
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Paolo Abeni
maintainerRe: [PATCH mptcp-next 3/3] selftests: mptcp: add tests for subflow creation failure
Quoted 10 lines · Matthieu Baerts
Hi Paolo,
Quoted 3 lines · Paolo Abeni
Verify that, when multiple endpoints are available, subflows creation proceed even when the first additional subflow creation fails - due to packet drop on the relevant link
Here you don't drop the packet but you reset it. Should we have a test for both (REJECT/DROP) (or with an additional subflow where packets are dropped)?
I'll try to see if a drop test case will fit our infra.
Quoted 8 lines
Quoted 8 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +0
-0@@ -1023,6 +1023,16 @@ subflows_tests() run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows, limited by server" 2 2 1
Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh subflows_tests() · line 1032
Quoted 7 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +7
-0+ # multiple subflows, with subflow creation error + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECTI guess we should then add "
CONFIG_IP_NF_TARGET_REJECT" in the config file :)
Will add in v2.
Thanks!
Paolo
Paolo Abeni
maintainerQuoted 9 lines · Paolo Abeni
Currently when a subflow connection fails - either the TCP connection is reset by the peer, or the MPJ handshake never completes - the in kernel PM don't perform any further action. Notably no additional subflow creation is attempted.
This series is aimed at improving the in-kernel path manager behavior in the above scenario: on failure we try to move to the next subflow, if any.
Quoted 6 lines
The first patch is minor cleanup, the feature is implemented by patch 2/3. The last patch adds a specific self-tests.
This should possibly address/close:
https://github.com/multipath-tcp/mptcp_net-next/issues/235
https://github.com/multipath-tcp/mptcp_net-next/issues/242
Uhm... I actually missed a few points from issues/242. This does not address the latter, yet.
Cheers,
Paolo