MP_FAIL support
Subsystems (3)
v3 cover MP_FAIL support
v3:
- respond with MP_FAIL
- add single subflow check
- add infinite mapping sending and receiving
- export/20210626T054902
v2:
- MP_FAIL logic:
* Peer B send a DSS to peer A, and the data has been modify by the
middleboxes, then peer A detects the bad checksum.
* In the multiple subflows case, peer A sends MP_FAIL+RST back to peer B,
and peer A discards the data following the bad data sequence number. Peer B receives this MP_FAIL+RST, and close this subflow.
* In the single subflow case, using the simple implementation, peer A
sends MP_FAIL back to peer B, and peer A fallback to a regular TCP. Peer B receives this MP_FAIL, and fallback to a regular TCP.
Geliang Tang (8):
mptcp: MP_FAIL suboption sending
mptcp: MP_FAIL suboption receiving
mptcp: send out MP_FAIL when data checksum fail
mptcp: add the mibs for MP_FAIL
selftests: mptcp: add MP_FAIL mibs check
mptcp: infinite mapping sending
mptcp: infinite mapping receiving
mptcp: add a mib for the infinite mapping sending
include/net/mptcp.h | 1 + net/mptcp/mib.c | 3 + net/mptcp/mib.h | 3 + net/mptcp/options.c | 96 ++++++++++++++++++- net/mptcp/pm.c | 20 ++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 28 ++++++ net/mptcp/subflow.c | 28 ++++++ .../testing/selftests/net/mptcp/mptcp_join.sh | 38 ++++++++ 9 files changed, 215 insertions(+), 3 deletions(-)
Signature · 1 line
2.31.1
PATCH v3 1/8 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 | 54 ++++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 57 insertions(+), 2 deletions(-)
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 +52 -2
79 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)
@@ -417,6 +419,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 */
@@ -431,6 +434,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 v3 2/8 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.
--- net/mptcp/options.c | 16 ++++++++++++++++ net/mptcp/pm.c | 7 +++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 26 insertions(+)
net/mptcp/options.c +16 -0
@@ -336,6 +336,16 @@ static void mptcp_parse_option(const struct sk_buff *skb, 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 ; }
@@ -364,6 +374,7 @@ void mptcp_get_options(const struct sock *sk, mp_opt->reset =0 ; mp_opt->csum_reqd =READ_ONCE (msk->csum_enabled); mp_opt->deny_join_id0 =0 ; + mp_opt->mp_fail =0 ; length = (th->doff *4 ) -sizeof (struct tcphdr ); ptr = (const unsigned char *)(th +1 );
@@ -1129,6 +1140,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 +7 -0
@@ -247,6 +247,13 @@ 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); + +pr_debug ("map_seq=%llu fail_seq=%llu" , subflow->map_seq, fail_seq); +} +/* path manager helpers */ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
net/mptcp/protocol.h +3 -0
@@ -139,6 +139,7 @@ struct mptcp_options_received { add_addr : 1, rm_addr : 1, mp_prio : 1, + mp_fail : 1, echo : 1, csum_reqd : 1, backup : 1,
@@ -160,6 +161,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)
@@ -704,6 +706,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 v3 3/8 mptcp: send out MP_FAIL when data checksum fail
When a bad checksum is detected, send out the MP_FAIL option.
When multiple subflows are in use, close the affected subflow with a RST that includes an MP_FAIL option.
When a single subfow is in use, send back an MP_FAIL option on the subflow-level ACK. And the receiver of this MP_FAIL respond with an MP_FAIL in the reverse direction.
--- net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)
net/mptcp/pm.c +10 -0
@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) { +if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq; + }else { + subflow->mp_fail_need_echo =0 ; + } + } }/* path manager helpers */
net/mptcp/protocol.h +14 -0
@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */
@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; } +static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow) +return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );
net/mptcp/subflow.c +18 -0
@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }
@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk) fallback:/* RFC 8684 section 3.7. */ +if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers
Signature · 1 line
2.31.1
PATCH v3 4/8 mptcp: add the mibs for MP_FAIL
This patch added the mibs for MP_FAIL: MPTCP_MIB_MPFAILTX and MPTCP_MIB_MPFAILRX.
--- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 1 + net/mptcp/pm.c | 2 ++ net/mptcp/subflow.c | 1 + 5 files changed, 8 insertions(+)
net/mptcp/mib.c +2 -0
@@ -44,6 +44,8 @@ static const struct snmp_mib mptcp_snmp_list[] = {SNMP_MIB_ITEM ("RmSubflow" ,MPTCP_MIB_RMSUBFLOW ),SNMP_MIB_ITEM ("MPPrioTx" ,MPTCP_MIB_MPPRIOTX ),SNMP_MIB_ITEM ("MPPrioRx" ,MPTCP_MIB_MPPRIORX ), +SNMP_MIB_ITEM ("MPFailTx" ,MPTCP_MIB_MPFAILTX ), +SNMP_MIB_ITEM ("MPFailRx" ,MPTCP_MIB_MPFAILRX ), SNMP_MIB_SENTINEL };
net/mptcp/mib.h +2 -0
@@ -37,6 +37,8 @@ enum linux_mptcp_mib_field {MPTCP_MIB_RMSUBFLOW ,/* Remove a subflow */ MPTCP_MIB_MPPRIOTX ,/* Transmit a MP_PRIO */ MPTCP_MIB_MPPRIORX ,/* Received a MP_PRIO */ +MPTCP_MIB_MPFAILTX ,/* Transmit a MP_FAIL */ +MPTCP_MIB_MPFAILRX ,/* Received a MP_FAIL */ __MPTCP_MIB_MAX };
net/mptcp/options.c +1 -0
@@ -1142,6 +1142,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)if (mp_opt.mp_fail) {mptcp_pm_mp_fail_received (sk, mp_opt.fail_seq); +MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPFAILRX ); mp_opt.mp_fail =0 ; }
net/mptcp/pm.c +2 -0
@@ -9,6 +9,7 @@#include <net/tcp.h> #include <net/mptcp.h> #include "protocol.h" +#include "mib.h" /* path manager command handlers */
@@ -258,6 +259,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)if (!subflow->mp_fail_need_echo) { subflow->send_mp_fail =1 ; subflow->fail_seq = fail_seq; +MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPFAILTX ); }else { subflow->mp_fail_need_echo =0 ; }
net/mptcp/subflow.c +1 -0
@@ -915,6 +915,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff *MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_DATACSUMERR ); subflow->send_mp_fail =1 ; subflow->fail_seq = subflow->map_seq; +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPFAILTX );return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }
Signature · 1 line
2.31.1
PATCH v3 5/8 selftests: mptcp: add MP_FAIL mibs check
This patch added a function chk_fail_nr to check the mibs for MP_FAIL.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +38 -0
@@ -541,6 +541,43 @@ chk_csum_nr() fi } +chk_fail_nr() +{ + local mp_fail_nr_tx=$1 + local mp_fail_nr_rx=$2 + local count + local dump_stats + + printf "%-39s %s" " " "ftx" + count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{print $2}'` + [ -z "$count" ] && count=0 + if [ "$count" != "$mp_fail_nr_tx" ]; then + echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx" + ret=1 + dump_stats=1 + else + echo -n "[ ok ]" + fi + + echo -n " - frx " + count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailRx | awk '{print $2}'` + [ -z "$count" ] && count=0 + if [ "$count" != "$mp_fail_nr_rx" ]; then + echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx" + ret=1 + dump_stats=1 + else + echo "[ ok ]" + fi + + if [ "${dump_stats}" = 1 ]; then + echo Server ns stats + ip netns exec $ns1 nstat -as | grep MPTcp + echo Client ns stats + ip netns exec $ns2 nstat -as | grep MPTcp + fi +} + chk_join_nr() { local msg="$1"
@@ -590,6 +627,7 @@ chk_join_nr() fi if [ $checksum -eq 1 ]; then chk_csum_nr + chk_fail_nr 0 0 fi }
Signature · 1 line
2.31.1
PATCH v3 6/8 mptcp: infinite mapping sending
This patch added the infinite mapping sending logic.
Added a new flag snd_infinite_mapping_enable in mptcp_sock. Set it true when echoing the MP_FAIL in mptcp_pm_mp_fail_received.
In mptcp_established_options_dss, if this flag is true, call the new function mptcp_write_infinite_mapping to set the infiniting mapping and sent it out.
--- net/mptcp/options.c | 23 +++++++++++++++++++++-- net/mptcp/pm.c | 1 + net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-)
net/mptcp/options.c +21 -2
@@ -572,8 +572,21 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, } } +static void mptcp_write_infinite_mapping (struct mptcp_subflow_context *subflow, +struct mptcp_ext *ext) +{ +pr_debug ("fail_seq=%llu" , subflow->fail_seq); + +if (ext->use_map) { + ext->data_seq = subflow->fail_seq; + ext->data_len =0 ; +WRITE_ONCE (msk->snd_infinite_mapping_enable, false); + } +} +static bool mptcp_established_options_dss (struct sock *sk,struct sk_buff *skb,bool snd_data_fin_enable, +bool snd_infinite_mapping_enable,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)
@@ -589,7 +602,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, opts->csum_reqd =READ_ONCE (msk->csum_enabled); mpext = skb ?mptcp_get_ext (skb) :NULL ; -if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) { +if (!skb || (mpext && mpext->use_map) || + snd_data_fin_enable || snd_infinite_mapping_enable) {unsigned int map_size =TCPOLEN_MPTCP_DSS_BASE +TCPOLEN_MPTCP_DSS_MAP64 ;if (mpext) {
@@ -603,6 +617,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, dss_size = map_size;if (skb && snd_data_fin_enable)mptcp_write_data_fin (subflow, skb, &opts->ext_copy); +if (skb && snd_infinite_mapping_enable) +mptcp_write_infinite_mapping (subflow, &opts->ext_copy); ret = true; }
@@ -811,6 +827,7 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk);struct mptcp_sock *msk =mptcp_sk (subflow->conn);unsigned int opt_size =0 ; +bool snd_infinite_mapping;bool snd_data_fin;bool ret = false;
@@ -831,9 +848,11 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, } snd_data_fin =mptcp_data_fin_enabled (msk); + snd_infinite_mapping =mptcp_infinite_mapping_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, snd_infinite_mapping, + &opt_size, remaining, opts)) { ret = true;if (opts->ext_copy.use_ack) {if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) {
net/mptcp/pm.c +1 -0
@@ -257,6 +257,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)if (!msk->pm.subflows) {if (!subflow->mp_fail_need_echo) { +WRITE_ONCE (msk->snd_infinite_mapping_enable, true); subflow->send_mp_fail =1 ; subflow->fail_seq = fail_seq;MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPFAILTX );
net/mptcp/protocol.c +1 -0
@@ -2727,6 +2727,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk,WRITE_ONCE (msk->fully_established, false);if (mp_opt->csum_reqd)WRITE_ONCE (msk->csum_enabled, true); +WRITE_ONCE (msk->snd_infinite_mapping_enable, false); msk->write_seq = subflow_req->idsn +1 ; msk->snd_nxt = msk->write_seq;
net/mptcp/protocol.h +6 -0
@@ -244,6 +244,7 @@ struct mptcp_sock {bool fully_established;bool rcv_data_fin;bool snd_data_fin_enable; +bool snd_infinite_mapping_enable;bool rcv_fastclose;bool use_64bit_ack;/* Set when we received a 64-bit DSN */ bool csum_enabled;
@@ -656,6 +657,11 @@ static inline bool mptcp_data_fin_enabled(const struct mptcp_sock *msk)READ_ONCE (msk->write_seq) ==READ_ONCE (msk->snd_nxt); } +static inline bool mptcp_infinite_mapping_enabled (const struct mptcp_sock *msk) +{ +return READ_ONCE (msk->snd_infinite_mapping_enable); +} +static inline bool mptcp_propagate_sndbuf (struct sock *sk,struct sock *ssk) {if ((sk->sk_userlocks &SOCK_SNDBUF_LOCK ) || ssk->sk_sndbuf <=READ_ONCE (sk->sk_sndbuf))
Signature · 1 line
2.31.1
PATCH v3 7/8 mptcp: infinite mapping receiving
This patch added the infinite mapping receiving logic.
Added a new struct member infinite_mapping_received in struct mptcp_subflow_context, set it true when the infinite mapping is received.
In subflow_check_data_avail, if this flag is set, fallback to a regular TCP.
--- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 9 +++++++++ 2 files changed, 10 insertions(+)
net/mptcp/protocol.h +1 -0
@@ -424,6 +424,7 @@ struct mptcp_subflow_context { send_mp_prio : 1, send_mp_fail : 1, mp_fail_need_echo : 1, + infinite_mapping_received : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */
net/mptcp/subflow.c +9 -0
@@ -965,7 +965,9 @@ static enum mapping_status get_mapping_status(struct sock *ssk, data_len = mpext->data_len;if (data_len ==0 ) { +pr_debug ("infinite mapping received, data_seq=%llu" , mpext->data_seq);MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_INFINITEMAPRX ); + subflow->infinite_mapping_received =1 ;return MAPPING_INVALID ; }
@@ -1179,6 +1181,13 @@ static bool subflow_check_data_avail(struct sock *ssk) } } +if (subflow->infinite_mapping_received) { +pr_fallback (msk); +__mptcp_do_fallback (msk); + subflow->infinite_mapping_received =0 ; +return true; + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers
Signature · 1 line
2.31.1
PATCH v3 8/8 mptcp: add a mib for the infinite mapping sending
This patch added a new mib named MPTCP_MIB_INFINITEMAPTX, increase it when a infinite mapping has been sent out.
--- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/options.c | 4 ++++ 3 files changed, 6 insertions(+)
net/mptcp/mib.c +1 -0
@@ -24,6 +24,7 @@ static const struct snmp_mib mptcp_snmp_list[] = {SNMP_MIB_ITEM ("MPJoinAckRx" ,MPTCP_MIB_JOINACKRX ),SNMP_MIB_ITEM ("MPJoinAckHMacFailure" ,MPTCP_MIB_JOINACKMAC ),SNMP_MIB_ITEM ("DSSNotMatching" ,MPTCP_MIB_DSSNOMATCH ), +SNMP_MIB_ITEM ("InfiniteMapTx" ,MPTCP_MIB_INFINITEMAPTX ),SNMP_MIB_ITEM ("InfiniteMapRx" ,MPTCP_MIB_INFINITEMAPRX ),SNMP_MIB_ITEM ("DSSNoMatchTCP" ,MPTCP_MIB_DSSTCPMISMATCH ), SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR),
net/mptcp/mib.h +1 -0
@@ -17,6 +17,7 @@ enum linux_mptcp_mib_field {MPTCP_MIB_JOINACKRX ,/* Received an ACK + MP_JOIN */ MPTCP_MIB_JOINACKMAC ,/* HMAC was wrong on ACK + MP_JOIN */ MPTCP_MIB_DSSNOMATCH ,/* Received a new mapping that did not match the previous one */ +MPTCP_MIB_INFINITEMAPTX ,/* Sent an infinite mapping */ MPTCP_MIB_INFINITEMAPRX ,/* Received an infinite mapping */ MPTCP_MIB_DSSTCPMISMATCH ,/* DSS-mapping did not map with TCP's sequence numbers */ MPTCP_MIB_DATACSUMERR, /* The data checksum fail */
net/mptcp/options.c +4 -0
@@ -575,12 +575,16 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,static void mptcp_write_infinite_mapping (struct mptcp_subflow_context *subflow,struct mptcp_ext *ext) { +struct mptcp_sock *msk =mptcp_sk (subflow->conn); +struct sock *sk = (struct sock *)msk; +pr_debug ("fail_seq=%llu" , subflow->fail_seq);if (ext->use_map) { ext->data_seq = subflow->fail_seq; ext->data_len =0 ;WRITE_ONCE (msk->snd_infinite_mapping_enable, false); +MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_INFINITEMAPTX ); } }
Signature · 1 line
2.31.1
Re: [MPTCP][PATCH v3 mptcp-next 7/8] mptcp: infinite mapping receiving
In reply to Geliang TangQuoted 42 lines · Geliang Tang
This patch added the infinite mapping receiving logic.
Added a new struct member
infinite_mapping_receivedin structmptcp_subflow_context, set it true when the infinite mapping is received.In
subflow_check_data_avail, if this flag is set, fallback to a regular TCP.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/protocol.h| 1 +net/mptcp/subflow.c| 9 +++++++++2 files changed, 10 insertions(+)net/mptcp/protocol.h +1
-0@@ -424,6 +424,7 @@ struct mptcp_subflow_context { send_mp_prio : 1, send_mp_fail : 1, mp_fail_need_echo : 1, + infinite_mapping_received : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */net/mptcp/subflow.c +2
-0@@ -965,7 +965,9 @@ static enum mapping_status get_mapping_status(struct sock *ssk, data_len = mpext->data_len;if (data_len ==0 ) { +pr_debug ("infinite mapping received, data_seq=%llu" , mpext->data_seq);MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_INFINITEMAPRX ); + subflow->infinite_mapping_received =1 ;return MAPPING_INVALID ; }
net/mptcp/subflow.c static bool subflow_check_data_avail(struct sock *ssk) · line 1190
Quoted 10 lines
net/mptcp/subflow.c +7
-0@@ -1179,6 +1181,13 @@ static bool subflow_check_data_avail(struct sock *ssk) } } +if (subflow->infinite_mapping_received) { +pr_fallback (msk); +__mptcp_do_fallback (msk); + subflow->infinite_mapping_received =0 ; +return true; + } +
I think there's more checking to do before falling back with the infinite mapping. The RFC says:
"""
This infinite mapping will be a DSS option (Section 3.3) on the first new packet, containing a Data Sequence Mapping that acts retroactively, referring to the start of the subflow sequence number of the most recent segment that was known to be delivered intact (i.e., was successfully DATA_ACKed). From that point onward, data can be altered by a middlebox without affecting MPTCP, as the data stream is equivalent to a regular, legacy TCP session.
"""
Quoted 8 lines
net/mptcp/subflow.c +0
-0if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers Signature · 1 line
2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 6/8] mptcp: infinite mapping sending
In reply to Geliang TangQuoted 11 lines · Geliang Tang
This patch added the infinite mapping sending logic.
Added a new flag
snd_infinite_mapping_enableinmptcp_sock. Set it true when echoing theMP_FAILinmptcp_pm_mp_fail_received.In
mptcp_established_options_dss, if this flag is true, call the new functionmptcp_write_infinite_mappingto set the infiniting mapping and sent it out.Signed-off-by Geliang Tang <[email protected]>---
Hi Geliang -
Thanks for working on the infinite mapping support to include in this patch set.
Quoted 13 lines
net/mptcp/options.c | 23 +++++++++++++++++++++-- net/mptcp/pm.c | 1 + net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-)net/mptcp/options.c +0
-0@@ -572,8 +572,21 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, } }
net/mptcp/options.c static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, · line 583
Quoted 10 lines
net/mptcp/options.c +9
-0+static void mptcp_write_infinite_mapping (struct mptcp_subflow_context *subflow, +struct mptcp_ext *ext) +{ +pr_debug ("fail_seq=%llu" , subflow->fail_seq); + +if (ext->use_map) { + ext->data_seq = subflow->fail_seq; + ext->data_len =0 ; +WRITE_ONCE (msk->snd_infinite_mapping_enable, false);
I'm not sure it's enough to override the data_seq / data_len on an existing skb like this, more careful coordination with fallback might be needed. What do you think about handling the infinite mapping where data_seq & data_len get populated in mptcp_sendmsg_frag()?
The RFC also says the infinite mapping should only be sent once, I wonder if we can guarantee that with GSO?
net/mptcp/options.c static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, · line 589
Quoted 6 lines
net/mptcp/options.c +4
-0+ } +} + static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, bool snd_data_fin_enable, + bool snd_infinite_mapping_enable,
This new parameter isn't necessary, it can be read from the msk.
Quoted 80 lines
net/mptcp/options.c +8
-2unsigned int *size, unsigned int remaining, struct mptcp_out_options *opts)@@ -589,7 +602,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, opts->csum_reqd =READ_ONCE (msk->csum_enabled); mpext = skb ?mptcp_get_ext (skb) :NULL ; -if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) { +if (!skb || (mpext && mpext->use_map) || + snd_data_fin_enable || snd_infinite_mapping_enable) {unsigned int map_size =TCPOLEN_MPTCP_DSS_BASE +TCPOLEN_MPTCP_DSS_MAP64 ;if (mpext) {@@ -603,6 +617,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, dss_size = map_size;if (skb && snd_data_fin_enable)mptcp_write_data_fin (subflow, skb, &opts->ext_copy); +if (skb && snd_infinite_mapping_enable) +mptcp_write_infinite_mapping (subflow, &opts->ext_copy); ret = true; }@@ -811,6 +827,7 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk);struct mptcp_sock *msk =mptcp_sk (subflow->conn);unsigned int opt_size =0 ; +bool snd_infinite_mapping;bool snd_data_fin;bool ret = false;@@ -831,9 +848,11 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, } snd_data_fin =mptcp_data_fin_enabled (msk); + snd_infinite_mapping =mptcp_infinite_mapping_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, snd_infinite_mapping, + &opt_size, remaining, opts)) { ret = true;if (opts->ext_copy.use_ack) {if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) {net/mptcp/pm.c +1
-0@@ -257,6 +257,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)if (!msk->pm.subflows) {if (!subflow->mp_fail_need_echo) { +WRITE_ONCE (msk->snd_infinite_mapping_enable, true); subflow->send_mp_fail =1 ; subflow->fail_seq = fail_seq;MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPFAILTX );net/mptcp/protocol.c +1
-0@@ -2727,6 +2727,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk,WRITE_ONCE (msk->fully_established, false);if (mp_opt->csum_reqd)WRITE_ONCE (msk->csum_enabled, true); +WRITE_ONCE (msk->snd_infinite_mapping_enable, false); msk->write_seq = subflow_req->idsn +1 ; msk->snd_nxt = msk->write_seq;net/mptcp/protocol.h +1
-0@@ -244,6 +244,7 @@ struct mptcp_sock {bool fully_established;bool rcv_data_fin;bool snd_data_fin_enable; +bool snd_infinite_mapping_enable;bool rcv_fastclose;bool use_64bit_ack;/* Set when we received a 64-bit DSN */ bool csum_enabled;
net/mptcp/protocol.h static inline bool mptcp_data_fin_enabled(const struct mptcp_sock *msk) · line 660
Quoted 4 lines
net/mptcp/protocol.h +1
-0@@ -656,6 +657,11 @@ static inline bool mptcp_data_fin_enabled(const struct mptcp_sock *msk)READ_ONCE (msk->write_seq) ==READ_ONCE (msk->snd_nxt); } +static inline bool mptcp_infinite_mapping_enabled (const struct mptcp_sock *msk)
I don't think this helper is needed.
Quoted 12 lines
net/mptcp/protocol.h +4
-0+{ +return READ_ONCE (msk->snd_infinite_mapping_enable); +} +static inline bool mptcp_propagate_sndbuf (struct sock *sk,struct sock *ssk) {if ((sk->sk_userlocks &SOCK_SNDBUF_LOCK ) || ssk->sk_sndbuf <=READ_ONCE (sk->sk_sndbuf))Signature · 1 line
2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 6/8] mptcp: infinite mapping sending
Quoted 46 lines · Mat Martineau
Quoted 11 lines · Geliang Tang
This patch added the infinite mapping sending logic.
Added a new flag
snd_infinite_mapping_enableinmptcp_sock. Set it true when echoing theMP_FAILinmptcp_pm_mp_fail_received.In
mptcp_established_options_dss, if this flag is true, call the new functionmptcp_write_infinite_mappingto set the infiniting mapping and sent it out.Signed-off-by Geliang Tang <[email protected]>---
Hi Geliang -
Thanks for working on the infinite mapping support to include in this patch set.
Quoted 15 lines
net/mptcp/options.c | 23 +++++++++++++++++++++-- net/mptcp/pm.c | 1 + net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-)net/mptcp/options.c +0
-0@@ -572,8 +572,21 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, } }net/mptcp/options.c static void mptcp_write_data_fin(struct · line 585
Quoted 10 lines
net/mptcp/options.c +9
-0+static void mptcp_write_infinite_mapping (struct mptcp_subflow_context *subflow, +struct mptcp_ext *ext) +{ +pr_debug ("fail_seq=%llu" , subflow->fail_seq); + +if (ext->use_map) { + ext->data_seq = subflow->fail_seq; + ext->data_len =0 ; +WRITE_ONCE (msk->snd_infinite_mapping_enable, false);I'm not sure it's enough to override the
data_seq/data_lenon an existing skb like this, more careful coordination with fallback might be needed. What do you think about handling the infinite mapping wheredata_seq&data_lenget populated inmptcp_sendmsg_frag()?
Quoted 2 lines
The RFC also says the infinite mapping should only be sent once, I wonder if we can guarantee that with GSO?
One more thing: if the checksum is enabled when an infinite mapping is set, it must also be set to 0. The rx side should check this too.
- Mat
Quoted 119 lines
net/mptcp/options.c static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow, · line 589
Quoted 6 lines
net/mptcp/options.c +4
-0+ } +} + static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, bool snd_data_fin_enable, + bool snd_infinite_mapping_enable,This new parameter isn't necessary, it can be read from the msk.
Quoted 92 lines
net/mptcp/options.c +0
-0unsigned int *size,unsigned int remaining, struct
mptcp_out_options*opts)net/mptcp/options.c +2
-1@@ -589,7 +602,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, opts->csum_reqd =READ_ONCE (msk->csum_enabled); mpext = skb ?mptcp_get_ext (skb) :NULL ; -if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) { +if (!skb || (mpext && mpext->use_map) || + snd_data_fin_enable || snd_infinite_mapping_enable) {unsigned int map_size =TCPOLEN_MPTCP_DSS_BASE +TCPOLEN_MPTCP_DSS_MAP64 ;if (mpext) {net/mptcp/options.c +2
-0@@ -603,6 +617,8 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, dss_size = map_size;if (skb && snd_data_fin_enable)mptcp_write_data_fin (subflow, skb, &opts->ext_copy); +if (skb && snd_infinite_mapping_enable) +mptcp_write_infinite_mapping (subflow, &opts->ext_copy); ret = true;}net/mptcp/options.c +3
-1@@ -811,6 +827,7 @@ bool mptcp_established_options(struct sock *sk, structsk_buff *skb, struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);struct mptcp_sock *msk =mptcp_sk (subflow->conn);unsigned int opt_size =0 ; +bool snd_infinite_mapping;bool snd_data_fin;bool ret = false;@@ -831,9 +848,11 @@ bool mptcp_established_options(struct sock *sk, structsk_buff *skb, } snd_data_fin =mptcp_data_fin_enabled (msk); + snd_infinite_mapping =mptcp_infinite_mapping_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { + else if (mptcp_established_options_dss(sk, skb, snd_data_fin,
snd_infinite_mapping,net/mptcp/options.c +1
-0+ &opt_size, remaining, opts)) {ret = true; if (opts->ext_copy.use_ack) { if (mptcp_established_options_mp_fail(sk, &opt_size,remaining, opts)) {
net/mptcp/pm.c +1
-0@@ -257,6 +257,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)if (!msk->pm.subflows) {if (!subflow->mp_fail_need_echo) { +WRITE_ONCE (msk->snd_infinite_mapping_enable, true); subflow->send_mp_fail =1 ; subflow->fail_seq = fail_seq;MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX);net/mptcp/protocol.c +1
-0@@ -2727,6 +2727,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk,WRITE_ONCE (msk->fully_established, false);if (mp_opt->csum_reqd)WRITE_ONCE (msk->csum_enabled, true); +WRITE_ONCE (msk->snd_infinite_mapping_enable, false); msk->write_seq = subflow_req->idsn +1 ; msk->snd_nxt = msk->write_seq;net/mptcp/protocol.h +1
-0@@ -244,6 +244,7 @@ struct mptcp_sock {bool fully_established;bool rcv_data_fin;bool snd_data_fin_enable; +bool snd_infinite_mapping_enable;bool rcv_fastclose;bool use_64bit_ack;/* Set when we received a 64-bit DSN */ bool csum_enabled;net/mptcp/protocol.h static inline bool mptcp_data_fin_enabled(const struct · line 662
Quoted 6 lines
net/mptcp/protocol.h +1
-0@@ -656,6 +657,11 @@ static inline bool mptcp_data_fin_enabled(const struct mptcp_sock *msk) READ_ONCE(msk->write_seq) == READ_ONCE(msk->snd_nxt); } +static inline bool mptcp_infinite_mapping_enabled (const struct mptcp_sock *msk)I don't think this helper is needed.
Quoted 9 lines
net/mptcp/protocol.h +4
-0+{ +return READ_ONCE (msk->snd_infinite_mapping_enable); +} +static inline bool mptcp_propagate_sndbuf (struct sock *sk,struct sock *ssk){ if ((sk->sk_userlocks & SOCK_SNDBUF_LOCK) || ssk->sk_sndbuf <=
READ_ONCE(sk->sk_sndbuf))
Quoted 10 lines
Quoted 4 lines
2.31.1
--
Mat Martineau
Intel
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 3/8] mptcp: send out MP_FAIL when data checksum fail
In reply to Geliang TangQuoted 21 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILoption.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption.When a single subfow is in use, send back an
MP_FAILoption on the subflow-level ACK. And the receiver of thisMP_FAILrespond with anMP_FAILin the reverse direction.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)net/mptcp/pm.c +0
-0
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 257
Quoted 8 lines
net/mptcp/pm.c +3
-0@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) {
The pm.lock isn't held so it's not safe to access pm.subflows
I don't think it's sufficient to read pm.subflows with the lock or add READ_ONCE/WRITE_ONCE, since that would still allow race conditions with the msk. To handle fallback when receiving MP_FAIL I think the sock_owned_by_user() checks and delegated callback (similar to mptcp_subflow_process_delegated()) may be needed.
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 260
Quoted 3 lines
net/mptcp/pm.c +3
-0+if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq;
Echoing the fail_seq back doesn't seem correct, from the RFC it seems like this side should send a sequence number for the opposite data direction? Do you agree?
Quoted 12 lines
net/mptcp/pm.c +4
-0+ }else { + subflow->mp_fail_need_echo =0 ; + } + } }/* path manager helpers */ net/mptcp/protocol.h +0
-0
net/mptcp/protocol.h struct mptcp_subflow_context { · line 425
Quoted 4 lines
net/mptcp/protocol.h +1
-0@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1,
I think mp_fail_expect_echo would be a more accurate name.
Quoted 4 lines
net/mptcp/protocol.h +0
-0rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */
net/mptcp/protocol.h static inline void mptcp_subflow_tcp_fallback(struct sock *sk, · line 604
Quoted 10 lines
net/mptcp/protocol.h +7
-0@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; } +static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow)
Why check tmp->fully_established here?
- Mat
Quoted 42 lines
net/mptcp/protocol.h +6
-0+return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );net/mptcp/subflow.c +2
-0@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +16
-0+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + } +
Quoted 8 lines
if (subflow->mp_join || subflow->fully_established) { /* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriersSignature · 1 line
2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 3/8] mptcp: send out MP_FAIL when data checksum fail
Hi Mat,
Sorry for late response on this.
Quoted 35 lines · Mat Martineau <[email protected]> 于2021年7月8日周四 上午7:20写道:
Quoted 21 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILoption.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption.When a single subfow is in use, send back an
MP_FAILoption on the subflow-level ACK. And the receiver of thisMP_FAILrespond with anMP_FAILin the reverse direction.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)net/mptcp/pm.c +0
-0net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 257
Quoted 8 lines
net/mptcp/pm.c +3
-0@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) {The pm.lock isn't held so it's not safe to access pm.subflows
Quoted 6 lines
I don't think it's sufficient to read pm.subflows with the lock or add READ_ONCE/WRITE_ONCE, since that would still allow race conditions with the msk. To handle fallback when receiving
MP_FAILI think thesock_owned_by_user()checks and delegated callback (similar tomptcp_subflow_process_delegated()) may be needed.
I think it's better to use the below mptcp_has_another_subflow() function here instead of using msk->pm.subflows to check the single subflow case.
Quoted 7 lines
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 260
Quoted 3 lines
net/mptcp/pm.c +3
-0+if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq;Echoing the
fail_seqback doesn't seem correct, from the RFC it seems like this side should send a sequence number for the opposite data direction? Do you agree?
So we should use 'subflow->fail_seq = subflow->map_seq;' here?
Quoted 7 lines
Quoted 7 lines
net/mptcp/pm.c +4
-0+ }else { + subflow->mp_fail_need_echo =0 ; + } + } }
Quoted 12 lines
net/mptcp/protocol.h struct mptcp_subflow_context { · line 425
Quoted 10 lines
net/mptcp/pm.c +0
-0/* path manager helpers */ net/mptcp/protocol.h +1
-0@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1,I think
mp_fail_expect_echowould be a more accurate name.
Updated in v4.
Quoted 8 lines
Quoted 8 lines
net/mptcp/protocol.h +0
-0rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; }
Quoted 9 lines
net/mptcp/protocol.h static inline void mptcp_subflow_tcp_fallback(struct sock *sk, · line 604
Quoted 7 lines
net/mptcp/protocol.h +7
-0+static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow)Why check
tmp->fully_establishedhere?
I'll drop tmp->fully_established, and rename this function mptcp_has_another_subflow to check whether there's a single subflow.
In my test, this MP_FAIL patchset only works in the multiple subflows case. The receiver detected the bad checksum, sent RST + MP_FAIL to close this subflow and discard the data with the bad checksum. Then the sender will retransmit a new data with good checksum from other subflow. And the receiver can resemble the whole data successfully.
But the single subflow case dosen't work. I don't know how the new data can be retransmitted from the sender side when it fallback to regular TCP. So I'm not sure how to implement the single subflow case.
Could you please give me some suggestions?
Thanks,
-Geliang
Quoted 59 lines
- Mat
Quoted 46 lines
net/mptcp/protocol.h +6
-0+return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );net/mptcp/subflow.c +2
-0@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +16
-1+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers -- Quoted 4 lines
2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 3/8] mptcp: send out MP_FAIL when data checksum fail
Quoted 47 lines · Geliang Tang
Hi Mat,
Sorry for late response on this.
Quoted 35 lines · Mat Martineau <[email protected]> 于2021年7月8日周四 上午7:20写道:
Quoted 21 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILoption.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption.When a single subfow is in use, send back an
MP_FAILoption on the subflow-level ACK. And the receiver of thisMP_FAILrespond with anMP_FAILin the reverse direction.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)net/mptcp/pm.c +0
-0net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 257
Quoted 8 lines
net/mptcp/pm.c +3
-0@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) {The pm.lock isn't held so it's not safe to access pm.subflows
Quoted 6 lines
I don't think it's sufficient to read pm.subflows with the lock or add READ_ONCE/WRITE_ONCE, since that would still allow race conditions with the msk. To handle fallback when receiving
MP_FAILI think thesock_owned_by_user()checks and delegated callback (similar tomptcp_subflow_process_delegated()) may be needed.
Quoted 3 lines
I think it's better to use the below
mptcp_has_another_subflow()function here instead of usingmsk->pm.subflowsto check the single subflow case.
Yes, that sounds good.
Quoted 9 lines
Quoted 7 lines
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 260
Quoted 3 lines
net/mptcp/pm.c +3
-0+if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq;Echoing the
fail_seqback doesn't seem correct, from the RFC it seems like this side should send a sequence number for the opposite data direction? Do you agree?So we should use '
subflow->fail_seq=subflow->map_seq;' here?
I think so - but I'm concerned about the possibility of out-of-order data and checking for single- or multiple-subflow cases. I need to look at the RFC some more to tell for sure.
Quoted 21 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/pm.c +4
-0+ }else { + subflow->mp_fail_need_echo =0 ; + } + } }Quoted 12 lines
net/mptcp/protocol.h struct mptcp_subflow_context { · line 425
Quoted 10 lines
net/mptcp/pm.c +0
-0/* path manager helpers */ net/mptcp/protocol.h +1
-0@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1,I think
mp_fail_expect_echowould be a more accurate name.
Quoted 2 lines
Updated in v4.
Ok.
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/protocol.h +0
-0rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; }Quoted 9 lines
net/mptcp/protocol.h static inline void mptcp_subflow_tcp_fallback(struct sock *sk, · line 604
Quoted 7 lines
net/mptcp/protocol.h +7
-0+static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow)Why check
tmp->fully_establishedhere?
Quoted 2 lines
I'll drop
tmp->fully_established, and rename this functionmptcp_has_another_subflowto check whether there's a single subflow.
Sounds good.
Quoted 8 lines
In my test, this
MP_FAILpatchset only works in the multiple subflows case. The receiver detected the bad checksum, sent RST +MP_FAILto close this subflow and discard the data with the bad checksum. Then the sender will retransmit a new data with good checksum from other subflow. And the receiver can resemble the whole data successfully.
Quoted 5 lines
But the single subflow case dosen't work. I don't know how the new data can be retransmitted from the sender side when it fallback to regular TCP. So I'm not sure how to implement the single subflow case.
Could you please give me some suggestions?
Yes, the multiple subflow case is the simpler one this time. We can throw away the affected subflow and recover using the others.
Since the non-contiguous, single subflow case has to close the subflow, that's more like the "easier" case.
So, it's the infinite mapping case that's tricky. Have you looked at the multipath-tcp.org code? The important part seems to be using the information in the infinite mapping to determine what data to keep or throw away before beginning "fallback" behavior. I can look at the infinite mapping information in the RFC and see how that fits with our implementation tomorrow.
- Mat
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
net/mptcp/protocol.h +6
-0+return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );net/mptcp/subflow.c +2
-0@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +13
-0+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/subflow.c +3
-1+ } + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers -- 2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 3/8] mptcp: send out MP_FAIL when data checksum fail
Hi Mat,
Quoted 139 lines · Mat Martineau <[email protected]> 于2021年7月14日周三 上午4:35写道:
Quoted 47 lines · Geliang Tang
Hi Mat,
Sorry for late response on this.
Quoted 35 lines · Mat Martineau <[email protected]> 于2021年7月8日周四 上午7:20写道:
Quoted 21 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILoption.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption.When a single subfow is in use, send back an
MP_FAILoption on the subflow-level ACK. And the receiver of thisMP_FAILrespond with anMP_FAILin the reverse direction.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)net/mptcp/pm.c +0
-0net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 257
Quoted 8 lines
net/mptcp/pm.c +3
-0@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) {The pm.lock isn't held so it's not safe to access pm.subflows
Quoted 6 lines
I don't think it's sufficient to read pm.subflows with the lock or add READ_ONCE/WRITE_ONCE, since that would still allow race conditions with the msk. To handle fallback when receiving
MP_FAILI think thesock_owned_by_user()checks and delegated callback (similar tomptcp_subflow_process_delegated()) may be needed.Quoted 3 lines
I think it's better to use the below
mptcp_has_another_subflow()function here instead of usingmsk->pm.subflowsto check the single subflow case.Yes, that sounds good.
Quoted 9 lines
Quoted 7 lines
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 260
Quoted 3 lines
net/mptcp/pm.c +3
-0+if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq;Echoing the
fail_seqback doesn't seem correct, from the RFC it seems like this side should send a sequence number for the opposite data direction? Do you agree?So we should use '
subflow->fail_seq=subflow->map_seq;' here?I think so - but I'm concerned about the possibility of out-of-order data and checking for single- or multiple-subflow cases. I need to look at the RFC some more to tell for sure.
Quoted 21 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/pm.c +4
-0+ }else { + subflow->mp_fail_need_echo =0 ; + } + } }Quoted 12 lines
net/mptcp/protocol.h struct mptcp_subflow_context { · line 425
Quoted 10 lines
net/mptcp/pm.c +0
-0/* path manager helpers */ net/mptcp/protocol.h +1
-0@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1,I think
mp_fail_expect_echowould be a more accurate name.Quoted 2 lines
Updated in v4.
Ok.
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/protocol.h +0
-0rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; }Quoted 9 lines
net/mptcp/protocol.h static inline void mptcp_subflow_tcp_fallback(struct sock *sk, · line 604
Quoted 7 lines
net/mptcp/protocol.h +7
-0+static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow)Why check
tmp->fully_establishedhere?Quoted 2 lines
I'll drop
tmp->fully_established, and rename this functionmptcp_has_another_subflowto check whether there's a single subflow.Sounds good.
Quoted 8 lines
In my test, this
MP_FAILpatchset only works in the multiple subflows case. The receiver detected the bad checksum, sent RST +MP_FAILto close this subflow and discard the data with the bad checksum. Then the sender will retransmit a new data with good checksum from other subflow. And the receiver can resemble the whole data successfully.Quoted 5 lines
But the single subflow case dosen't work. I don't know how the new data can be retransmitted from the sender side when it fallback to regular TCP. So I'm not sure how to implement the single subflow case.
Could you please give me some suggestions?
Yes, the multiple subflow case is the simpler one this time. We can throw away the affected subflow and recover using the others.
Since the non-contiguous, single subflow case has to close the subflow, that's more like the "easier" case.
Quoted 7 lines
So, it's the infinite mapping case that's tricky. Have you looked at the multipath-tcp.org code? The important part seems to be using the information in the infinite mapping to determine what data to keep or throw away before beginning "fallback" behavior. I can look at the infinite mapping information in the RFC and see how that fits with our implementation tomorrow.
Thanks for your help.
I want to split this patchset into two part, "MP_FAIL support" and "the infinite mapping support".
In the MP_FAIL part, just deal with the multiple subflows case, the easier case. Include the MP_FAIL sending and MP_FAIL receiving code in the part. This part had been implemented and tested. I'll send a v4 for it.
And put the single subflow case into the new "infinite mapping" part. I'll add a new ticket on github to trace it, and send a RFC version for it later. It seems that there's still a lot of work to do in this part.
Do you agree?
-Geliang
Quoted 55 lines
- Mat
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
net/mptcp/protocol.h +6
-0+return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );net/mptcp/subflow.c +2
-0@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +13
-0+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/subflow.c +3
-1+ } + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers -- 2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 3/8] mptcp: send out MP_FAIL when data checksum fail
Quoted 159 lines · Geliang Tang
Hi Mat,
Quoted 139 lines · Mat Martineau <[email protected]> 于2021年7月14日周三 上午4:35写道:
Quoted 47 lines · Geliang Tang
Hi Mat,
Sorry for late response on this.
Quoted 35 lines · Mat Martineau <[email protected]> 于2021年7月8日周四 上午7:20写道:
Quoted 21 lines · Geliang Tang
When a bad checksum is detected, send out the
MP_FAILoption.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption.When a single subfow is in use, send back an
MP_FAILoption on the subflow-level ACK. And the receiver of thisMP_FAILrespond with anMP_FAILin the reverse direction.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/pm.c | 10 ++++++++++ net/mptcp/protocol.h | 14 ++++++++++++++ net/mptcp/subflow.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+)net/mptcp/pm.c +0
-0net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 257
Quoted 8 lines
net/mptcp/pm.c +3
-0@@ -250,8 +250,18 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup)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" , subflow->map_seq, fail_seq); + +if (!msk->pm.subflows) {The pm.lock isn't held so it's not safe to access pm.subflows
Quoted 6 lines
I don't think it's sufficient to read pm.subflows with the lock or add READ_ONCE/WRITE_ONCE, since that would still allow race conditions with the msk. To handle fallback when receiving
MP_FAILI think thesock_owned_by_user()checks and delegated callback (similar tomptcp_subflow_process_delegated()) may be needed.Quoted 3 lines
I think it's better to use the below
mptcp_has_another_subflow()function here instead of usingmsk->pm.subflowsto check the single subflow case.Yes, that sounds good.
Quoted 9 lines
Quoted 7 lines
net/mptcp/pm.c void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup) · line 260
Quoted 3 lines
net/mptcp/pm.c +3
-0+if (!subflow->mp_fail_need_echo) { + subflow->send_mp_fail =1 ; + subflow->fail_seq = fail_seq;Echoing the
fail_seqback doesn't seem correct, from the RFC it seems like this side should send a sequence number for the opposite data direction? Do you agree?So we should use '
subflow->fail_seq=subflow->map_seq;' here?I think so - but I'm concerned about the possibility of out-of-order data and checking for single- or multiple-subflow cases. I need to look at the RFC some more to tell for sure.
Quoted 21 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/pm.c +4
-0+ }else { + subflow->mp_fail_need_echo =0 ; + } + } }Quoted 12 lines
net/mptcp/protocol.h struct mptcp_subflow_context { · line 425
Quoted 10 lines
net/mptcp/pm.c +0
-0/* path manager helpers */ net/mptcp/protocol.h +1
-0@@ -422,6 +422,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_need_echo : 1,I think
mp_fail_expect_echowould be a more accurate name.Quoted 2 lines
Updated in v4.
Ok.
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/protocol.h +0
-0rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1; /* ctx can be free at ulp release time */@@ -594,6 +595,19 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,inet_csk (sk)->icsk_af_ops = ctx->icsk_af_ops; }Quoted 9 lines
net/mptcp/protocol.h static inline void mptcp_subflow_tcp_fallback(struct sock *sk, · line 604
Quoted 7 lines
net/mptcp/protocol.h +7
-0+static inline bool mptcp_has_another_subflow_established (struct sock *ssk) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk), *tmp; +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +mptcp_for_each_subflow (msk, tmp) { +if (tmp->fully_established && tmp != subflow)Why check
tmp->fully_establishedhere?Quoted 2 lines
I'll drop
tmp->fully_established, and rename this functionmptcp_has_another_subflowto check whether there's a single subflow.Sounds good.
Quoted 8 lines
In my test, this
MP_FAILpatchset only works in the multiple subflows case. The receiver detected the bad checksum, sent RST +MP_FAILto close this subflow and discard the data with the bad checksum. Then the sender will retransmit a new data with good checksum from other subflow. And the receiver can resemble the whole data successfully.Quoted 5 lines
But the single subflow case dosen't work. I don't know how the new data can be retransmitted from the sender side when it fallback to regular TCP. So I'm not sure how to implement the single subflow case.
Could you please give me some suggestions?
Yes, the multiple subflow case is the simpler one this time. We can throw away the affected subflow and recover using the others.
Since the non-contiguous, single subflow case has to close the subflow, that's more like the "easier" case.
Quoted 7 lines
So, it's the infinite mapping case that's tricky. Have you looked at the multipath-tcp.org code? The important part seems to be using the information in the infinite mapping to determine what data to keep or throw away before beginning "fallback" behavior. I can look at the infinite mapping information in the RFC and see how that fits with our implementation tomorrow.
Thanks for your help.
I want to split this patchset into two part, "
MP_FAILsupport" and "the infinite mapping support".In the
MP_FAILpart, just deal with the multiple subflows case, the easier case. Include theMP_FAILsending andMP_FAILreceiving code in the part. This part had been implemented and tested. I'll send a v4 for it.
Quoted 5 lines
And put the single subflow case into the new "infinite mapping" part. I'll add a new ticket on github to trace it, and send a RFC version for it later. It seems that there's still a lot of work to do in this part.
Do you agree?
Yes, I think it would help to separate the single-subflow case like that. Thanks!
Mat
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
net/mptcp/protocol.h +6
-0+return true; + } + +return false; +} +void __init mptcp_proto_init (void );#if IS_ENABLED (CONFIG_MPTCP_IPV6 )int __init mptcp_proto_v6_init (void );net/mptcp/subflow.c +2
-0@@ -913,6 +913,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_DATACSUMERR ); + subflow->send_mp_fail =1 ; + subflow->fail_seq = subflow->map_seq;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1160,6 +1162,22 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +13
-0+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow_established (ssk)) { +mptcp_subflow_reset (ssk); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + +if (!msk->pm.subflows) { + subflow->mp_fail_need_echo =1 ; +WRITE_ONCE (subflow->data_avail,0 ); +return true;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
net/mptcp/subflow.c +3
-1+ } + } +if (subflow->mp_join || subflow->fully_established) {/* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers -- 2.31.1
--
Mat Martineau
Intel
Re: [MPTCP][PATCH v3 mptcp-next 1/8] mptcp: MP_FAIL suboption sending
In reply to Geliang TangQuoted 62 lines · Geliang Tang
This patch added the
MP_FAILsuboption sending support.Add a new flag named
send_mp_failin structmptcp_subflow_context. If this flag is set, send outMP_FAILsuboption.Add a new member
fail_seqin structmptcp_out_optionsto save the data sequence number to put into theMP_FAILsuboption.Signed-off-by Geliang Tang <[email protected]>---
include/net/mptcp.h | 1 + net/mptcp/options.c | 54 ++++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 57 insertions(+), 2 deletions(-)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 +22
-0@@ -771,6 +771,28 @@ static noinline void mptcp_established_options_rst(struct sock *sk, struct sk_bu opts->reset_reason = subflow->reset_reason; } +static bool mptcp_established_options_mp_fail (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +if (!subflow->send_mp_fail) +return false; + +if (remaining <TCPOLEN_MPTCP_FAIL ) +return false; + + *size =TCPOLEN_MPTCP_FAIL ; + opts->suboptions |=OPTION_MPTCP_FAIL ; + opts->fail_seq = subflow->fail_seq; + +pr_debug ("MP_FAIL fail_seq=%llu" , opts->fail_seq); + +return true; +} +bool mptcp_established_options (struct sock *sk,struct sk_buff *skb,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)@@ -787,15 +809,29 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,return false;
net/mptcp/options.c bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, · line 818
Quoted 10 lines
net/mptcp/options.c +7
-1if (unlikely (skb &&TCP_SKB_CB (skb)->tcp_flags &TCPHDR_RST )) { -mptcp_established_options_rst (sk, skb, size, remaining, opts); +if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + } +mptcp_established_options_rst (sk, skb, &opt_size, remaining, opts); + *size += opt_size; + remaining -= opt_size;
If there isn't enough space for MP_TCPRST, opt_size can still have the value set by mptcp_established_options_mp_fail() and the previous two lines would add or subtract incorrectly. mptcp_established_options_rst() could return bool to make the size adjustments conditional like the new mp_fail lines above.
- Mat
Quoted 82 lines
net/mptcp/options.c +23
-1return true; } snd_data_fin =mptcp_data_fin_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { ret = true; +if (opts->ext_copy.use_ack) { +if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + ret = true; + } + } + }/* we reserved enough space for the above options, and exceeding the * TCP option space would be fatal @@ -1334,6 +1370,20 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, opts->backup, TCPOPT_NOP); } +if (OPTION_MPTCP_FAIL & opts->suboptions) { +const struct sock *ssk = (const struct sock *)tp; +struct mptcp_subflow_context *subflow; + + subflow =mptcp_subflow_ctx (ssk); + subflow->send_mp_fail =0 ; + + *ptr++ =mptcp_option (MPTCPOPT_MP_FAIL , +TCPOLEN_MPTCP_FAIL , +0 ,0 ); +put_unaligned_be64 (opts->fail_seq, ptr); + ptr +=2 ; + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,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)@@ -417,6 +419,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 */@@ -431,6 +434,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
--
Mat Martineau
Intel
Paolo Abeni
maintainerRe: [MPTCP][PATCH v3 mptcp-next 1/8] mptcp: MP_FAIL suboption sending
In reply to Geliang TangQuoted 20 lines · Geliang Tang
This patch added the
MP_FAILsuboption sending support.Add a new flag named
send_mp_failin structmptcp_subflow_context. If this flag is set, send outMP_FAILsuboption.Add a new member
fail_seqin structmptcp_out_optionsto save the data sequence number to put into theMP_FAILsuboption.Signed-off-by Geliang Tang <[email protected]>--- include/net/mptcp.h | 1 + net/mptcp/options.c | 54 ++++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 57 insertions(+), 2 deletions(-)include/net/mptcp.h +0
-0
include/net/mptcp.h struct mptcp_out_options { · line 75
Quoted 4 lines
include/net/mptcp.h +1
-0@@ -72,6 +72,7 @@ struct mptcp_out_options {u32 nonce;u64 thmac;u32 token; +u64 fail_seq;
Since we can't have both a valid mapping and MP_FAIL in the same packet, it would be better to avoid increasing the 'mptcp_out_options' size, e.g. re-using some ext_copy field, or unioning with some other field.
mptcp_out_options has grown quite a bit and we should really look into shrinking it.
Quoted 48 lines
include/net/mptcp.h +0
-0u8 hmac[20 ];struct mptcp_ext ext_copy;#endif net/mptcp/options.c +29
-1@@ -771,6 +771,28 @@ static noinline void mptcp_established_options_rst(struct sock *sk, struct sk_bu opts->reset_reason = subflow->reset_reason; } +static bool mptcp_established_options_mp_fail (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +if (!subflow->send_mp_fail) +return false; + +if (remaining <TCPOLEN_MPTCP_FAIL ) +return false; + + *size =TCPOLEN_MPTCP_FAIL ; + opts->suboptions |=OPTION_MPTCP_FAIL ; + opts->fail_seq = subflow->fail_seq; + +pr_debug ("MP_FAIL fail_seq=%llu" , opts->fail_seq); + +return true; +} +bool mptcp_established_options (struct sock *sk,struct sk_buff *skb,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)@@ -787,15 +809,29 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,return false;if (unlikely (skb &&TCP_SKB_CB (skb)->tcp_flags &TCPHDR_RST )) { -mptcp_established_options_rst (sk, skb, size, remaining, opts); +if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + } +mptcp_established_options_rst (sk, skb, &opt_size, remaining, opts); + *size += opt_size; + remaining -= opt_size;
net/mptcp/options.c bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, · line 827
Quoted 10 lines
net/mptcp/options.c +2
-1return true; } snd_data_fin =mptcp_data_fin_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { ret = true; +if (opts->ext_copy.use_ack) {
Is the extra check on 'opts->ext_copy.use_ack' necessary? can we just look for mp_fail?
Quoted 67 lines
net/mptcp/options.c +21
-0+if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + ret = true; + } + } + }/* we reserved enough space for the above options, and exceeding the * TCP option space would be fatal @@ -1334,6 +1370,20 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, opts->backup, TCPOPT_NOP); } +if (OPTION_MPTCP_FAIL & opts->suboptions) { +const struct sock *ssk = (const struct sock *)tp; +struct mptcp_subflow_context *subflow; + + subflow =mptcp_subflow_ctx (ssk); + subflow->send_mp_fail =0 ; + + *ptr++ =mptcp_option (MPTCPOPT_MP_FAIL , +TCPOLEN_MPTCP_FAIL , +0 ,0 ); +put_unaligned_be64 (opts->fail_seq, ptr); + ptr +=2 ; + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,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)@@ -417,6 +419,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 */@@ -431,6 +434,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 */
Re: [MPTCP][PATCH v3 mptcp-next 1/8] mptcp: MP_FAIL suboption sending
Hi Paolo,
Thanks for your review!
Quoted 17 lines · Paolo Abeni <[email protected]> 于2021年7月14日周三 下午4:45写道:
Quoted 15 lines · Geliang Tang
This patch added the
MP_FAILsuboption sending support.Add a new flag named
send_mp_failin structmptcp_subflow_context. If this flag is set, send outMP_FAILsuboption.Add a new member
fail_seqin structmptcp_out_optionsto save the data sequence number to put into theMP_FAILsuboption.Signed-off-by Geliang Tang <[email protected]>--- include/net/mptcp.h | 1 + net/mptcp/options.c | 54 ++++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 57 insertions(+), 2 deletions(-)
Quoted 14 lines
include/net/mptcp.h struct mptcp_out_options { · line 75
Quoted 9 lines
include/net/mptcp.h +1
-0@@ -72,6 +72,7 @@ struct mptcp_out_options {u32 nonce;u64 thmac;u32 token; +u64 fail_seq;Since we can't have both a valid mapping and
MP_FAILin the same packet, it would be better to avoid increasing the 'mptcp_out_options' size, e.g. re-using someext_copyfield, or unioning with some other field.
The RFC says an MP_FAIL option could be included in a RST or on the subflow-level ACK. So I think we can't re-using the ext_copy field if it's on the subflow-level ACK.
How about unioning this fail_seq field with ahmac field?
Quoted 55 lines
mptcp_out_optionshas grown quite a bit and we should really look into shrinking it.Quoted 51 lines
include/net/mptcp.h +0
-0u8 hmac[20 ];struct mptcp_ext ext_copy;#endif net/mptcp/options.c +29
-1@@ -771,6 +771,28 @@ static noinline void mptcp_established_options_rst(struct sock *sk, struct sk_bu opts->reset_reason = subflow->reset_reason; } +static bool mptcp_established_options_mp_fail (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +if (!subflow->send_mp_fail) +return false; + +if (remaining <TCPOLEN_MPTCP_FAIL ) +return false; + + *size =TCPOLEN_MPTCP_FAIL ; + opts->suboptions |=OPTION_MPTCP_FAIL ; + opts->fail_seq = subflow->fail_seq; + +pr_debug ("MP_FAIL fail_seq=%llu" , opts->fail_seq); + +return true; +} +bool mptcp_established_options (struct sock *sk,struct sk_buff *skb,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)@@ -787,15 +809,29 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,return false;if (unlikely (skb &&TCP_SKB_CB (skb)->tcp_flags &TCPHDR_RST )) { -mptcp_established_options_rst (sk, skb, size, remaining, opts); +if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + } +mptcp_established_options_rst (sk, skb, &opt_size, remaining, opts); + *size += opt_size; + remaining -= opt_size;return true; }
Quoted 11 lines
net/mptcp/options.c bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, · line 827
Quoted 7 lines
net/mptcp/options.c +2
-1snd_data_fin =mptcp_data_fin_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { ret = true; +if (opts->ext_copy.use_ack) {Is the extra check on '
opts->ext_copy.use_ack' necessary? can we just look formp_fail?
I added this check since the RFC says an MP_FAIL option could be included on the subflow-level ACK:
'''
In this case, if a receiver identifies a checksum failure when there is only one path, it will send back an MP_FAIL option on the subflow-level ACK, referring to the data-level sequence number of the start of the segment on which the checksum error was detected.
'''
Do I understand right?
Thanks,
-Geliang
Quoted 69 lines
Quoted 68 lines
net/mptcp/options.c +21
-0+if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + ret = true; + } + } + }/* we reserved enough space for the above options, and exceeding the * TCP option space would be fatal @@ -1334,6 +1370,20 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, opts->backup, TCPOPT_NOP); } +if (OPTION_MPTCP_FAIL & opts->suboptions) { +const struct sock *ssk = (const struct sock *)tp; +struct mptcp_subflow_context *subflow; + + subflow =mptcp_subflow_ctx (ssk); + subflow->send_mp_fail =0 ; + + *ptr++ =mptcp_option (MPTCPOPT_MP_FAIL , +TCPOLEN_MPTCP_FAIL , +0 ,0 ); +put_unaligned_be64 (opts->fail_seq, ptr); + ptr +=2 ; + } +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { *ptr++ = mptcp_option(MPTCPOPT_MP_JOIN, TCPOLEN_MPTCP_MPJ_SYN,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)@@ -417,6 +419,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 */@@ -431,6 +434,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 */
Paolo Abeni
maintainerRe: [MPTCP][PATCH v3 mptcp-next 1/8] mptcp: MP_FAIL suboption sending
Quoted 107 lines · Geliang Tang
Quoted 16 lines · Paolo Abeni <[email protected]> 于2021年7月14日周三 下午4:45写道:
Quoted 15 lines · Geliang Tang
This patch added the
MP_FAILsuboption sending support.Add a new flag named
send_mp_failin structmptcp_subflow_context. If this flag is set, send outMP_FAILsuboption.Add a new member
fail_seqin structmptcp_out_optionsto save the data sequence number to put into theMP_FAILsuboption.Signed-off-by Geliang Tang <[email protected]>--- include/net/mptcp.h | 1 + net/mptcp/options.c | 54 ++++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 57 insertions(+), 2 deletions(-)Quoted 14 lines
include/net/mptcp.h struct mptcp_out_options { · line 75
Quoted 9 lines
include/net/mptcp.h +1
-0@@ -72,6 +72,7 @@ struct mptcp_out_options {u32 nonce;u64 thmac;u32 token; +u64 fail_seq;Since we can't have both a valid mapping and
MP_FAILin the same packet, it would be better to avoid increasing the 'mptcp_out_options' size, e.g. re-using someext_copyfield, or unioning with some other field.The RFC says an
MP_FAILoption could be included in a RST or on the subflow-level ACK. So I think we can't re-using theext_copyfield if it's on the subflow-level ACK.How about unioning this
fail_seqfield with ahmac field?Quoted 54 lines
mptcp_out_optionshas grown quite a bit and we should really look into shrinking it.Quoted 51 lines
include/net/mptcp.h +0
-0u8 hmac[20 ];struct mptcp_ext ext_copy;#endif net/mptcp/options.c +29
-1@@ -771,6 +771,28 @@ static noinline void mptcp_established_options_rst(struct sock *sk, struct sk_bu opts->reset_reason = subflow->reset_reason; } +static bool mptcp_established_options_mp_fail (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); + +if (!subflow->send_mp_fail) +return false; + +if (remaining <TCPOLEN_MPTCP_FAIL ) +return false; + + *size =TCPOLEN_MPTCP_FAIL ; + opts->suboptions |=OPTION_MPTCP_FAIL ; + opts->fail_seq = subflow->fail_seq; + +pr_debug ("MP_FAIL fail_seq=%llu" , opts->fail_seq); + +return true; +} +bool mptcp_established_options (struct sock *sk,struct sk_buff *skb,unsigned int *size,unsigned int remaining,struct mptcp_out_options *opts)@@ -787,15 +809,29 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,return false;if (unlikely (skb &&TCP_SKB_CB (skb)->tcp_flags &TCPHDR_RST )) { -mptcp_established_options_rst (sk, skb, size, remaining, opts); +if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { + *size += opt_size; + remaining -= opt_size; + } +mptcp_established_options_rst (sk, skb, &opt_size, remaining, opts); + *size += opt_size; + remaining -= opt_size;return true; }Quoted 11 lines
net/mptcp/options.c bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, · line 827
Quoted 7 lines
net/mptcp/options.c +2
-1snd_data_fin =mptcp_data_fin_enabled (msk);if (mptcp_established_options_mp (sk, skb, snd_data_fin, &opt_size, remaining, opts)) ret = true; -else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) +else if (mptcp_established_options_dss (sk, skb, snd_data_fin, &opt_size, remaining, opts)) { ret = true; +if (opts->ext_copy.use_ack) {Is the extra check on '
opts->ext_copy.use_ack' necessary? can we just look formp_fail?I added this check since the RFC says an
MP_FAILoption could be included on the subflow-level ACK:
Quoted 8 lines
'''
In this case, if a receiver identifies a checksum failure when there is only one path, it will send back anMP_FAILoption on the subflow-level ACK, referring to the data-level sequence number of the start of the segment on which the checksum error was detected.
'''Do I understand right?
Not a big deal, but I read the above as follow:
the MP_FAIL is included into the next subflow packet/
subflow-level ACK really means TCP-level ACK, I think. Since the subflow is established (at TCP level) each TCP packet will carry an ack.
All in all the ' if (opts->ext_copy.use_ack) {' check looks unneeded to me.
Cheers,
Paolo