mptcp: add syncookie support
Subsystems (7)
v2 cover mptcp: add syncookie support
Changes in v2:
- first patch renames req->ts_cookie to req->syncookie instead of removing ts_cookie member.
- patch to add 'want_cookie' arg to init_req() functions has been dropped. All users of that arg were changed to check 'req->syncookie' instead.
v1 cover letter:
When syn-cookies are used the SYN?ACK never contains a MPTCP option, because the code path that creates a request socket based on a valid cookie ACK lacks the needed changes to construct MPTCP request sockets.
After this series, if SYN carries MP_CAPABLE option, the option is not cleared anymore and request socket will be reconstructed using the MP_CAPABLE option data that is re-sent with the ACK.
This means that no additional state gets encoded into the syn cookie or the TCP timestamp.
There are two caveats for SYN-Cookies with MPTCP:
1. When syn-cookies are used, the server-generated key is not stored. The drawback is that the next connection request that comes in before the cookie-ACK has a small chance that it will generate the same local_key.
If this happens, the cookie ACK that comes in second will (re)compute the token hash and then detects that this is already in use. Unlike normal case, where the server will pick a new key value and then re-tries, we can't do that because we already committed to the key value (it was sent to peer already).
Im this case, MPTCP cannot be used and late TCP fallback happens.
2). SYN packets with a MP_JOIN requests cannot be handled without storing
state. This is because the SYN contains a nonce value that is needed to verify the HMAC of the MP_JOIN ACK that completes the three-way handshake. Also, a local nonce is generated and used in the cookie SYN/ACK.
There are only 2 ways to solve this:
a) Do not support JOINs when cookies are in effect.
b) Store the nonces somewhere.
The approach chosen here is b).
Patch 8 adds a fixed-size (1024 entries) state table to store the information required to validate the MP_JOIN ACK and re-build the request socket.
State gets stored when syn-cookies are active and the token in the JOIN request referred to an established MPTCP connection that can also accept a new subflow.
State is restored if the ACK cookie is valid, an MP_JOIN option is present and the state slot contains valid data from a previous SYN.
After the request socket has been re-build, normal HMAC check is done just as without syn cookies.
Largely identical to last RFC, except patch #8 which follows Paolos suggestion to use a private table storage area rather than keeping request sockets around. This also means I dropped the patch to remove const qualifier from sk_listener pointers.
Florian Westphal (9):
tcp: rename request_sock cookie_ts bit to syncookie
mptcp: token: move retry to caller
mptcp: subflow: split subflow_init_req
mptcp: rename and export mptcp_subflow_request_sock_ops
mptcp: subflow: add mptcp_subflow_init_cookie_req helper
tcp: syncookies: create mptcp request socket for ACK cookies with MPTCP option
mptcp: enable JOIN requests even if cookies are in use
selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally
selftests: mptcp: add test cases for mptcp join tests with syn cookies
drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- include/net/mptcp.h | 11 ++ include/net/request_sock.h | 2 +- include/net/tcp.h | 2 + net/ipv4/syncookies.c | 44 ++++++- net/ipv4/tcp_input.c | 6 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/syncookies.c | 5 +- net/mptcp/Makefile | 1 + net/mptcp/ctrl.c | 1 + net/mptcp/protocol.h | 21 ++++ net/mptcp/subflow.c | 116 +++++++++++++++--- net/mptcp/syncookies.c | 132 +++++++++++++++++++++ net/mptcp/token.c | 38 ++++-- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 47 ++++++++ tools/testing/selftests/net/mptcp/mptcp_join.sh | 66 ++++++++++- 16 files changed, 453 insertions(+), 43 deletions(-) create mode 100644 net/mptcp/syncookies.c
PATCH v2 1/9 tcp: rename request_sock cookie_ts bit to syncookie
Nowadays output function has a 'synack_type' argument that tells us when the syn/ack is emitted via syncookies.
The request already tells us when timestamps are supported, so check both to detect special timestamp for tcp option encoding is needed.
We could remove cookie_ts altogether, but a followup patch would otherwise need to adjust function signatures to pass 'want_cookie' to mptcp core.
This way, the 'existing' bit can be used.
--- drivers/crypto/chelsio/chtls/chtls_cm.c | 2 +- include/net/request_sock.h | 2 +- net/ipv4/tcp_input.c | 3 +-- net/ipv4/tcp_output.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
drivers/crypto/chelsio/chtls/chtls_cm.c +1 -1
@@ -1348,7 +1348,7 @@ static void chtls_pass_accept_request(struct sock *sk, oreq->rsk_rcv_wnd =0 ; oreq->rsk_window_clamp =0 ; - oreq->cookie_ts =0 ; + oreq->syncookie =0 ; oreq->mss =0 ; oreq->ts_recent =0 ;
include/net/request_sock.h +1 -1
@@ -54,7 +54,7 @@ struct request_sock {struct request_sock *dl_next;u16 mss;u8 num_retrans;/* number of retransmits */ - u8 cookie_ts:1; /* syncookie: encode tcpopts in timestamp */ + u8 syncookie:1; /* syncookie: encode tcpopts in timestamp */ u8 num_timeout:7; /* number of timeouts */u32 ts_recent;struct timer_list rsk_timer;
net/ipv4/tcp_input.c +1 -2
@@ -6519,7 +6519,6 @@ static void tcp_openreq_init(struct request_sock *req,struct inet_request_sock *ireq =inet_rsk (req); req->rsk_rcv_wnd =0 ;/* So that tcp_send_synack() knows! */ - req->cookie_ts =0 ;tcp_rsk (req)->rcv_isn =TCP_SKB_CB (skb)->seq;tcp_rsk (req)->rcv_nxt =TCP_SKB_CB (skb)->seq +1 ;tcp_rsk (req)->snt_synack =0 ;
@@ -6674,6 +6673,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,if (!req) goto drop; + req->syncookie = want_cookie;tcp_rsk (req)->af_specific = af_ops;tcp_rsk (req)->ts_off =0 ;#if IS_ENABLED (CONFIG_MPTCP )
@@ -6739,7 +6739,6 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,if (want_cookie) { isn =cookie_init_sequence (af_ops, sk, skb, &req->mss); - req->cookie_ts = tmp_opt.tstamp_ok;if (!tmp_opt.tstamp_ok)inet_rsk (req)->ecn_ok =0 ; }
net/ipv4/tcp_output.c +1 -1
@@ -3393,7 +3393,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,memset (&opts,0 ,sizeof (opts)); now =tcp_clock_ns ();#ifdef CONFIG_SYN_COOKIES -if (unlikely (req->cookie_ts)) +if (unlikely (synack_type ==TCP_SYNACK_COOKIE && ireq->tstamp_ok)) skb->skb_mstamp_ns =cookie_init_timestamp (req, now); else#endif
Signature · 1 line
2.26.2
PATCH v2 2/9 mptcp: token: move retry to caller
In reply to Florian WestphalOnce syncookie support is added, no state will be stored anymore when the syn/ack is generated in syncookie mode.
When the ACK comes back, the generated key will be taken from the TCP ACK, the token is re-generated and inserted into the token tree.
This means we can't retry with a new key when the token is already taken in the syncookie case.
Therefore, move the retry logic to the caller to prepare for syncookie support in mptcp.
--- net/mptcp/subflow.c | 9 ++++++++- net/mptcp/token.c | 12 ++++-------- 2 files changed, 12 insertions(+), 9 deletions(-)
net/mptcp/subflow.c +8 -1
@@ -126,11 +126,18 @@ static void subflow_init_req(struct request_sock *req, }if (mp_opt.mp_capable && listener->request_mptcp) { -int err; +int err, retries =4 ; + +again: +do { +get_random_bytes (&subflow_req->local_key,sizeof (subflow_req->local_key)); + }while (subflow_req->local_key ==0 ); err =mptcp_token_new_request (req);if (err ==0 ) subflow_req->mp_capable =1 ; +else if (retries-- >0 ) + goto again; subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; }else if (mp_opt.mp_join && listener->request_mptcp) {
net/mptcp/token.c +4 -8
@@ -109,14 +109,12 @@ static void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn)int mptcp_token_new_request (struct request_sock *req) {struct mptcp_subflow_request_sock *subflow_req =mptcp_subflow_rsk (req); -int retries =TOKEN_MAX_RETRIES ;struct token_bucket *bucket;u32 token; -again: -mptcp_crypto_key_gen_sha (&subflow_req->local_key, - &subflow_req->token, - &subflow_req->idsn); +mptcp_crypto_key_sha (subflow_req->local_key, + &subflow_req->token, + &subflow_req->idsn);pr_debug ("req=%p local_key=%llu, token=%u, idsn=%llu\n" , req, subflow_req->local_key, subflow_req->token, subflow_req->idsn);
@@ -126,9 +124,7 @@ int mptcp_token_new_request(struct request_sock *req)spin_lock_bh (&bucket->lock);if (__token_bucket_busy (bucket, token)) {spin_unlock_bh (&bucket->lock); -if (!--retries) -return -EBUSY ; - goto again; +return -EBUSY ; }hlist_nulls_add_head_rcu (&subflow_req->token_node, &bucket->req_chain);
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 2/9] mptcp: token: move retry to caller
Quoted 9 lines · Florian Westphal
Once syncookie support is added, no state will be stored anymore when the syn/ack is generated in syncookie mode.
When the ACK comes back, the generated key will be taken from the TCP ACK, the token is re-generated and inserted into the token tree.
This means we can't retry with a new key when the token is already taken in the syncookie case.
Quoted 8 lines
Therefore, move the retry logic to the caller to prepare for syncookie support in mptcp.
Signed-off-by Florian Westphal <[email protected]>---
net/mptcp/subflow.c| 9 ++++++++-net/mptcp/token.c| 12 ++++--------2 files changed, 12 insertions(+), 9 deletions(-)
--
Mat Martineau
Intel
PATCH v2 3/9 mptcp: subflow: split subflow_init_req
In reply to Florian WestphalWhen syncookie support is added, we will need to add a variant of subflow_init_req() helper. It will do almost same thing except that it will not compute/add a token to the mptcp token tree.
To avoid excess copy&paste, this commit splits away part of the code into a new helper, __subflow_init_req, that can then be re-used from the 'no insert' function added in a followup change.
--- net/mptcp/subflow.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
net/mptcp/subflow.c +22 -10
@@ -91,17 +91,9 @@ static struct mptcp_sock *subflow_token_join_request(struct request_sock *req,return msk; } -static void subflow_init_req (struct request_sock *req, -const struct sock *sk_listener, -struct sk_buff *skb) +static int __subflow_init_req (struct request_sock *req,const struct sock *sk_listener) { -struct mptcp_subflow_context *listener =mptcp_subflow_ctx (sk_listener);struct mptcp_subflow_request_sock *subflow_req =mptcp_subflow_rsk (req); -struct mptcp_options_received mp_opt; - -pr_debug ("subflow_req=%p, listener=%p" , subflow_req, listener); - -mptcp_get_options (skb, &mp_opt); subflow_req->mp_capable =0 ; subflow_req->mp_join =0 ;
@@ -113,9 +105,29 @@ static void subflow_init_req(struct request_sock *req,* TCP option space. */ if (rcu_access_pointer (tcp_sk (sk_listener)->md5sig_info)) -return ; +return -EINVAL ;#endif +return 0 ; +} + +static void subflow_init_req (struct request_sock *req, +const struct sock *sk_listener, +struct sk_buff *skb) +{ +struct mptcp_subflow_context *listener =mptcp_subflow_ctx (sk_listener); +struct mptcp_subflow_request_sock *subflow_req =mptcp_subflow_rsk (req); +struct mptcp_options_received mp_opt; +int ret; + +pr_debug ("subflow_req=%p, listener=%p" , subflow_req, listener); + + ret =__subflow_init_req (req, sk_listener); +if (ret) +return ; + +mptcp_get_options (skb, &mp_opt); +if (mp_opt.mp_capable) {SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_MPCAPABLEPASSIVE );
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 3/9] mptcp: subflow: split subflow_init_req
Quoted 4 lines · Florian Westphal
When syncookie support is added, we will need to add a variant of
subflow_init_req()helper. It will do almost same thing except that it will not compute/add a token to the mptcp token tree.
Quoted 9 lines
To avoid excess copy&paste, this commit splits away part of the code into a new helper,
__subflow_init_req, that can then be re-used from the 'no insert' function added in a followup change.Signed-off-by Florian Westphal <[email protected]>---
net/mptcp/subflow.c| 32 ++++++++++++++++++++++----------1 file changed, 22 insertions(+), 10 deletions(-)
--
Mat Martineau
Intel
PATCH v2 4/9 mptcp: rename and export mptcp_subflow_request_sock_ops
In reply to Florian Westphalsyncookie code path needs to create an mptcp request sock.
Prepare for this and add mptcp prefix plus needed export of ops struct.
--- include/net/mptcp.h | 1 + net/mptcp/subflow.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-)
include/net/mptcp.h +1 -0
@@ -58,6 +58,7 @@ struct mptcp_out_options { };#ifdef CONFIG_MPTCP +extern struct request_sock_ops mptcp_subflow_request_sock_ops;void mptcp_init (void );
net/mptcp/subflow.c +6 -5
@@ -284,7 +284,8 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)tcp_done (sk); } -static struct request_sock_ops subflow_request_sock_ops; +struct request_sock_ops mptcp_subflow_request_sock_ops; +EXPORT_SYMBOL_GPL (mptcp_subflow_request_sock_ops);static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops;static int subflow_v4_conn_request (struct sock *sk,struct sk_buff *skb)
@@ -297,7 +298,7 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)if (skb_rtable (skb)->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) goto drop; -return tcp_conn_request (&subflow_request_sock_ops, +return tcp_conn_request (&mptcp_subflow_request_sock_ops, &subflow_request_sock_ipv4_ops, sk, skb); drop:
@@ -322,7 +323,7 @@ static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)if (!ipv6_unicast_destination (skb)) goto drop; -return tcp_conn_request (&subflow_request_sock_ops, +return tcp_conn_request (&mptcp_subflow_request_sock_ops, &subflow_request_sock_ipv6_ops, sk, skb); drop:
@@ -1311,8 +1312,8 @@ static int subflow_ops_init(struct request_sock_ops *subflow_ops)void __init mptcp_subflow_init (void ) { - subflow_request_sock_ops = tcp_request_sock_ops; -if (subflow_ops_init (&subflow_request_sock_ops) !=0 ) + mptcp_subflow_request_sock_ops = tcp_request_sock_ops; +if (subflow_ops_init (&mptcp_subflow_request_sock_ops) !=0 )panic ("MPTCP: failed to init subflow request sock ops\n" ); subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops;
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 4/9] mptcp: rename and export mptcp_subflow_request_sock_ops
Quoted 9 lines · Florian Westphal
syncookie code path needs to create an mptcp request sock.
Prepare for this and add mptcp prefix plus needed export of ops struct.
Signed-off-by Florian Westphal <[email protected]>---
include/net/mptcp.h| 1 +net/mptcp/subflow.c| 11 ++++++-----2 files changed, 7 insertions(+), 5 deletions(-)
--
Mat Martineau
Intel
PATCH v2 5/9 mptcp: subflow: add mptcp_subflow_init_cookie_req helper
In reply to Florian WestphalWill be used to initialize the mptcp request socket when a MP_CAPABLE request was handled in syncookie mode, i.e. when a TCP ACK containing a MP_CAPABLE option is a valid syncookie value.
Normally (non-cookie case), MPTCP will generate a unique 32 bit connection ID and stores it in the MPTCP token storage to be able to retrieve the mptcp socket for subflow joining.
In syncookie case, we do not want to store any state, so just generate the unique ID and use it in the reply.
This means there is a small window where another connection could generate the same token.
When Cookie ACK comes back, we check that the token has not been registered in the mean time. If it was, the connection needs to fall back to TCP.
Changes in v2:
- use req->syncookie instead of passing 'want_cookie' arg to ->init_req() (Eric Dumazet)
--- include/net/mptcp.h | 10 +++++++++ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 50 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/token.c | 26 +++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-)
include/net/mptcp.h +10 -0
@@ -131,6 +131,9 @@ static inline bool mptcp_skb_can_collapse(const struct sk_buff *to, }void mptcp_seq_show (struct seq_file *seq); +int mptcp_subflow_init_cookie_req (struct request_sock *req, +const struct sock *sk_listener, +struct sk_buff *skb);#else static inline void mptcp_init (void )
@@ -200,6 +203,13 @@ static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,static inline void mptcp_space (const struct sock *ssk,int *s,int *fs) { }static inline void mptcp_seq_show (struct seq_file *seq) { } + +static inline int mptcp_subflow_init_cookie_req (struct request_sock *req, +const struct sock *sk_listener, +struct sk_buff *skb) +{ +return 0 ;/* TCP fallback */ +}#endif /* CONFIG_MPTCP */ #if IS_ENABLED (CONFIG_MPTCP_IPV6 )
net/mptcp/protocol.h +1 -0
@@ -400,6 +400,7 @@ void mptcp_token_destroy_request(struct request_sock *req);int mptcp_token_new_connect (struct sock *sk);void mptcp_token_accept (struct mptcp_subflow_request_sock *r,struct mptcp_sock *msk); +bool mptcp_token_exists (u32 token);struct mptcp_sock *mptcp_token_get_sock (u32 token);struct mptcp_sock *mptcp_token_iter_next (const struct net *net,long *s_slot,long *s_num);
net/mptcp/subflow.c +49 -1
73 lines not on this page · raw message
net/mptcp/token.c +26 -0
@@ -204,6 +204,32 @@ void mptcp_token_accept(struct mptcp_subflow_request_sock *req,spin_unlock_bh (&bucket->lock); } +bool mptcp_token_exists (u32 token) +{ +struct hlist_nulls_node *pos; +struct token_bucket *bucket; +struct mptcp_sock *msk; +struct sock *sk; + +rcu_read_lock (); + bucket =token_bucket (token); + +again: +sk_nulls_for_each_rcu (sk, pos, &bucket->msk_chain) { + msk =mptcp_sk (sk); +if (READ_ONCE (msk->token) == token) + goto found; + } +if (get_nulls_value (pos) != (token & token_mask)) + goto again; + +rcu_read_unlock (); +return false; +found: +rcu_read_unlock (); +return true; +} +/** * mptcp_token_get_sock - retrieve mptcp connection sock using its token * @token: token of the mptcp connection to retrieve
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 5/9] mptcp: subflow: add mptcp_subflow_init_cookie_req helper
Quoted 21 lines · Florian Westphal
Will be used to initialize the mptcp request socket when a
MP_CAPABLErequest was handled in syncookie mode, i.e. when a TCP ACK containing aMP_CAPABLEoption is a valid syncookie value.Normally (non-cookie case), MPTCP will generate a unique 32 bit connection ID and stores it in the MPTCP token storage to be able to retrieve the mptcp socket for subflow joining.
In syncookie case, we do not want to store any state, so just generate the unique ID and use it in the reply.
This means there is a small window where another connection could generate the same token.
When Cookie ACK comes back, we check that the token has not been registered in the mean time. If it was, the connection needs to fall back to TCP.
Changes in v2:
- usereq->syncookieinstead of passing 'want_cookie' arg to ->init_req() (Eric Dumazet)
Quoted 7 lines
Signed-off-by Florian Westphal <[email protected]>---
include/net/mptcp.h | 10 +++++++++ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 50 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/token.c | 26 +++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-)
--
Mat Martineau
Intel
PATCH v2 6/9 tcp: syncookies: create mptcp request socket for ACK cookies with MPTCP option
In reply to Florian WestphalIf SYN packet contains MP_CAPABLE option, keep it enabled. Syncokie validation and cookie-based socket creation is changed to instantiate an mptcp request sockets if the ACK contains an MPTCP connection request.
Rather than extend both cookie_v4/6_check, add a common helper to create the (mp)tcp request socket.
--- include/net/tcp.h | 2 ++ net/ipv4/syncookies.c | 38 ++++++++++++++++++++++++++++++++++---- net/ipv4/tcp_input.c | 3 --- net/ipv6/syncookies.c | 5 +---- 4 files changed, 37 insertions(+), 11 deletions(-)
include/net/tcp.h +2 -0
@@ -469,6 +469,8 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,int __cookie_v4_check (const struct iphdr *iph,const struct tcphdr *th,u32 cookie);struct sock *cookie_v4_check (struct sock *sk,struct sk_buff *skb); +struct request_sock *cookie_tcp_reqsk_alloc (const struct request_sock_ops *ops, +struct sock *sk,struct sk_buff *skb);#ifdef CONFIG_SYN_COOKIES /* Syncookies use a monotonic timer which increments every 60 seconds.
net/ipv4/syncookies.c +34 -4
@@ -276,6 +276,39 @@ bool cookie_ecn_ok(const struct tcp_options_received *tcp_opt, }EXPORT_SYMBOL (cookie_ecn_ok); +struct request_sock *cookie_tcp_reqsk_alloc (const struct request_sock_ops *ops, +struct sock *sk, +struct sk_buff *skb) +{ +struct tcp_request_sock *treq; +struct request_sock *req; + +#ifdef CONFIG_MPTCP +if (sk_is_mptcp (sk)) + ops = &mptcp_subflow_request_sock_ops; +#endif + + req =inet_reqsk_alloc (ops, sk, false); +if (!req) +return NULL ; + +#if IS_ENABLED (CONFIG_MPTCP ) + treq =tcp_rsk (req); + treq->is_mptcp =sk_is_mptcp (sk); +if (treq->is_mptcp) { +int err =mptcp_subflow_init_cookie_req (req, sk, skb); + +if (err) { +reqsk_free (req); +return NULL ; + } + } +#endif + +return req; +} +EXPORT_SYMBOL_GPL (cookie_tcp_reqsk_alloc); +/* On input, sk is a listener. * Output is listener if incoming packet would not create a child * NULL if memory could not be allocated.
@@ -326,7 +359,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) goto out; ret =NULL ; - req =inet_reqsk_alloc (&tcp_request_sock_ops, sk, false);/* for safety */ + req =cookie_tcp_reqsk_alloc (&tcp_request_sock_ops, sk, skb);if (!req) goto out;
@@ -350,9 +383,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) treq->snt_synack =0 ; treq->tfo_listener = false; -if (IS_ENABLED (CONFIG_MPTCP )) - treq->is_mptcp =0 ; -if (IS_ENABLED (CONFIG_SMC )) ireq->smc_ok =0 ;
net/ipv4/tcp_input.c +0 -3
@@ -6701,9 +6701,6 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, af_ops->init_req (req, sk, skb); -if (IS_ENABLED (CONFIG_MPTCP ) && want_cookie) -tcp_rsk (req)->is_mptcp =0 ; -if (security_inet_conn_request (sk, skb, req)) goto drop_and_free;
net/ipv6/syncookies.c +1 -4
@@ -170,7 +170,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) goto out; ret =NULL ; - req =inet_reqsk_alloc (&tcp6_request_sock_ops, sk, false); + req =cookie_tcp_reqsk_alloc (&tcp6_request_sock_ops, sk, skb);if (!req) goto out;
@@ -178,9 +178,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) treq =tcp_rsk (req); treq->tfo_listener = false; -if (IS_ENABLED (CONFIG_MPTCP )) - treq->is_mptcp =0 ; -if (security_inet_conn_request (sk, skb, req)) goto out_free;
Signature · 1 line
2.26.2
PATCH v2 7/9 mptcp: enable JOIN requests even if cookies are in use
In reply to Florian WestphalJOIN requests do not work in syncookie mode -- for HMAC validation, the peers nonce and the mptcp token (to obtain the desired connection socket the join is for) are required, but this information is only present in the initial syn.
So either we need to drop all JOIN requests once a listening socket enters syncookie mode, or we need to store enough state to reconstruct the request socket later.
This adds a state table (1024 entries) to store the data present in the MP_JOIN syn request and the random nonce used for the cookie syn/ack.
When a MP_JOIN ACK passed cookie validation, the table is consulted to rebuild the request socket from it.
An alternate approach would be to "cancel" syn-cookie mode and force MP_JOIN to always use a syn queue entry.
However, doing so brings the backlog over the configured queue limit.
v2: use req->syncookie, not (removed) want_cookie arg
--- net/ipv4/syncookies.c | 6 ++ net/mptcp/Makefile | 1 + net/mptcp/ctrl.c | 1 + net/mptcp/protocol.h | 20 +++++++ net/mptcp/subflow.c | 14 +++++ net/mptcp/syncookies.c | 132 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+) create mode 100644 net/mptcp/syncookies.c
net/ipv4/syncookies.c +6 -0
@@ -212,6 +212,12 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,refcount_set (&req->rsk_refcnt,1 );tcp_sk (child)->tsoffset = tsoff;sock_rps_save_rxhash (child, skb); + +if (tcp_rsk (req)->drop_req) { +refcount_set (&req->rsk_refcnt,2 ); +return child; + } +if (inet_csk_reqsk_queue_add (sk, req, child))return child;
net/mptcp/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \ mib.o pm_netlink.o +obj-$(CONFIG_SYN_COOKIES) += syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o mptcp_crypto_test-objs := crypto_test.o
net/mptcp/ctrl.c +1 -0
@@ -112,6 +112,7 @@ static struct pernet_operations mptcp_pernet_ops = {void __init mptcp_init (void ) { +mptcp_join_cookie_init ();mptcp_proto_init ();if (register_pernet_subsys (&mptcp_pernet_ops) <0 )
net/mptcp/protocol.h +20 -0
@@ -506,4 +506,24 @@ static inline bool subflow_simultaneous_connect(struct sock *sk) !subflow->conn_finished; } +#ifdef CONFIG_SYN_COOKIES +void subflow_init_req_cookie_join_save (const struct mptcp_subflow_request_sock *subflow_req, +struct sk_buff *skb); +bool mptcp_token_join_cookie_init_state (struct mptcp_subflow_request_sock *subflow_req, +struct sk_buff *skb); +void __init mptcp_join_cookie_init (void ); +#else +static inline void +subflow_init_req_cookie_join_save (const struct mptcp_subflow_request_sock *subflow_req, +struct sk_buff *skb) {} +static inline bool +mptcp_token_join_cookie_init_state (struct mptcp_subflow_request_sock *subflow_req, +struct sk_buff *skb) +{ +return false; +} + +static inline void mptcp_join_cookie_init (void ) {} +#endif +#endif /* __MPTCP_PROTOCOL_H */
net/mptcp/subflow.c +14 -0
@@ -173,6 +173,12 @@ static void subflow_init_req(struct request_sock *req, subflow_req->token = mp_opt.token; subflow_req->remote_nonce = mp_opt.nonce; subflow_req->msk =subflow_token_join_request (req, skb); + +if (unlikely (req->syncookie) && subflow_req->msk) { +if (mptcp_can_accept_new_subflow (subflow_req->msk)) +subflow_init_req_cookie_join_save (subflow_req, skb); + } +pr_debug ("token=%u, remote_nonce=%u msk=%p" , subflow_req->token, subflow_req->remote_nonce, subflow_req->msk); }
@@ -207,6 +213,14 @@ int mptcp_subflow_init_cookie_req(struct request_sock *req, subflow_req->mp_capable =1 ; subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq -1 ; + }else if (mp_opt.mp_join && listener->request_mptcp) { +if (!mptcp_token_join_cookie_init_state (subflow_req, skb)) +return -EINVAL ; + +if (mptcp_can_accept_new_subflow (subflow_req->msk)) + subflow_req->mp_join =1 ; + + subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq -1 ; }return 0 ;
net/mptcp/syncookies.c new file +132 -0
132 lines not on this page · raw message
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 7/9] mptcp: enable JOIN requests even if cookies are in use
Quoted 25 lines · Florian Westphal
JOIN requests do not work in syncookie mode -- for HMAC validation, the peers nonce and the mptcp token (to obtain the desired connection socket the join is for) are required, but this information is only present in the initial syn.
So either we need to drop all JOIN requests once a listening socket enters syncookie mode, or we need to store enough state to reconstruct the request socket later.
This adds a state table (1024 entries) to store the data present in the
MP_JOINsyn request and the random nonce used for the cookie syn/ack.When a
MP_JOINACK passed cookie validation, the table is consulted to rebuild the request socket from it.An alternate approach would be to "cancel" syn-cookie mode and force
MP_JOINto always use a syn queue entry.However, doing so brings the backlog over the configured queue limit.
v2: use
req->syncookie, not (removed)want_cookieargSuggested-by Paolo Abeni <[email protected]>Signed-off-by Florian Westphal <[email protected]>---
Quoted 8 lines
net/ipv4/syncookies.c | 6 ++ net/mptcp/Makefile | 1 + net/mptcp/ctrl.c | 1 + net/mptcp/protocol.h | 20 +++++++ net/mptcp/subflow.c | 14 +++++ net/mptcp/syncookies.c | 132 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+)create mode 100644
net/mptcp/syncookies.c
--
Mat Martineau
Intel
Re: [PATCH v2 net-next 7/9] mptcp: enable JOIN requests even if cookies are in use
In reply to Florian WestphalQuoted 40 lines · Florian Westphal
JOIN requests do not work in syncookie mode -- for HMAC validation, the peers nonce and the mptcp token (to obtain the desired connection socket the join is for) are required, but this information is only present in the initial syn.
So either we need to drop all JOIN requests once a listening socket enters syncookie mode, or we need to store enough state to reconstruct the request socket later.
This adds a state table (1024 entries) to store the data present in the
MP_JOINsyn request and the random nonce used for the cookie syn/ack.When a
MP_JOINACK passed cookie validation, the table is consulted to rebuild the request socket from it.An alternate approach would be to "cancel" syn-cookie mode and force
MP_JOINto always use a syn queue entry.However, doing so brings the backlog over the configured queue limit.
v2: use
req->syncookie, not (removed)want_cookieargSuggested-by Paolo Abeni <[email protected]>Signed-off-by Florian Westphal <[email protected]>--- net/ipv4/syncookies.c | 6 ++ net/mptcp/Makefile | 1 + net/mptcp/ctrl.c | 1 + net/mptcp/protocol.h | 20 +++++++ net/mptcp/subflow.c | 14 +++++ net/mptcp/syncookies.c | 132 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+) create mode 100644 net/mptcp/syncookies.cnet/ipv4/syncookies.c +0
-0
net/ipv4/syncookies.c struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb, · line 220
Quoted 9 lines
net/ipv4/syncookies.c +6
-0@@ -212,6 +212,12 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,refcount_set (&req->rsk_refcnt,1 );tcp_sk (child)->tsoffset = tsoff;sock_rps_save_rxhash (child, skb); + +if (tcp_rsk (req)->drop_req) { +refcount_set (&req->rsk_refcnt,2 ); +return child; + } +
Hey, what happened to CONFIG_MPTCP=n ?
net/ipv4/syncookies.c: In function 'tcp_get_cookie_sock':net/ipv4/syncookies.c:216:19: error: 'struct tcp_request_sock' has no member named 'drop_req'
216 | if (tcp_rsk(req)->drop_req) {
| ^~net/ipv4/syncookies.c: In function 'cookie_tcp_reqsk_alloc':net/ipv4/syncookies.c:289:27: warning: unused variable 'treq' [-Wunused-variable]
289 | struct tcp_request_sock *treq;
| ^~~~
make[3]: *** [scripts/Makefile.build:280: net/ipv4/syncookies.o] Error 1 make[3]: *** Waiting for unfinished jobs....
PATCH v2 8/9 selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally
In reply to Florian Westphalcheck we can establish connections also when syn cookies are in use.
Check that
MPTcpExtMPCapableSYNRX and MPTcpExtMPCapableACKRX increase for each MPTCP test.
Check TcpExtSyncookiesSent and TcpExtSyncookiesRecv increase in netns2.
--- .../selftests/net/mptcp/mptcp_connect.sh | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_connect.sh +47 -0
@@ -196,6 +196,9 @@ ip -net "$ns4" link set ns4eth3 up ip -net "$ns4" route add default via 10.0.3.2 ip -net "$ns4" route add default via dead:beef:3::2 +# use TCP syn cookies, even if no flooding was detected. +ip netns exec "$ns2" sysctl -q net.ipv4.tcp_syncookies=2 + set_ethtool_flags() { local ns="$1" local dev="$2"
@@ -407,6 +410,11 @@ do_transfer() sleep 1 fi + local stat_synrx_last_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableSYNRX | while read a count c rest ;do echo $count;done) + local stat_ackrx_last_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableACKRX | while read a count c rest ;do echo $count;done) + local stat_cookietx_last=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesSent | while read a count c rest ;do echo $count;done) + local stat_cookierx_last=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesRecv | while read a count c rest ;do echo $count;done) + ip netns exec ${listener_ns} ./mptcp_connect -t $timeout -l -p $port -s ${srv_proto} $extra_args $local_addr < "$sin" > "$sout" & local spid=$!
@@ -450,6 +458,45 @@ do_transfer() check_transfer $cin $sout "file received by server" rets=$? + local stat_synrx_now_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableSYNRX | while read a count c rest ;do echo $count;done) + local stat_ackrx_now_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableACKRX | while read a count c rest ;do echo $count;done) + + local stat_cookietx_now=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesSent | while read a count c rest ;do echo $count;done) + local stat_cookierx_now=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesRecv | while read a count c rest ;do echo $count;done) + + expect_synrx=$((stat_synrx_last_l)) + expect_ackrx=$((stat_ackrx_last_l)) + + cookies=$(ip netns exec ${listener_ns} sysctl net.ipv4.tcp_syncookies) + cookies=${cookies##*=} + + if [ ${cl_proto} = "MPTCP" ] && [ ${srv_proto} = "MPTCP" ]; then + expect_synrx=$((stat_synrx_last_l+1)) + expect_ackrx=$((stat_ackrx_last_l+1)) + fi + if [ $cookies -eq 2 ];then + if [ $stat_cookietx_last -ge $stat_cookietx_now ] ;then + echo "${listener_ns} CookieSent: ${cl_proto} -> ${srv_proto}: did not advance" + fi + if [ $stat_cookierx_last -ge $stat_cookierx_now ] ;then + echo "${listener_ns} CookieRecv: ${cl_proto} -> ${srv_proto}: did not advance" + fi + else + if [ $stat_cookietx_last -ne $stat_cookietx_now ] ;then + echo "${listener_ns} CookieSent: ${cl_proto} -> ${srv_proto}: changed" + fi + if [ $stat_cookierx_last -ne $stat_cookierx_now ] ;then + echo "${listener_ns} CookieRecv: ${cl_proto} -> ${srv_proto}: changed" + fi + fi + + if [ $expect_synrx -ne $stat_synrx_now_l ] ;then + echo "${listener_ns} SYNRX: ${cl_proto} -> ${srv_proto}: expect ${expect_synrx}, got ${stat_synrx_now_l}" + fi + if [ $expect_ackrx -ne $stat_ackrx_now_l ] ;then + echo "${listener_ns} ACKRX: ${cl_proto} -> ${srv_proto}: expect ${expect_synrx}, got ${stat_synrx_now_l}" + fi + if [ $retc -eq 0 ] && [ $rets -eq 0 ];then echo "$duration [ OK ]" cat "$capout"
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 8/9] selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally
Quoted 6 lines · Florian Westphal
check we can establish connections also when syn cookies are in use.
Check that
MPTcpExtMPCapableSYNRX and MPTcpExtMPCapableACKRX increase for each MPTCP test.
Quoted 6 lines
Check TcpExtSyncookiesSent and TcpExtSyncookiesRecv increase in netns2.
Signed-off-by Florian Westphal <[email protected]>---
.../selftests/net/mptcp/mptcp_connect.sh| 47 +++++++++++++++++++1 file changed, 47 insertions(+)
--
Mat Martineau
Intel
PATCH v2 9/9 selftests: mptcp: add test cases for mptcp join tests with syn cookies
In reply to Florian WestphalAlso add test cases with MP_JOIN when tcp_syncookies sysctl is 2 (i.e., syncookies are always-on).
While at it, also print the test number and add the test number to the pcap files that can be generated optionally.
This makes it easier to match the pcap to the test case.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +64 -2
@@ -72,6 +72,15 @@ reset() init } +reset_with_cookies() +{ + reset + + for netns in "$ns1" "$ns2";do + ip netns exec $netns sysctl -q net.ipv4.tcp_syncookies=2 + done +} + for arg in "$@"; do if [ "$arg" = "-c" ]; then capture=1
@@ -138,7 +147,7 @@ do_transfer() capuser="-Z $SUDO_USER" fi - capfile="mp_join-${listener_ns}.pcap" + capfile=$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "${listener_ns}") echo "Capturing traffic for test $TEST_COUNT into $capfile" ip netns exec ${listener_ns} tcpdump -i any -s 65535 -B 32768 $capuser -w $capfile > "$capout" 2>&1 &
@@ -227,7 +236,7 @@ chk_join_nr() local count local dump_stats - printf "%-36s %s" "$msg" "syn" + printf "%02u %-36s %s" "$TEST_COUNT" "$msg" "syn" count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{print $2}'` [ -z "$count" ] && count=0 if [ "$count" != "$syn_nr" ]; then
@@ -354,4 +363,57 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows and signal" 3 3 3 +# single subflow, syncookies +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "single subflow with syn cookies" 1 1 1 + +# multiple subflows with syn cookies +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "multiple subflows with syn cookies" 2 2 2 + +# multiple subflows limited by server +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "subflows limited by server w cookies" 2 2 1 + +# test signal address with cookies +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "signal address with syn cookies" 1 1 1 + +# test cookie with subflow and signal +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns1 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl limits 1 2 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "subflow and signal w cookies" 2 2 2 + +# accept and use add_addr with additional subflows +reset_with_cookies +ip netns exec $ns1 ./pm_nl_ctl limits 0 3 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns2 ./pm_nl_ctl limits 1 3 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 +chk_join_nr "subflows and signal w. cookies" 3 3 3 + exit $ret
Signature · 1 line
2.26.2
Re: [PATCH v2 net-next 9/9] selftests: mptcp: add test cases for mptcp join tests with syn cookies
Quoted 6 lines · Florian Westphal
Also add test cases with
MP_JOINwhentcp_syncookiessysctl is 2 (i.e., syncookies are always-on).While at it, also print the test number and add the test number to the pcap files that can be generated optionally.
Quoted 6 lines
This makes it easier to match the pcap to the test case.
Signed-off-by Florian Westphal <[email protected]>---
.../testing/selftests/net/mptcp/mptcp_join.sh| 66 ++++++++++++++++++-1 file changed, 64 insertions(+), 2 deletions(-)
--
Mat Martineau
Intel
David Miller
maintainerFrom: Florian Westphal <[email protected]>
Date: Thu, 30 Jul 2020 21:25:49 +0200
Quoted 1 line
Changes in v2:
...
Quoted 10 lines
When syn-cookies are used the SYN?ACK never contains a MPTCP option, because the code path that creates a request socket based on a valid cookie ACK lacks the needed changes to construct MPTCP request sockets.
After this series, if SYN carries
MP_CAPABLEoption, the option is not cleared anymore and request socket will be reconstructed using theMP_CAPABLEoption data that is re-sent with the ACK.This means that no additional state gets encoded into the syn cookie or the TCP timestamp.
...
Series applied, thanks Florian.
Quoted 13 lines · David Miller
From: Florian Westphal <[email protected]>
Date: Thu, 30 Jul 2020 21:25:49 +0200Quoted 1 line
Changes in v2:
...
Quoted 8 lines
When syn-cookies are used the SYN?ACK never contains a MPTCP option, because the code path that creates a request socket based on a valid cookie ACK lacks the needed changes to construct MPTCP request sockets.
After this series, if SYN carries
MP_CAPABLEoption, the option is not cleared anymore and request socket will be reconstructed using theMP_CAPABLEoption data that is re-sent with the ACK.
Quoted 6 lines
Quoted 2 lines
This means that no additional state gets encoded into the syn cookie or the TCP timestamp.
...
Series applied, thanks Florian.
Build is broken
I had to use :
net/ipv4/syncookies.c +3 -2
@@ -213,7 +213,7 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb,tcp_sk (child)->tsoffset = tsoff;sock_rps_save_rxhash (child, skb); -if (tcp_rsk (req)->drop_req) { +if (rsk_drop_req (req)) {refcount_set (&req->rsk_refcnt,2 );return child; }
@@ -286,10 +286,11 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops,struct sock *sk, struct sk_buff *skb) { - struct tcp_request_sock *treq; struct request_sock *req;#ifdef CONFIG_MPTCP +struct tcp_request_sock *treq; +if (sk_is_mptcp (sk)) ops = &mptcp_subflow_request_sock_ops;#endif