MP_FAIL support
Subsystems (3)
v4 cover MP_FAIL support
v4:
- just deal with the multiple subflows case, put the single subflow case into the new 'infinite mapping' part.
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 (5):
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
include/net/mptcp.h | 5 +- net/mptcp/mib.c | 2 + net/mptcp/mib.h | 2 + net/mptcp/options.c | 78 ++++++++++++++++++- net/mptcp/pm.c | 8 ++ net/mptcp/protocol.h | 19 +++++ net/mptcp/subflow.c | 16 ++++ .../testing/selftests/net/mptcp/mptcp_join.sh | 38 +++++++++ 8 files changed, 163 insertions(+), 5 deletions(-)
Signature · 1 line
2.31.1
PATCH v4 1/5 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.
An MP_FAIL option could be included in a RST or on the subflow-level ACK.
--- include/net/mptcp.h | 5 +++- net/mptcp/options.c | 61 +++++++++++++++++++++++++++++++++++++++++--- net/mptcp/protocol.h | 3 +++ 3 files changed, 64 insertions(+), 5 deletions(-)
include/net/mptcp.h +4 -1
@@ -60,7 +60,10 @@ struct mptcp_out_options {u16 suboptions;u64 sndr_key;u64 rcvr_key; -u64 ahmac; +union { +u64 ahmac; +u64 fail_seq; + };struct mptcp_addr_info addr;struct mptcp_rm_list rm_list;u8 join_id;
net/mptcp/options.c +57 -4
97 lines not on this page · raw message
net/mptcp/protocol.h +3 -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)
@@ -425,6 +427,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 */
Signature · 1 line
2.31.1
PATCH v4 2/5 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 );
@@ -1137,6 +1148,11 @@ bool 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)
@@ -711,6 +713,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 v4 3/5 mptcp: send out MP_FAIL when data checksum fail
When a bad checksum is detected, set the send_mp_fail flag to send out the MP_FAIL option.
Add a new function mptcp_has_another_subflow() to check whether there's only a single subflow.
When multiple subflows are in use, close the affected subflow with a RST that includes an MP_FAIL option and discard the data with the bad checksum.
Set the sk_state of the subsocket to TCP_CLOSE, then the flag MPTCP_WORK_CLOSE_SUBFLOW will be set in subflow_sched_work_if_closed, and the subflow will be closed.
--- net/mptcp/protocol.h | 13 +++++++++++++ net/mptcp/subflow.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+)
net/mptcp/protocol.h +13 -0
@@ -601,6 +601,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 (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 != 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 +15 -0
@@ -908,6 +908,7 @@ 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 ;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }
@@ -1155,6 +1156,20 @@ 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 (ssk)) { + ssk->sk_err =EBADMSG ; +tcp_set_state (ssk,TCP_CLOSE ); + subflow->reset_transient =0 ; + subflow->reset_reason =MPTCP_RST_EMIDDLEBOX ; +tcp_send_active_reset (ssk,GFP_ATOMIC ); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +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 v4 4/5 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 | 1 + net/mptcp/subflow.c | 1 + 5 files changed, 7 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_ITEM ("RcvPruned" ,MPTCP_MIB_RCVPRUNED ), 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_RCVPRUNED ,/* Incoming packet dropped due to memory limit */ __MPTCP_MIB_MAX };
net/mptcp/options.c +1 -0
@@ -1150,6 +1150,7 @@ bool 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 +1 -0
@@ -9,6 +9,7 @@#include <net/tcp.h> #include <net/mptcp.h> #include "protocol.h" +#include "mib.h" /* path manager command handlers */
net/mptcp/subflow.c +1 -0
@@ -909,6 +909,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff *if (unlikely (csum_fold (csum))) {MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_DATACSUMERR ); subflow->send_mp_fail =1 ; +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPFAILTX );return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }
Signature · 1 line
2.31.1
PATCH v4 5/5 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 $ns2 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
Re: [MPTCP][PATCH v4 mptcp-next 3/5] mptcp: send out MP_FAIL when data checksum fail
In reply to Geliang TangQuoted 64 lines · Geliang Tang
When a bad checksum is detected, set the
send_mp_failflag to send out theMP_FAILoption.Add a new function
mptcp_has_another_subflow()to check whether there's only a single subflow.When multiple subflows are in use, close the affected subflow with a RST that includes an
MP_FAILoption and discard the data with the bad checksum.Set the
sk_stateof the subsocket toTCP_CLOSE, then the flagMPTCP_WORK_CLOSE_SUBFLOWwill be set insubflow_sched_work_if_closed, and the subflow will be closed.Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/protocol.h| 13 +++++++++++++net/mptcp/subflow.c| 15 +++++++++++++++2 files changed, 28 insertions(+)net/mptcp/protocol.h +13
-0@@ -601,6 +601,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 (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 != 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 +1
-0@@ -908,6 +908,7 @@ 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 ;return subflow->mp_join ?MAPPING_INVALID :MAPPING_DUMMY ; }@@ -1155,6 +1156,20 @@ static bool subflow_check_data_avail(struct sock *ssk)fallback:
/* RFC 8684 section 3.7. */net/mptcp/subflow.c +4
-0+if (subflow->send_mp_fail) { +if (mptcp_has_another_subflow (ssk)) { + ssk->sk_err =EBADMSG ; +tcp_set_state (ssk,TCP_CLOSE );
net/mptcp/subflow.c static bool subflow_check_data_avail(struct sock *ssk) · line 1172
Quoted 10 lines
net/mptcp/subflow.c +10
-0+ subflow->reset_transient =0 ; + subflow->reset_reason =MPTCP_RST_EMIDDLEBOX ; +tcp_send_active_reset (ssk,GFP_ATOMIC ); +while ((skb =skb_peek (&ssk->sk_receive_queue))) +sk_eat_skb (ssk, skb); +WRITE_ONCE (subflow->data_avail,0 ); +return true; + } + } +
The above handles the multiple-subflow case...
Quoted 3 lines
if (subflow->mp_join || subflow->fully_established) {
/* fatal protocol error, close the socket.
* subflow_error_report() will introduce the appropriate barriers...and since the infinite-mapping code and other single-subflow logic will be in a later patch set, should the single-subflow case be temporarily handled here by sending MP_TCPRST instead of MP_FAIL?
--
Mat Martineau
Intel