MP_FAIL support
Subsystems (2)
cover MP_FAIL support
apply: export/20210504T064955 +
"data checksum support" +
"data checksum support cleanups" +
"add MP_CAPABLE 'C' flag"
Geliang Tang (3):
mptcp: MP_FAIL suboption sending
mptcp: MP_FAIL suboption receiving
mptcp: send out MP_FAIL when data checksum fail
include/net/mptcp.h | 1 + net/mptcp/options.c | 62 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/pm.c | 17 ++++++++++++ net/mptcp/protocol.h | 7 +++++ net/mptcp/subflow.c | 2 ++ 5 files changed, 88 insertions(+), 1 deletion(-)
Signature · 1 line
2.31.1
PATCH 1/3 mptcp: MP_FAIL suboption sending
This patch added the MP_FAIL suboption sending support.
Add a new flag named send_mp_fail in struct mptcp_subflow_context. If this flag is set, send out MP_FAIL suboption.
Add a new member fail_seq in struct mptcp_out_options to save the data sequence number to put into the MP_FAIL suboption.
--- include/net/mptcp.h | 1 + net/mptcp/options.c | 46 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/protocol.h | 4 ++++ 3 files changed, 50 insertions(+), 1 deletion(-)
include/net/mptcp.h +1 -0
@@ -72,6 +72,7 @@ struct mptcp_out_options {u32 nonce;u64 thmac;u32 token; +u64 fail_seq;u8 hmac[20 ];struct mptcp_ext ext_copy;#endif
net/mptcp/options.c +45 -1
65 lines not on this page · raw message
net/mptcp/protocol.h +4 -0
@@ -26,6 +26,7 @@#define OPTION_MPTCP_FASTCLOSE BIT(8)#define OPTION_MPTCP_PRIO BIT(9)#define OPTION_MPTCP_RST BIT(10) +#define OPTION_MPTCP_FAIL BIT(11)/* MPTCP option subtypes */ #define MPTCPOPT_MP_CAPABLE 0
@@ -67,6 +68,7 @@#define TCPOLEN_MPTCP_PRIO_ALIGN 4#define TCPOLEN_MPTCP_FASTCLOSE 12#define TCPOLEN_MPTCP_RST 4 +#define TCPOLEN_MPTCP_FAIL 12#define TCPOLEN_MPTCP_MPC_ACK_DATA_CSUM (TCPOLEN_MPTCP_DSS_CHECKSUM + TCPOLEN_MPTCP_MPC_ACK_DATA)
@@ -419,6 +421,7 @@ struct mptcp_subflow_context { mpc_map : 1, backup : 1, send_mp_prio : 1, + send_mp_fail : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */
@@ -433,6 +436,7 @@ struct mptcp_subflow_context { u8 reset_seen:1; u8 reset_transient:1; u8 reset_reason:4; +u64 fail_seq;long delegated_status;struct list_head delegated_node;/* link into delegated_action, protected by local BH */
Signature · 1 line
2.31.1
PATCH 2/3 mptcp: MP_FAIL suboption receiving
This patch added handling for receiving MP_FAIL suboption.
Add a new members mp_fail and fail_seq in struct mptcp_options_received. When MP_FAIL suboption is received, set mp_fail to 1 and save the sequence number to fail_seq.
Then invoke mptcp_pm_mp_fail_received to deal with the MP_FAIL suboption. In it, send MP_FAIL + RST and fallback.
--- net/mptcp/options.c | 16 ++++++++++++++++ net/mptcp/pm.c | 17 +++++++++++++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 36 insertions(+)
net/mptcp/options.c +16 -0
@@ -341,6 +341,16 @@ static void mptcp_parse_option(const struct sock *sk, mp_opt->reset_reason = *ptr;break ; +case MPTCPOPT_MP_FAIL : +if (opsize !=TCPOLEN_MPTCP_FAIL ) +break ; + + ptr +=2 ; + mp_opt->mp_fail =1 ; + mp_opt->fail_seq =get_unaligned_be64 (ptr); +pr_debug ("MP_FAIL: data_seq=%llu" , mp_opt->fail_seq); +break ; +default :break ; }
@@ -367,6 +377,7 @@ void mptcp_get_options(const struct sock *sk, mp_opt->reset =0 ; mp_opt->csum_reqd =0 ; mp_opt->deny_join_id0 =0 ; + mp_opt->mp_fail =0 ; length = (th->doff *4 ) -sizeof (struct tcphdr ); ptr = (const unsigned char *)(th +1 );
@@ -1127,6 +1138,11 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) mp_opt.mp_prio =0 ; } +if (mp_opt.mp_fail) { +mptcp_pm_mp_fail_received (sk, mp_opt.fail_seq); + mp_opt.mp_fail =0 ; + } +if (mp_opt.reset) { subflow->reset_seen =1 ; subflow->reset_reason = mp_opt.reset_reason;
net/mptcp/pm.c +17 -0
@@ -247,6 +247,23 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)mptcp_event (MPTCP_EVENT_SUB_PRIORITY ,mptcp_sk (subflow->conn), sk,GFP_ATOMIC ); } +void mptcp_pm_mp_fail_received (struct sock *sk,u64 fail_seq) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +pr_debug ("map_seq=%llu fail_seq=%llu %llu" , subflow->map_seq, subflow->fail_seq, fail_seq); + +if (subflow->fail_seq != fail_seq) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq; +mptcp_subflow_reset (sk); + } + +pr_fallback (msk); +__mptcp_do_fallback (msk); +} +/* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
net/mptcp/protocol.h +3 -0
@@ -138,6 +138,7 @@ struct mptcp_options_received { add_addr : 1, rm_addr : 1, mp_prio : 1, + mp_fail : 1, echo : 1, csum_reqd : 1, backup : 1,
@@ -159,6 +160,7 @@ struct mptcp_options_received {u64 ahmac; u8 reset_reason:4; u8 reset_transient:1; +u64 fail_seq; };static inline __be32 mptcp_option (u8 subopt,u8 len,u8 nib,u8 field)
@@ -697,6 +699,7 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);int mptcp_pm_nl_mp_prio_send_ack (struct mptcp_sock *msk,struct mptcp_addr_info *addr,u8 bkup); +void mptcp_pm_mp_fail_received (struct sock *sk,u64 fail_seq);void mptcp_pm_free_anno_list (struct mptcp_sock *msk);bool mptcp_pm_sport_in_anno_list (struct mptcp_sock *msk,const struct sock *sk); struct mptcp_pm_add_entry *
Signature · 1 line
2.31.1
PATCH 3/3 mptcp: send out MP_FAIL when data checksum fail
When a bad checksum is detected, send out the MP_FAIL suboption.
--- net/mptcp/subflow.c | 2 ++ 1 file changed, 2 insertions(+)
net/mptcp/subflow.c +2 -0
@@ -906,6 +906,8 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * csum =csum_partial (&header,sizeof (header), subflow->map_data_csum);if (unlikely (csum_fold (csum))) {MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_DSSCSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }
Signature · 1 line
2.31.1
Re: [MPTCP][PATCH mptcp-next 2/3] mptcp: MP_FAIL suboption receiving
In reply to Geliang TangQuoted 70 lines · Geliang Tang
This patch added handling for receiving
MP_FAILsuboption.Add a new members
mp_failandfail_seqin structmptcp_options_received. WhenMP_FAILsuboption is received, setmp_failto 1 and save the sequence number tofail_seq.Then invoke
mptcp_pm_mp_fail_receivedto deal with theMP_FAILsuboption. In it, sendMP_FAIL+ RST and fallback.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/options.c | 16 ++++++++++++++++ net/mptcp/pm.c | 17 +++++++++++++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 36 insertions(+)net/mptcp/options.c +16
-0@@ -341,6 +341,16 @@ static void mptcp_parse_option(const struct sock *sk, mp_opt->reset_reason = *ptr;break ; +case MPTCPOPT_MP_FAIL : +if (opsize !=TCPOLEN_MPTCP_FAIL ) +break ; + + ptr +=2 ; + mp_opt->mp_fail =1 ; + mp_opt->fail_seq =get_unaligned_be64 (ptr); +pr_debug ("MP_FAIL: data_seq=%llu" , mp_opt->fail_seq); +break ; +default :break ; }@@ -367,6 +377,7 @@ void mptcp_get_options(const struct sock *sk, mp_opt->reset =0 ; mp_opt->csum_reqd =0 ; mp_opt->deny_join_id0 =0 ; + mp_opt->mp_fail =0 ; length = (th->doff *4 ) -sizeof (struct tcphdr ); ptr = (const unsigned char *)(th +1 );@@ -1127,6 +1138,11 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) mp_opt.mp_prio =0 ; } +if (mp_opt.mp_fail) { +mptcp_pm_mp_fail_received (sk, mp_opt.fail_seq); + mp_opt.mp_fail =0 ; + } +if (mp_opt.reset) { subflow->reset_seen =1 ; subflow->reset_reason = mp_opt.reset_reason;net/mptcp/pm.c +5
-0@@ -247,6 +247,23 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)mptcp_event (MPTCP_EVENT_SUB_PRIORITY ,mptcp_sk (subflow->conn), sk,GFP_ATOMIC ); } +void mptcp_pm_mp_fail_received (struct sock *sk,u64 fail_seq) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); +struct mptcp_sock *msk =mptcp_sk (subflow->conn); +
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 264
Quoted 10 lines
net/mptcp/pm.c +10
-0+pr_debug ("map_seq=%llu fail_seq=%llu %llu" , subflow->map_seq, subflow->fail_seq, fail_seq); + +if (subflow->fail_seq != fail_seq) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq; +mptcp_subflow_reset (sk); + } + +pr_fallback (msk); +__mptcp_do_fallback (msk);
Note that RFC 8684 section 3.7 says that fallback is only required if there is a single active subflow.
The RFC also says that data following fail_seq should be discarded when there are multiple subflows open. It's similar to a forced checksum failure - the queued data that has already been received on the subflow that received the MP_FAIL is discarded and not DATA_ACKed.
-Mat
Quoted 32 lines
net/mptcp/pm.c +2
-0+} +/* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,net/mptcp/protocol.h +3
-0@@ -138,6 +138,7 @@ struct mptcp_options_received { add_addr : 1, rm_addr : 1, mp_prio : 1, + mp_fail : 1, echo : 1, csum_reqd : 1, backup : 1,@@ -159,6 +160,7 @@ struct mptcp_options_received {u64 ahmac; u8 reset_reason:4; u8 reset_transient:1; +u64 fail_seq; };static inline __be32 mptcp_option (u8 subopt,u8 len,u8 nib,u8 field)@@ -697,6 +699,7 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);int mptcp_pm_nl_mp_prio_send_ack (struct mptcp_sock *msk,struct mptcp_addr_info *addr,u8 bkup); +void mptcp_pm_mp_fail_received (struct sock *sk,u64 fail_seq);void mptcp_pm_free_anno_list (struct mptcp_sock *msk);bool mptcp_pm_sport_in_anno_list (struct mptcp_sock *msk,const struct sock *sk);
Quoted 6 lines
struct
mptcp_pm_add_entry*Signature · 1 line
2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH mptcp-next 3/3] mptcp: send out MP_FAIL when data checksum fail
In reply to Geliang TangQuoted 12 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILsuboption.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/subflow.c| 2 ++1 file changed, 2 insertions(+)net/mptcp/subflow.c +0
-0
net/mptcp/subflow.c static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * · line 910
Quoted 5 lines
net/mptcp/subflow.c +2
-0@@ -906,6 +906,8 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * csum =csum_partial (&header,sizeof (header), subflow->map_data_csum);if (unlikely (csum_fold (csum))) {MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_DSSCSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;
map_seq is the sequence number of the last good data *received* by this peer, but fail_seq will be used to discard data *sent* by this peer. So I think fail_seq needs to be based on the sequence number for outgoing data on this subflow? I admit the RFC has me confused here. If MP_FAIL is implemented on the multipath-tcp.org kernel it might be helpful to see how it is used there.
Quoted 8 lines
net/mptcp/subflow.c +0
-0return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }Signature · 1 line
2.31.1
--
Mat Martineau
Intel