niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mptcp: token: move retry to caller

Browse source 
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.

Therefore, move the retry logic to the caller to prepare for syncookie
support in mptcp.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2020-07-30 21:25:51 +02:00 • committed by David S. Miller
parent f8ace8d915
commit 535fb8152f
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/mptcp/subflow.c
View file

@ -126,11 +126,18 @@ static void subflow_init_req(struct request_sock *req,
} }
if (mp_opt.mp_capable && listener->request_mptcp) { 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); err = mptcp_token_new_request(req);
if (err == 0) if (err == 0)
subflow_req->mp_capable = 1; subflow_req->mp_capable = 1;
else if (retries-- > 0)
goto again;
subflow_req->ssn_offset = TCP_SKB_CB(skb)->seq; subflow_req->ssn_offset = TCP_SKB_CB(skb)->seq;
} else if (mp_opt.mp_join && listener->request_mptcp) { } else if (mp_opt.mp_join && listener->request_mptcp) {

12
net/mptcp/token.c
View file

@ -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) int mptcp_token_new_request(struct request_sock *req)
{ {
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
int retries = TOKEN_MAX_RETRIES;
struct token_bucket *bucket; struct token_bucket *bucket;
u32 token; u32 token;
again: mptcp_crypto_key_sha(subflow_req->local_key,
mptcp_crypto_key_gen_sha(&subflow_req->local_key, &subflow_req->token,
&subflow_req->token, &subflow_req->idsn);
&subflow_req->idsn);
pr_debug("req=%p local_key=%llu, token=%u, idsn=%llu\n", pr_debug("req=%p local_key=%llu, token=%u, idsn=%llu\n",
req, subflow_req->local_key, subflow_req->token, req, subflow_req->local_key, subflow_req->token,
subflow_req->idsn); subflow_req->idsn);
@ -126,9 +124,7 @@ again:
spin_lock_bh(&bucket->lock); spin_lock_bh(&bucket->lock);
if (__token_bucket_busy(bucket, token)) { if (__token_bucket_busy(bucket, token)) {
spin_unlock_bh(&bucket->lock); spin_unlock_bh(&bucket->lock);
if (!--retries) return -EBUSY;
return -EBUSY;
goto again;
} }
hlist_nulls_add_head_rcu(&subflow_req->token_node, &bucket->req_chain); hlist_nulls_add_head_rcu(&subflow_req->token_node, &bucket->req_chain);