Blame view
net/mptcp/subflow.c
37.9 KB
2303f994b mptcp: Associate ... |
1 2 3 4 5 |
// SPDX-License-Identifier: GPL-2.0 /* Multipath TCP * * Copyright (c) 2017 - 2019, Intel Corporation. */ |
79c0949e9 mptcp: Add key ge... |
6 |
#define pr_fmt(fmt) "MPTCP: " fmt |
2303f994b mptcp: Associate ... |
7 8 9 |
#include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> |
f296234c9 mptcp: Add handli... |
10 |
#include <crypto/algapi.h> |
bd6972226 mptcp: use untrun... |
11 |
#include <crypto/sha.h> |
2303f994b mptcp: Associate ... |
12 13 14 15 16 |
#include <net/sock.h> #include <net/inet_common.h> #include <net/inet_hashtables.h> #include <net/protocol.h> #include <net/tcp.h> |
cec37a6e4 mptcp: Handle MP_... |
17 18 19 |
#if IS_ENABLED(CONFIG_MPTCP_IPV6) #include <net/ip6_route.h> #endif |
2303f994b mptcp: Associate ... |
20 |
#include <net/mptcp.h> |
4596a2c1b mptcp: allow crea... |
21 |
#include <uapi/linux/mptcp.h> |
2303f994b mptcp: Associate ... |
22 |
#include "protocol.h" |
fc518953b mptcp: add and us... |
23 24 25 26 27 28 29 |
#include "mib.h" static void SUBFLOW_REQ_INC_STATS(struct request_sock *req, enum linux_mptcp_mib_field field) { MPTCP_INC_STATS(sock_net(req_to_sk(req)), field); } |
2303f994b mptcp: Associate ... |
30 |
|
79c0949e9 mptcp: Add key ge... |
31 32 33 34 35 |
static void subflow_req_destructor(struct request_sock *req) { struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); pr_debug("subflow_req=%p", subflow_req); |
8fd4de127 mptcp: cache msk ... |
36 37 |
if (subflow_req->msk) sock_put((struct sock *)subflow_req->msk); |
2c5ebd001 mptcp: refactor t... |
38 |
mptcp_token_destroy_request(req); |
79c0949e9 mptcp: Add key ge... |
39 40 |
tcp_request_sock_ops.destructor(req); } |
f296234c9 mptcp: Add handli... |
41 42 43 44 45 46 47 48 49 50 |
static void subflow_generate_hmac(u64 key1, u64 key2, u32 nonce1, u32 nonce2, void *hmac) { u8 msg[8]; put_unaligned_be32(nonce1, &msg[0]); put_unaligned_be32(nonce2, &msg[4]); mptcp_crypto_hmac_sha(key1, key2, msg, 8, hmac); } |
4cf8b7e48 subflow: introduc... |
51 52 53 54 55 |
static bool mptcp_can_accept_new_subflow(const struct mptcp_sock *msk) { return mptcp_is_fully_established((void *)msk) && READ_ONCE(msk->pm.accept_subflow); } |
f296234c9 mptcp: Add handli... |
56 |
/* validate received token and create truncated hmac and nonce for SYN-ACK */ |
8fd4de127 mptcp: cache msk ... |
57 58 |
static struct mptcp_sock *subflow_token_join_request(struct request_sock *req, const struct sk_buff *skb) |
f296234c9 mptcp: Add handli... |
59 60 |
{ struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); |
bd6972226 mptcp: use untrun... |
61 |
u8 hmac[SHA256_DIGEST_SIZE]; |
f296234c9 mptcp: Add handli... |
62 63 64 65 66 |
struct mptcp_sock *msk; int local_id; msk = mptcp_token_get_sock(subflow_req->token); if (!msk) { |
fc518953b mptcp: add and us... |
67 |
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINNOTOKEN); |
8fd4de127 mptcp: cache msk ... |
68 |
return NULL; |
f296234c9 mptcp: Add handli... |
69 70 71 72 73 |
} local_id = mptcp_pm_get_local_id(msk, (struct sock_common *)req); if (local_id < 0) { sock_put((struct sock *)msk); |
8fd4de127 mptcp: cache msk ... |
74 |
return NULL; |
f296234c9 mptcp: Add handli... |
75 76 77 78 79 80 81 82 83 84 |
} subflow_req->local_id = local_id; get_random_bytes(&subflow_req->local_nonce, sizeof(u32)); subflow_generate_hmac(msk->local_key, msk->remote_key, subflow_req->local_nonce, subflow_req->remote_nonce, hmac); subflow_req->thmac = get_unaligned_be64(hmac); |
8fd4de127 mptcp: cache msk ... |
85 |
return msk; |
f296234c9 mptcp: Add handli... |
86 |
} |
78d8b7bc4 mptcp: subflow: s... |
87 |
static int __subflow_init_req(struct request_sock *req, const struct sock *sk_listener) |
cec37a6e4 mptcp: Handle MP_... |
88 |
{ |
cec37a6e4 mptcp: Handle MP_... |
89 |
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); |
cec37a6e4 mptcp: Handle MP_... |
90 91 |
subflow_req->mp_capable = 0; |
f296234c9 mptcp: Add handli... |
92 |
subflow_req->mp_join = 0; |
8fd4de127 mptcp: cache msk ... |
93 |
subflow_req->msk = NULL; |
2c5ebd001 mptcp: refactor t... |
94 |
mptcp_token_init_request(req); |
cec37a6e4 mptcp: Handle MP_... |
95 96 97 98 99 100 |
#ifdef CONFIG_TCP_MD5SIG /* no MPTCP if MD5SIG is enabled on this socket or we may run out of * TCP option space. */ if (rcu_access_pointer(tcp_sk(sk_listener)->md5sig_info)) |
78d8b7bc4 mptcp: subflow: s... |
101 |
return -EINVAL; |
cec37a6e4 mptcp: Handle MP_... |
102 |
#endif |
78d8b7bc4 mptcp: subflow: s... |
103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
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); |
cfde141ea mptcp: move optio... |
122 |
if (mp_opt.mp_capable) { |
fc518953b mptcp: add and us... |
123 |
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEPASSIVE); |
cfde141ea mptcp: move optio... |
124 |
if (mp_opt.mp_join) |
fc518953b mptcp: add and us... |
125 |
return; |
cfde141ea mptcp: move optio... |
126 |
} else if (mp_opt.mp_join) { |
fc518953b mptcp: add and us... |
127 128 |
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINSYNRX); } |
f296234c9 mptcp: Add handli... |
129 |
|
cfde141ea mptcp: move optio... |
130 |
if (mp_opt.mp_capable && listener->request_mptcp) { |
535fb8152 mptcp: token: mov... |
131 |
int err, retries = 4; |
c83a47e50 mptcp: subflow: a... |
132 |
subflow_req->ssn_offset = TCP_SKB_CB(skb)->seq; |
535fb8152 mptcp: token: mov... |
133 134 135 136 |
again: do { get_random_bytes(&subflow_req->local_key, sizeof(subflow_req->local_key)); } while (subflow_req->local_key == 0); |
79c0949e9 mptcp: Add key ge... |
137 |
|
c83a47e50 mptcp: subflow: a... |
138 139 140 141 142 143 144 145 146 147 148 149 |
if (unlikely(req->syncookie)) { mptcp_crypto_key_sha(subflow_req->local_key, &subflow_req->token, &subflow_req->idsn); if (mptcp_token_exists(subflow_req->token)) { if (retries-- > 0) goto again; } else { subflow_req->mp_capable = 1; } return; } |
79c0949e9 mptcp: Add key ge... |
150 151 152 |
err = mptcp_token_new_request(req); if (err == 0) subflow_req->mp_capable = 1; |
535fb8152 mptcp: token: mov... |
153 154 |
else if (retries-- > 0) goto again; |
79c0949e9 mptcp: Add key ge... |
155 |
|
cfde141ea mptcp: move optio... |
156 |
} else if (mp_opt.mp_join && listener->request_mptcp) { |
ec3edaa7c mptcp: Add handli... |
157 |
subflow_req->ssn_offset = TCP_SKB_CB(skb)->seq; |
f296234c9 mptcp: Add handli... |
158 |
subflow_req->mp_join = 1; |
cfde141ea mptcp: move optio... |
159 160 161 162 |
subflow_req->backup = mp_opt.backup; subflow_req->remote_id = mp_opt.join_id; subflow_req->token = mp_opt.token; subflow_req->remote_nonce = mp_opt.nonce; |
8fd4de127 mptcp: cache msk ... |
163 |
subflow_req->msk = subflow_token_join_request(req, skb); |
9466a1cce mptcp: enable JOI... |
164 165 166 167 168 |
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); } |
8fd4de127 mptcp: cache msk ... |
169 170 |
pr_debug("token=%u, remote_nonce=%u msk=%p", subflow_req->token, subflow_req->remote_nonce, subflow_req->msk); |
cec37a6e4 mptcp: Handle MP_... |
171 172 |
} } |
c83a47e50 mptcp: subflow: a... |
173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 |
int mptcp_subflow_init_cookie_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 err; err = __subflow_init_req(req, sk_listener); if (err) return err; mptcp_get_options(skb, &mp_opt); if (mp_opt.mp_capable && mp_opt.mp_join) return -EINVAL; if (mp_opt.mp_capable && listener->request_mptcp) { if (mp_opt.sndr_key == 0) return -EINVAL; subflow_req->local_key = mp_opt.rcvr_key; err = mptcp_token_new_request(req); if (err) return err; subflow_req->mp_capable = 1; subflow_req->ssn_offset = TCP_SKB_CB(skb)->seq - 1; |
9466a1cce mptcp: enable JOI... |
202 203 204 205 206 207 208 209 |
} 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; |
c83a47e50 mptcp: subflow: a... |
210 211 212 213 214 |
} return 0; } EXPORT_SYMBOL_GPL(mptcp_subflow_init_cookie_req); |
cec37a6e4 mptcp: Handle MP_... |
215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
static void subflow_v4_init_req(struct request_sock *req, const struct sock *sk_listener, struct sk_buff *skb) { tcp_rsk(req)->is_mptcp = 1; tcp_request_sock_ipv4_ops.init_req(req, sk_listener, skb); subflow_init_req(req, sk_listener, skb); } #if IS_ENABLED(CONFIG_MPTCP_IPV6) static void subflow_v6_init_req(struct request_sock *req, const struct sock *sk_listener, struct sk_buff *skb) { tcp_rsk(req)->is_mptcp = 1; tcp_request_sock_ipv6_ops.init_req(req, sk_listener, skb); subflow_init_req(req, sk_listener, skb); } #endif |
ec3edaa7c mptcp: Add handli... |
238 239 240 |
/* validate received truncated hmac and create hmac for third ACK */ static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow) { |
bd6972226 mptcp: use untrun... |
241 |
u8 hmac[SHA256_DIGEST_SIZE]; |
ec3edaa7c mptcp: Add handli... |
242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
u64 thmac; subflow_generate_hmac(subflow->remote_key, subflow->local_key, subflow->remote_nonce, subflow->local_nonce, hmac); thmac = get_unaligned_be64(hmac); pr_debug("subflow=%p, token=%u, thmac=%llu, subflow->thmac=%llu ", subflow, subflow->token, (unsigned long long)thmac, (unsigned long long)subflow->thmac); return thmac == subflow->thmac; } |
d58248472 mptcp: fix fallba... |
257 258 |
void mptcp_subflow_reset(struct sock *ssk) { |
0e4f35d78 mptcp: subflows g... |
259 260 |
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); struct sock *sk = subflow->conn; |
d58248472 mptcp: fix fallba... |
261 262 263 |
tcp_set_state(ssk, TCP_CLOSE); tcp_send_active_reset(ssk, GFP_ATOMIC); tcp_done(ssk); |
0e4f35d78 mptcp: subflows g... |
264 265 266 |
if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags) && schedule_work(&mptcp_sk(sk)->work)) sock_hold(sk); |
d58248472 mptcp: fix fallba... |
267 |
} |
cec37a6e4 mptcp: Handle MP_... |
268 269 270 |
static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); |
cfde141ea mptcp: move optio... |
271 |
struct mptcp_options_received mp_opt; |
c3c123d16 net: mptcp: don't... |
272 |
struct sock *parent = subflow->conn; |
cec37a6e4 mptcp: Handle MP_... |
273 274 |
subflow->icsk_af_ops->sk_rx_dst_set(sk, skb); |
1200832c6 mptcp: fix race i... |
275 |
if (inet_sk_state_load(parent) == TCP_SYN_SENT) { |
c3c123d16 net: mptcp: don't... |
276 277 278 |
inet_sk_state_store(parent, TCP_ESTABLISHED); parent->sk_state_change(parent); } |
263e1201a mptcp: consolidat... |
279 280 281 |
/* be sure no special action on any packet other than syn-ack */ if (subflow->conn_finished) return; |
b0977bb26 subflow: always i... |
282 |
subflow->rel_write_seq = 1; |
263e1201a mptcp: consolidat... |
283 |
subflow->conn_finished = 1; |
e1ff9e82e net: mptcp: impro... |
284 285 |
subflow->ssn_offset = TCP_SKB_CB(skb)->seq; pr_debug("subflow=%p synack seq=%x", subflow, subflow->ssn_offset); |
263e1201a mptcp: consolidat... |
286 |
|
cfde141ea mptcp: move optio... |
287 |
mptcp_get_options(skb, &mp_opt); |
fa25e815d mptcp: cleanup su... |
288 289 290 291 292 293 294 295 |
if (subflow->request_mptcp) { if (!mp_opt.mp_capable) { MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVEFALLBACK); mptcp_do_fallback(sk); pr_fallback(mptcp_sk(subflow->conn)); goto fallback; } |
263e1201a mptcp: consolidat... |
296 297 |
subflow->mp_capable = 1; subflow->can_ack = 1; |
cfde141ea mptcp: move optio... |
298 |
subflow->remote_key = mp_opt.sndr_key; |
263e1201a mptcp: consolidat... |
299 300 |
pr_debug("subflow=%p, remote_key=%llu", subflow, subflow->remote_key); |
fa25e815d mptcp: cleanup su... |
301 302 303 304 305 306 |
mptcp_finish_connect(sk); } else if (subflow->request_join) { u8 hmac[SHA256_DIGEST_SIZE]; if (!mp_opt.mp_join) goto do_reset; |
cfde141ea mptcp: move optio... |
307 308 |
subflow->thmac = mp_opt.thmac; subflow->remote_nonce = mp_opt.nonce; |
263e1201a mptcp: consolidat... |
309 310 |
pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u", subflow, subflow->thmac, subflow->remote_nonce); |
263e1201a mptcp: consolidat... |
311 |
|
ec3edaa7c mptcp: Add handli... |
312 |
if (!subflow_thmac_valid(subflow)) { |
fc518953b mptcp: add and us... |
313 |
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINACKMAC); |
ec3edaa7c mptcp: Add handli... |
314 315 316 317 318 319 |
goto do_reset; } subflow_generate_hmac(subflow->local_key, subflow->remote_key, subflow->local_nonce, subflow->remote_nonce, |
bd6972226 mptcp: use untrun... |
320 |
hmac); |
bd6972226 mptcp: use untrun... |
321 |
memcpy(subflow->hmac, hmac, MPTCPOPT_HMAC_LEN); |
ec3edaa7c mptcp: Add handli... |
322 |
|
ec3edaa7c mptcp: Add handli... |
323 324 |
if (!mptcp_finish_join(sk)) goto do_reset; |
fa25e815d mptcp: cleanup su... |
325 |
subflow->mp_join = 1; |
fc518953b mptcp: add and us... |
326 |
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNACKRX); |
fa25e815d mptcp: cleanup su... |
327 328 329 |
} else if (mptcp_check_fallback(sk)) { fallback: mptcp_rcv_space_init(mptcp_sk(parent), sk); |
cec37a6e4 mptcp: Handle MP_... |
330 |
} |
fa25e815d mptcp: cleanup su... |
331 332 333 |
return; do_reset: |
d58248472 mptcp: fix fallba... |
334 |
mptcp_subflow_reset(sk); |
cec37a6e4 mptcp: Handle MP_... |
335 |
} |
08b8d0809 mptcp: rename and... |
336 337 |
struct request_sock_ops mptcp_subflow_request_sock_ops; EXPORT_SYMBOL_GPL(mptcp_subflow_request_sock_ops); |
cec37a6e4 mptcp: Handle MP_... |
338 339 340 341 342 343 344 345 346 347 348 |
static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops; static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); pr_debug("subflow=%p", subflow); /* Never answer to SYNs sent to broadcast or multicast */ if (skb_rtable(skb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) goto drop; |
08b8d0809 mptcp: rename and... |
349 |
return tcp_conn_request(&mptcp_subflow_request_sock_ops, |
cec37a6e4 mptcp: Handle MP_... |
350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 |
&subflow_request_sock_ipv4_ops, sk, skb); drop: tcp_listendrop(sk); return 0; } #if IS_ENABLED(CONFIG_MPTCP_IPV6) static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops; static struct inet_connection_sock_af_ops subflow_v6_specific; static struct inet_connection_sock_af_ops subflow_v6m_specific; static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); pr_debug("subflow=%p", subflow); if (skb->protocol == htons(ETH_P_IP)) return subflow_v4_conn_request(sk, skb); if (!ipv6_unicast_destination(skb)) goto drop; |
08b8d0809 mptcp: rename and... |
373 |
return tcp_conn_request(&mptcp_subflow_request_sock_ops, |
cec37a6e4 mptcp: Handle MP_... |
374 375 376 377 378 379 380 |
&subflow_request_sock_ipv6_ops, sk, skb); drop: tcp_listendrop(sk); return 0; /* don't send reset */ } #endif |
f296234c9 mptcp: Add handli... |
381 382 |
/* validate hmac received in third ACK */ static bool subflow_hmac_valid(const struct request_sock *req, |
cfde141ea mptcp: move optio... |
383 |
const struct mptcp_options_received *mp_opt) |
f296234c9 mptcp: Add handli... |
384 385 |
{ const struct mptcp_subflow_request_sock *subflow_req; |
bd6972226 mptcp: use untrun... |
386 |
u8 hmac[SHA256_DIGEST_SIZE]; |
f296234c9 mptcp: Add handli... |
387 |
struct mptcp_sock *msk; |
f296234c9 mptcp: Add handli... |
388 389 |
subflow_req = mptcp_subflow_rsk(req); |
8fd4de127 mptcp: cache msk ... |
390 |
msk = subflow_req->msk; |
f296234c9 mptcp: Add handli... |
391 392 393 394 395 396 |
if (!msk) return false; subflow_generate_hmac(msk->remote_key, msk->local_key, subflow_req->remote_nonce, subflow_req->local_nonce, hmac); |
8fd4de127 mptcp: cache msk ... |
397 |
return !crypto_memneq(hmac, mp_opt->hmac, MPTCPOPT_HMAC_LEN); |
f296234c9 mptcp: Add handli... |
398 |
} |
df1036da9 mptcp: fix splat ... |
399 400 401 402 403 404 405 406 407 |
static void mptcp_sock_destruct(struct sock *sk) { /* if new mptcp socket isn't accepted, it is free'd * from the tcp listener sockets request queue, linked * from req->sk. The tcp socket is released. * This calls the ULP release function which will * also remove the mptcp socket, via * sock_put(ctx->conn). * |
7ee249263 mptcp: fix warn a... |
408 409 |
* Problem is that the mptcp socket will be in * ESTABLISHED state and will not have the SOCK_DEAD flag. |
df1036da9 mptcp: fix splat ... |
410 411 |
* Both result in warnings from inet_sock_destruct. */ |
7ee249263 mptcp: fix warn a... |
412 |
if (sk->sk_state == TCP_ESTABLISHED) { |
df1036da9 mptcp: fix splat ... |
413 414 415 416 |
sk->sk_state = TCP_CLOSE; WARN_ON_ONCE(sk->sk_socket); sock_orphan(sk); } |
5c8c16409 mptcp: add mptcp_... |
417 |
mptcp_destroy_common(mptcp_sk(sk)); |
df1036da9 mptcp: fix splat ... |
418 419 |
inet_sock_destruct(sk); } |
9f5ca6a59 mptcp: fix 'Attem... |
420 421 422 423 424 |
static void mptcp_force_close(struct sock *sk) { inet_sk_state_store(sk, TCP_CLOSE); sk_common_release(sk); } |
4c8941de7 mptcp: avoid flip... |
425 426 427 428 429 430 431 432 433 434 |
static void subflow_ulp_fallback(struct sock *sk, struct mptcp_subflow_context *old_ctx) { struct inet_connection_sock *icsk = inet_csk(sk); mptcp_subflow_tcp_fallback(sk, old_ctx); icsk->icsk_ulp_ops = NULL; rcu_assign_pointer(icsk->icsk_ulp_data, NULL); tcp_sk(sk)->is_mptcp = 0; } |
39884604b mptcp: fix NULL p... |
435 436 437 438 439 440 441 442 443 444 445 446 447 |
static void subflow_drop_ctx(struct sock *ssk) { struct mptcp_subflow_context *ctx = mptcp_subflow_ctx(ssk); if (!ctx) return; subflow_ulp_fallback(ssk, ctx); if (ctx->conn) sock_put(ctx->conn); kfree_rcu(ctx, rcu); } |
b93df08cc mptcp: explicitly... |
448 449 450 451 452 453 454 455 456 457 |
void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow, struct mptcp_options_received *mp_opt) { struct mptcp_sock *msk = mptcp_sk(subflow->conn); subflow->remote_key = mp_opt->sndr_key; subflow->fully_established = 1; subflow->can_ack = 1; WRITE_ONCE(msk->fully_established, true); } |
cec37a6e4 mptcp: Handle MP_... |
458 459 460 461 462 463 464 465 |
static struct sock *subflow_syn_recv_sock(const struct sock *sk, struct sk_buff *skb, struct request_sock *req, struct dst_entry *dst, struct request_sock *req_unhash, bool *own_req) { struct mptcp_subflow_context *listener = mptcp_subflow_ctx(sk); |
cc7972ea1 mptcp: parse and ... |
466 |
struct mptcp_subflow_request_sock *subflow_req; |
cfde141ea mptcp: move optio... |
467 |
struct mptcp_options_received mp_opt; |
9e365ff57 mptcp: drop MP_JO... |
468 |
bool fallback, fallback_is_fatal; |
58b099196 mptcp: create msk... |
469 |
struct sock *new_msk = NULL; |
cec37a6e4 mptcp: Handle MP_... |
470 471 472 |
struct sock *child; pr_debug("listener=%p, req=%p, conn=%p", listener, req, listener->conn); |
9e365ff57 mptcp: drop MP_JO... |
473 474 |
/* After child creation we must look for 'mp_capable' even when options * are not parsed |
cfde141ea mptcp: move optio... |
475 476 |
*/ mp_opt.mp_capable = 0; |
9e365ff57 mptcp: drop MP_JO... |
477 478 479 |
/* hopefully temporary handling for MP_JOIN+syncookie */ subflow_req = mptcp_subflow_rsk(req); |
b7514694e subflow: explicit... |
480 |
fallback_is_fatal = tcp_rsk(req)->is_mptcp && subflow_req->mp_join; |
9e365ff57 mptcp: drop MP_JO... |
481 482 |
fallback = !tcp_rsk(req)->is_mptcp; if (fallback) |
ae2dd7164 mptcp: handle tcp... |
483 |
goto create_child; |
d22f4988f mptcp: process MP... |
484 |
/* if the sk is MP_CAPABLE, we try to fetch the client key */ |
cc7972ea1 mptcp: parse and ... |
485 |
if (subflow_req->mp_capable) { |
d22f4988f mptcp: process MP... |
486 487 488 489 490 |
if (TCP_SKB_CB(skb)->seq != subflow_req->ssn_offset + 1) { /* here we can receive and accept an in-window, * out-of-order pkt, which will not carry the MP_CAPABLE * opt even on mptcp enabled paths */ |
58b099196 mptcp: create msk... |
491 |
goto create_msk; |
d22f4988f mptcp: process MP... |
492 |
} |
cfde141ea mptcp: move optio... |
493 494 |
mptcp_get_options(skb, &mp_opt); if (!mp_opt.mp_capable) { |
4c8941de7 mptcp: avoid flip... |
495 |
fallback = true; |
58b099196 mptcp: create msk... |
496 |
goto create_child; |
d22f4988f mptcp: process MP... |
497 |
} |
58b099196 mptcp: create msk... |
498 499 |
create_msk: |
cfde141ea mptcp: move optio... |
500 |
new_msk = mptcp_sk_clone(listener->conn, &mp_opt, req); |
58b099196 mptcp: create msk... |
501 |
if (!new_msk) |
4c8941de7 mptcp: avoid flip... |
502 |
fallback = true; |
f296234c9 mptcp: Add handli... |
503 |
} else if (subflow_req->mp_join) { |
cfde141ea mptcp: move optio... |
504 |
mptcp_get_options(skb, &mp_opt); |
d3ab78858 mptcp: fix NULL p... |
505 506 |
if (!mp_opt.mp_join || !subflow_hmac_valid(req, &mp_opt) || !mptcp_can_accept_new_subflow(subflow_req->msk)) { |
fc518953b mptcp: add and us... |
507 |
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKMAC); |
9e365ff57 mptcp: drop MP_JO... |
508 |
fallback = true; |
fc518953b mptcp: add and us... |
509 |
} |
cc7972ea1 mptcp: parse and ... |
510 |
} |
cec37a6e4 mptcp: Handle MP_... |
511 |
|
d22f4988f mptcp: process MP... |
512 |
create_child: |
cec37a6e4 mptcp: Handle MP_... |
513 514 515 516 |
child = listener->icsk_af_ops->syn_recv_sock(sk, skb, req, dst, req_unhash, own_req); if (child && *own_req) { |
79c0949e9 mptcp: Add key ge... |
517 |
struct mptcp_subflow_context *ctx = mptcp_subflow_ctx(child); |
90bf45134 mptcp: add new so... |
518 |
tcp_rsk(req)->drop_req = false; |
4c8941de7 mptcp: avoid flip... |
519 520 521 |
/* we need to fallback on ctx allocation failure and on pre-reqs * checking above. In the latter scenario we additionally need * to reset the context to non MPTCP status. |
79c0949e9 mptcp: Add key ge... |
522 |
*/ |
4c8941de7 mptcp: avoid flip... |
523 |
if (!ctx || fallback) { |
f296234c9 mptcp: Add handli... |
524 |
if (fallback_is_fatal) |
729cd6436 mptcp: cope bette... |
525 |
goto dispose_child; |
4c8941de7 mptcp: avoid flip... |
526 |
|
39884604b mptcp: fix NULL p... |
527 |
subflow_drop_ctx(child); |
58b099196 mptcp: create msk... |
528 |
goto out; |
f296234c9 mptcp: Add handli... |
529 |
} |
79c0949e9 mptcp: Add key ge... |
530 531 |
if (ctx->mp_capable) { |
b93df08cc mptcp: explicitly... |
532 533 534 535 |
/* this can't race with mptcp_close(), as the msk is * not yet exposted to user-space */ inet_sk_state_store((void *)new_msk, TCP_ESTABLISHED); |
58b099196 mptcp: create msk... |
536 537 538 |
/* new mpc subflow takes ownership of the newly * created mptcp socket */ |
df1036da9 mptcp: fix splat ... |
539 |
new_msk->sk_destruct = mptcp_sock_destruct; |
1b1c7a0ef mptcp: Add path m... |
540 |
mptcp_pm_new_connection(mptcp_sk(new_msk), 1); |
2c5ebd001 mptcp: refactor t... |
541 |
mptcp_token_accept(subflow_req, mptcp_sk(new_msk)); |
58b099196 mptcp: create msk... |
542 543 |
ctx->conn = new_msk; new_msk = NULL; |
fca5c82c0 mptcp: drop req s... |
544 545 546 547 |
/* with OoO packets we can reach here without ingress * mpc option */ |
b93df08cc mptcp: explicitly... |
548 549 |
if (mp_opt.mp_capable) mptcp_subflow_fully_established(ctx, &mp_opt); |
f296234c9 mptcp: Add handli... |
550 551 |
} else if (ctx->mp_join) { struct mptcp_sock *owner; |
8fd4de127 mptcp: cache msk ... |
552 |
owner = subflow_req->msk; |
f296234c9 mptcp: Add handli... |
553 |
if (!owner) |
729cd6436 mptcp: cope bette... |
554 |
goto dispose_child; |
f296234c9 mptcp: Add handli... |
555 |
|
8fd4de127 mptcp: cache msk ... |
556 557 |
/* move the msk reference ownership to the subflow */ subflow_req->msk = NULL; |
f296234c9 mptcp: Add handli... |
558 559 |
ctx->conn = (struct sock *)owner; if (!mptcp_finish_join(child)) |
729cd6436 mptcp: cope bette... |
560 |
goto dispose_child; |
fc518953b mptcp: add and us... |
561 562 |
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINACKRX); |
90bf45134 mptcp: add new so... |
563 |
tcp_rsk(req)->drop_req = true; |
cec37a6e4 mptcp: Handle MP_... |
564 565 |
} } |
58b099196 mptcp: create msk... |
566 567 568 |
out: /* dispose of the left over mptcp master, if any */ if (unlikely(new_msk)) |
9f5ca6a59 mptcp: fix 'Attem... |
569 |
mptcp_force_close(new_msk); |
4c8941de7 mptcp: avoid flip... |
570 571 572 573 |
/* check for expected invariant - should never trigger, just help * catching eariler subtle bugs */ |
ac2b47fb9 mptcp: fix uninit... |
574 |
WARN_ON_ONCE(child && *own_req && tcp_sk(child)->is_mptcp && |
4c8941de7 mptcp: avoid flip... |
575 576 |
(!mptcp_subflow_ctx(child) || !mptcp_subflow_ctx(child)->conn)); |
cec37a6e4 mptcp: Handle MP_... |
577 |
return child; |
f296234c9 mptcp: Add handli... |
578 |
|
729cd6436 mptcp: cope bette... |
579 |
dispose_child: |
39884604b mptcp: fix NULL p... |
580 |
subflow_drop_ctx(child); |
729cd6436 mptcp: cope bette... |
581 |
tcp_rsk(req)->drop_req = true; |
729cd6436 mptcp: cope bette... |
582 |
inet_csk_prepare_for_destroy_sock(child); |
f296234c9 mptcp: Add handli... |
583 |
tcp_done(child); |
97e617518 subflow: use rsk_... |
584 |
req->rsk_ops->send_reset(sk, skb); |
729cd6436 mptcp: cope bette... |
585 586 587 |
/* The last child reference will be released by the caller */ return child; |
cec37a6e4 mptcp: Handle MP_... |
588 589 590 |
} static struct inet_connection_sock_af_ops subflow_specific; |
648ef4b88 mptcp: Implement ... |
591 592 593 594 |
enum mapping_status { MAPPING_OK, MAPPING_INVALID, MAPPING_EMPTY, |
e1ff9e82e net: mptcp: impro... |
595 596 |
MAPPING_DATA_FIN, MAPPING_DUMMY |
648ef4b88 mptcp: Implement ... |
597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 |
}; static u64 expand_seq(u64 old_seq, u16 old_data_len, u64 seq) { if ((u32)seq == (u32)old_seq) return old_seq; /* Assume map covers data not mapped yet. */ return seq | ((old_seq + old_data_len + 1) & GENMASK_ULL(63, 32)); } static void warn_bad_map(struct mptcp_subflow_context *subflow, u32 ssn) { WARN_ONCE(1, "Bad mapping: ssn=%d map_seq=%d map_data_len=%d", ssn, subflow->map_subflow_seq, subflow->map_data_len); } static bool skb_is_fully_mapped(struct sock *ssk, struct sk_buff *skb) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); unsigned int skb_consumed; skb_consumed = tcp_sk(ssk)->copied_seq - TCP_SKB_CB(skb)->seq; if (WARN_ON_ONCE(skb_consumed >= skb->len)) return true; return skb->len - skb_consumed <= subflow->map_data_len - mptcp_subflow_get_map_offset(subflow); } static bool validate_mapping(struct sock *ssk, struct sk_buff *skb) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); u32 ssn = tcp_sk(ssk)->copied_seq - subflow->ssn_offset; if (unlikely(before(ssn, subflow->map_subflow_seq))) { /* Mapping covers data later in the subflow stream, * currently unsupported. */ warn_bad_map(subflow, ssn); return false; } if (unlikely(!before(ssn, subflow->map_subflow_seq + subflow->map_data_len))) { /* Mapping does covers past subflow data, invalid */ warn_bad_map(subflow, ssn + skb->len); return false; } return true; } |
43b54c6ee mptcp: Use full M... |
647 648 |
static enum mapping_status get_mapping_status(struct sock *ssk, struct mptcp_sock *msk) |
648ef4b88 mptcp: Implement ... |
649 650 651 652 653 654 655 656 657 658 |
{ struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); struct mptcp_ext *mpext; struct sk_buff *skb; u16 data_len; u64 map_seq; skb = skb_peek(&ssk->sk_receive_queue); if (!skb) return MAPPING_EMPTY; |
e1ff9e82e net: mptcp: impro... |
659 660 |
if (mptcp_check_fallback(ssk)) return MAPPING_DUMMY; |
648ef4b88 mptcp: Implement ... |
661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 |
mpext = mptcp_get_ext(skb); if (!mpext || !mpext->use_map) { if (!subflow->map_valid && !skb->len) { /* the TCP stack deliver 0 len FIN pkt to the receive * queue, that is the only 0len pkts ever expected here, * and we can admit no mapping only for 0 len pkts */ if (!(TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)) WARN_ONCE(1, "0len seq %d:%d flags %x", TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq, TCP_SKB_CB(skb)->tcp_flags); sk_eat_skb(ssk, skb); return MAPPING_EMPTY; } if (!subflow->map_valid) return MAPPING_INVALID; goto validate_seq; } pr_debug("seq=%llu is64=%d ssn=%u data_len=%u data_fin=%d", mpext->data_seq, mpext->dsn64, mpext->subflow_seq, mpext->data_len, mpext->data_fin); data_len = mpext->data_len; if (data_len == 0) { pr_err("Infinite mapping not handled"); |
fc518953b mptcp: add and us... |
690 |
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); |
648ef4b88 mptcp: Implement ... |
691 692 693 694 695 |
return MAPPING_INVALID; } if (mpext->data_fin == 1) { if (data_len == 1) { |
1a49b2c2a mptcp: Handle inc... |
696 697 |
bool updated = mptcp_update_rcv_data_fin(msk, mpext->data_seq, mpext->dsn64); |
43b54c6ee mptcp: Use full M... |
698 |
pr_debug("DATA_FIN with no payload seq=%llu", mpext->data_seq); |
648ef4b88 mptcp: Implement ... |
699 700 701 702 703 704 705 706 707 |
if (subflow->map_valid) { /* A DATA_FIN might arrive in a DSS * option before the previous mapping * has been fully consumed. Continue * handling the existing mapping. */ skb_ext_del(skb, SKB_EXT_MPTCP); return MAPPING_OK; } else { |
ef59b1953 mptcp: Wake up MP... |
708 709 |
if (updated && schedule_work(&msk->work)) sock_hold((struct sock *)msk); |
648ef4b88 mptcp: Implement ... |
710 711 |
return MAPPING_DATA_FIN; } |
43b54c6ee mptcp: Use full M... |
712 |
} else { |
017512a07 mptcp: more DATA ... |
713 |
u64 data_fin_seq = mpext->data_seq + data_len - 1; |
1a49b2c2a mptcp: Handle inc... |
714 715 716 717 718 719 720 721 722 723 |
/* If mpext->data_seq is a 32-bit value, data_fin_seq * must also be limited to 32 bits. */ if (!mpext->dsn64) data_fin_seq &= GENMASK_ULL(31, 0); mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64); pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d", data_fin_seq, mpext->dsn64); |
648ef4b88 mptcp: Implement ... |
724 725 726 727 728 729 730 731 732 733 734 735 736 |
} /* Adjust for DATA_FIN using 1 byte of sequence space */ data_len--; } if (!mpext->dsn64) { map_seq = expand_seq(subflow->map_seq, subflow->map_data_len, mpext->data_seq); pr_debug("expanded seq=%llu", subflow->map_seq); } else { map_seq = mpext->data_seq; } |
37198e93c net: mptcp: make ... |
737 |
WRITE_ONCE(mptcp_sk(subflow->conn)->use_64bit_ack, !!mpext->dsn64); |
648ef4b88 mptcp: Implement ... |
738 739 740 741 742 743 744 745 746 747 748 749 750 |
if (subflow->map_valid) { /* Allow replacing only with an identical map */ if (subflow->map_seq == map_seq && subflow->map_subflow_seq == mpext->subflow_seq && subflow->map_data_len == data_len) { skb_ext_del(skb, SKB_EXT_MPTCP); return MAPPING_OK; } /* If this skb data are fully covered by the current mapping, * the new map would need caching, which is not supported */ |
fc518953b mptcp: add and us... |
751 752 |
if (skb_is_fully_mapped(ssk, skb)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSNOMATCH); |
648ef4b88 mptcp: Implement ... |
753 |
return MAPPING_INVALID; |
fc518953b mptcp: add and us... |
754 |
} |
648ef4b88 mptcp: Implement ... |
755 756 757 758 759 760 761 762 763 |
/* will validate the next map after consuming the current one */ return MAPPING_OK; } subflow->map_seq = map_seq; subflow->map_subflow_seq = mpext->subflow_seq; subflow->map_data_len = data_len; subflow->map_valid = 1; |
d22f4988f mptcp: process MP... |
764 |
subflow->mpc_map = mpext->mpc_map; |
648ef4b88 mptcp: Implement ... |
765 766 767 768 769 770 771 772 773 774 775 776 777 778 |
pr_debug("new map seq=%llu subflow_seq=%u data_len=%u", subflow->map_seq, subflow->map_subflow_seq, subflow->map_data_len); validate_seq: /* we revalidate valid mapping on new skb, because we must ensure * the current skb is completely covered by the available mapping */ if (!validate_mapping(ssk, skb)) return MAPPING_INVALID; skb_ext_del(skb, SKB_EXT_MPTCP); return MAPPING_OK; } |
04e4cd4f7 mptcp: cleanup mp... |
779 |
static void mptcp_subflow_discard_data(struct sock *ssk, struct sk_buff *skb, |
1d39cd8cf mptcp: fix intege... |
780 |
u64 limit) |
6719331c2 mptcp: trigger ms... |
781 782 |
{ struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); |
04e4cd4f7 mptcp: cleanup mp... |
783 784 785 786 787 788 789 |
bool fin = TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN; u32 incr; incr = limit >= skb->len ? skb->len + fin : limit; pr_debug("discarding=%d len=%d seq=%d", incr, skb->len, subflow->map_subflow_seq); |
06242e44b mptcp: add OoO re... |
790 |
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DUPDATA); |
04e4cd4f7 mptcp: cleanup mp... |
791 792 793 794 795 |
tcp_sk(ssk)->copied_seq += incr; if (!before(tcp_sk(ssk)->copied_seq, TCP_SKB_CB(skb)->end_seq)) sk_eat_skb(ssk, skb); if (mptcp_subflow_get_map_offset(subflow) >= subflow->map_data_len) subflow->map_valid = 0; |
c76c69565 mptcp: call tcp_c... |
796 797 |
if (incr) tcp_cleanup_rbuf(ssk, incr); |
6719331c2 mptcp: trigger ms... |
798 |
} |
648ef4b88 mptcp: Implement ... |
799 800 801 802 803 804 805 806 807 |
static bool subflow_check_data_avail(struct sock *ssk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); enum mapping_status status; struct mptcp_sock *msk; struct sk_buff *skb; pr_debug("msk=%p ssk=%p data_avail=%d skb=%p", subflow->conn, ssk, subflow->data_avail, skb_peek(&ssk->sk_receive_queue)); |
47bebdf36 mptcp: set data_r... |
808 809 |
if (!skb_peek(&ssk->sk_receive_queue)) subflow->data_avail = 0; |
648ef4b88 mptcp: Implement ... |
810 811 |
if (subflow->data_avail) return true; |
648ef4b88 mptcp: Implement ... |
812 813 |
msk = mptcp_sk(subflow->conn); for (;;) { |
648ef4b88 mptcp: Implement ... |
814 815 |
u64 ack_seq; u64 old_ack; |
43b54c6ee mptcp: Use full M... |
816 |
status = get_mapping_status(ssk, msk); |
648ef4b88 mptcp: Implement ... |
817 818 819 820 821 |
pr_debug("msk=%p ssk=%p status=%d", msk, ssk, status); if (status == MAPPING_INVALID) { ssk->sk_err = EBADMSG; goto fatal; } |
e1ff9e82e net: mptcp: impro... |
822 823 824 825 826 827 828 829 |
if (status == MAPPING_DUMMY) { __mptcp_do_fallback(msk); skb = skb_peek(&ssk->sk_receive_queue); subflow->map_valid = 1; subflow->map_seq = READ_ONCE(msk->ack_seq); subflow->map_data_len = skb->len; subflow->map_subflow_seq = tcp_sk(ssk)->copied_seq - subflow->ssn_offset; |
6719331c2 mptcp: trigger ms... |
830 |
subflow->data_avail = MPTCP_SUBFLOW_DATA_AVAIL; |
e1ff9e82e net: mptcp: impro... |
831 832 |
return true; } |
648ef4b88 mptcp: Implement ... |
833 834 835 836 837 838 839 |
if (status != MAPPING_OK) return false; skb = skb_peek(&ssk->sk_receive_queue); if (WARN_ON_ONCE(!skb)) return false; |
d22f4988f mptcp: process MP... |
840 841 842 843 844 845 846 847 848 849 850 851 |
/* if msk lacks the remote key, this subflow must provide an * MP_CAPABLE-based mapping */ if (unlikely(!READ_ONCE(msk->can_ack))) { if (!subflow->mpc_map) { ssk->sk_err = EBADMSG; goto fatal; } WRITE_ONCE(msk->remote_key, subflow->remote_key); WRITE_ONCE(msk->ack_seq, subflow->map_seq); WRITE_ONCE(msk->can_ack, true); } |
648ef4b88 mptcp: Implement ... |
852 853 854 855 |
old_ack = READ_ONCE(msk->ack_seq); ack_seq = mptcp_subflow_get_mapped_dsn(subflow); pr_debug("msk ack_seq=%llx subflow ack_seq=%llx", old_ack, ack_seq); |
47bebdf36 mptcp: set data_r... |
856 |
if (ack_seq == old_ack) { |
6719331c2 mptcp: trigger ms... |
857 858 859 860 |
subflow->data_avail = MPTCP_SUBFLOW_DATA_AVAIL; break; } else if (after64(ack_seq, old_ack)) { subflow->data_avail = MPTCP_SUBFLOW_OOO_DATA; |
648ef4b88 mptcp: Implement ... |
861 |
break; |
47bebdf36 mptcp: set data_r... |
862 |
} |
648ef4b88 mptcp: Implement ... |
863 864 |
/* only accept in-sequence mapping. Old values are spurious |
6719331c2 mptcp: trigger ms... |
865 |
* retransmission |
648ef4b88 mptcp: Implement ... |
866 |
*/ |
04e4cd4f7 mptcp: cleanup mp... |
867 |
mptcp_subflow_discard_data(ssk, skb, old_ack - ack_seq); |
648ef4b88 mptcp: Implement ... |
868 869 870 871 872 873 874 875 876 877 |
} return true; fatal: /* fatal protocol error, close the socket */ /* This barrier is coupled with smp_rmb() in tcp_poll() */ smp_wmb(); ssk->sk_error_report(ssk); tcp_set_state(ssk, TCP_CLOSE); tcp_send_active_reset(ssk, GFP_ATOMIC); |
47bebdf36 mptcp: set data_r... |
878 |
subflow->data_avail = 0; |
648ef4b88 mptcp: Implement ... |
879 880 881 882 883 884 |
return false; } bool mptcp_subflow_data_available(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); |
648ef4b88 mptcp: Implement ... |
885 886 887 888 889 890 891 892 893 894 895 |
/* check if current mapping is still valid */ if (subflow->map_valid && mptcp_subflow_get_map_offset(subflow) >= subflow->map_data_len) { subflow->map_valid = 0; subflow->data_avail = 0; pr_debug("Done with mapping: seq=%u data_len=%u", subflow->map_subflow_seq, subflow->map_data_len); } |
47bebdf36 mptcp: set data_r... |
896 |
return subflow_check_data_avail(sk); |
648ef4b88 mptcp: Implement ... |
897 |
} |
071c8ed6e tcp: mptcp: use m... |
898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 |
/* If ssk has an mptcp parent socket, use the mptcp rcvbuf occupancy, * not the ssk one. * * In mptcp, rwin is about the mptcp-level connection data. * * Data that is still on the ssk rx queue can thus be ignored, * as far as mptcp peer is concerened that data is still inflight. * DSS ACK is updated when skb is moved to the mptcp rx queue. */ void mptcp_space(const struct sock *ssk, int *space, int *full_space) { const struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); const struct sock *sk = subflow->conn; *space = tcp_space(sk); *full_space = tcp_full_space(sk); } |
648ef4b88 mptcp: Implement ... |
915 916 917 |
static void subflow_data_ready(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); |
8c7289404 mptcp: silence wa... |
918 |
u16 state = 1 << inet_sk_state_load(sk); |
648ef4b88 mptcp: Implement ... |
919 |
struct sock *parent = subflow->conn; |
e1ff9e82e net: mptcp: impro... |
920 |
struct mptcp_sock *msk; |
648ef4b88 mptcp: Implement ... |
921 |
|
e1ff9e82e net: mptcp: impro... |
922 |
msk = mptcp_sk(parent); |
8c7289404 mptcp: silence wa... |
923 |
if (state & TCPF_LISTEN) { |
e1ff9e82e net: mptcp: impro... |
924 |
set_bit(MPTCP_DATA_READY, &msk->flags); |
dc093db5c mptcp: drop unnee... |
925 |
parent->sk_data_ready(parent); |
648ef4b88 mptcp: Implement ... |
926 927 |
return; } |
e1ff9e82e net: mptcp: impro... |
928 |
WARN_ON_ONCE(!__mptcp_check_fallback(msk) && !subflow->mp_capable && |
8c7289404 mptcp: silence wa... |
929 |
!subflow->mp_join && !(state & TCPF_CLOSE)); |
e1ff9e82e net: mptcp: impro... |
930 |
|
101f6f851 mptcp: add and us... |
931 |
if (mptcp_subflow_data_available(sk)) |
2e52213c7 mptcp: avoid work... |
932 |
mptcp_data_ready(parent, sk); |
648ef4b88 mptcp: Implement ... |
933 934 935 936 937 938 |
} static void subflow_write_space(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct sock *parent = subflow->conn; |
63561a403 mptcp: rethink 'i... |
939 940 941 942 |
if (!sk_stream_is_writeable(sk)) return; if (sk_stream_is_writeable(parent)) { |
1891c4a07 mptcp: add subflo... |
943 944 945 |
set_bit(MPTCP_SEND_SPACE, &mptcp_sk(parent)->flags); smp_mb__after_atomic(); /* set SEND_SPACE before sk_stream_write_space clears NOSPACE */ |
648ef4b88 mptcp: Implement ... |
946 947 948 |
sk_stream_write_space(parent); } } |
cec37a6e4 mptcp: Handle MP_... |
949 950 951 952 953 954 955 956 957 |
static struct inet_connection_sock_af_ops * subflow_default_af_ops(struct sock *sk) { #if IS_ENABLED(CONFIG_MPTCP_IPV6) if (sk->sk_family == AF_INET6) return &subflow_v6_specific; #endif return &subflow_specific; } |
cec37a6e4 mptcp: Handle MP_... |
958 |
#if IS_ENABLED(CONFIG_MPTCP_IPV6) |
31484d56c mptcp: Fix undefi... |
959 960 |
void mptcpv6_handle_mapped(struct sock *sk, bool mapped) { |
cec37a6e4 mptcp: Handle MP_... |
961 962 963 964 965 966 967 |
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock_af_ops *target; target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk); pr_debug("subflow=%p family=%d ops=%p target=%p mapped=%d", |
edc7e4898 mptcp: Fix code f... |
968 |
subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped); |
cec37a6e4 mptcp: Handle MP_... |
969 970 971 972 973 974 |
if (likely(icsk->icsk_af_ops == target)) return; subflow->icsk_af_ops = icsk->icsk_af_ops; icsk->icsk_af_ops = target; |
cec37a6e4 mptcp: Handle MP_... |
975 |
} |
31484d56c mptcp: Fix undefi... |
976 |
#endif |
cec37a6e4 mptcp: Handle MP_... |
977 |
|
ec3edaa7c mptcp: Add handli... |
978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 |
static void mptcp_info2sockaddr(const struct mptcp_addr_info *info, struct sockaddr_storage *addr) { memset(addr, 0, sizeof(*addr)); addr->ss_family = info->family; if (addr->ss_family == AF_INET) { struct sockaddr_in *in_addr = (struct sockaddr_in *)addr; in_addr->sin_addr = info->addr; in_addr->sin_port = info->port; } #if IS_ENABLED(CONFIG_MPTCP_IPV6) else if (addr->ss_family == AF_INET6) { struct sockaddr_in6 *in6_addr = (struct sockaddr_in6 *)addr; in6_addr->sin6_addr = info->addr6; in6_addr->sin6_port = info->port; } #endif } |
ef0da3b8a mptcp: move addre... |
998 |
int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, |
ec3edaa7c mptcp: Add handli... |
999 1000 1001 1002 1003 |
const struct mptcp_addr_info *remote) { struct mptcp_sock *msk = mptcp_sk(sk); struct mptcp_subflow_context *subflow; struct sockaddr_storage addr; |
2ff0e566f mptcp: fix subflo... |
1004 |
int remote_id = remote->id; |
6bad912b7 mptcp: do nonce i... |
1005 |
int local_id = loc->id; |
ec3edaa7c mptcp: Add handli... |
1006 |
struct socket *sf; |
6bad912b7 mptcp: do nonce i... |
1007 |
struct sock *ssk; |
ec3edaa7c mptcp: Add handli... |
1008 1009 1010 |
u32 remote_token; int addrlen; int err; |
b93df08cc mptcp: explicitly... |
1011 |
if (!mptcp_is_fully_established(sk)) |
ec3edaa7c mptcp: Add handli... |
1012 1013 1014 1015 1016 |
return -ENOTCONN; err = mptcp_subflow_create_socket(sk, &sf); if (err) return err; |
6bad912b7 mptcp: do nonce i... |
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 |
ssk = sf->sk; subflow = mptcp_subflow_ctx(ssk); do { get_random_bytes(&subflow->local_nonce, sizeof(u32)); } while (!subflow->local_nonce); if (!local_id) { err = mptcp_pm_get_local_id(msk, (struct sock_common *)ssk); if (err < 0) goto failed; local_id = err; } |
ec3edaa7c mptcp: Add handli... |
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 |
subflow->remote_key = msk->remote_key; subflow->local_key = msk->local_key; subflow->token = msk->token; mptcp_info2sockaddr(loc, &addr); addrlen = sizeof(struct sockaddr_in); #if IS_ENABLED(CONFIG_MPTCP_IPV6) if (loc->family == AF_INET6) addrlen = sizeof(struct sockaddr_in6); #endif |
ef0da3b8a mptcp: move addre... |
1040 |
ssk->sk_bound_dev_if = loc->ifindex; |
ec3edaa7c mptcp: Add handli... |
1041 1042 1043 1044 1045 |
err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen); if (err) goto failed; mptcp_crypto_key_sha(subflow->remote_key, &remote_token, NULL); |
2ff0e566f mptcp: fix subflo... |
1046 1047 |
pr_debug("msk=%p remote_token=%u local_id=%d remote_id=%d", msk, remote_token, local_id, remote_id); |
ec3edaa7c mptcp: Add handli... |
1048 |
subflow->remote_token = remote_token; |
6bad912b7 mptcp: do nonce i... |
1049 |
subflow->local_id = local_id; |
2ff0e566f mptcp: fix subflo... |
1050 |
subflow->remote_id = remote_id; |
ec3edaa7c mptcp: Add handli... |
1051 |
subflow->request_join = 1; |
4596a2c1b mptcp: allow crea... |
1052 |
subflow->request_bkup = !!(loc->flags & MPTCP_PM_ADDR_FLAG_BACKUP); |
ec3edaa7c mptcp: Add handli... |
1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 |
mptcp_info2sockaddr(remote, &addr); err = kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK); if (err && err != -EINPROGRESS) goto failed; spin_lock_bh(&msk->join_list_lock); list_add_tail(&subflow->node, &msk->join_list); spin_unlock_bh(&msk->join_list_lock); return err; failed: sock_release(sf); return err; } |
2303f994b mptcp: Associate ... |
1069 1070 1071 1072 1073 1074 |
int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock) { struct mptcp_subflow_context *subflow; struct net *net = sock_net(sk); struct socket *sf; int err; |
adf734106 mptcp: be careful... |
1075 1076 1077 1078 1079 |
/* un-accepted server sockets can reach here - on bad configuration * bail early to avoid greater trouble later */ if (unlikely(!sk->sk_socket)) return -EINVAL; |
cec37a6e4 mptcp: Handle MP_... |
1080 1081 |
err = sock_create_kern(net, sk->sk_family, SOCK_STREAM, IPPROTO_TCP, &sf); |
2303f994b mptcp: Associate ... |
1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 |
if (err) return err; lock_sock(sf->sk); /* kernel sockets do not by default acquire net ref, but TCP timer * needs it. */ sf->sk->sk_net_refcnt = 1; get_net(net); |
f6f7d8cf5 mptcp: Fix build ... |
1092 |
#ifdef CONFIG_PROC_FS |
2303f994b mptcp: Associate ... |
1093 |
this_cpu_add(*net->core.sock_inuse, 1); |
f6f7d8cf5 mptcp: Fix build ... |
1094 |
#endif |
2303f994b mptcp: Associate ... |
1095 1096 |
err = tcp_set_ulp(sf->sk, "mptcp"); release_sock(sf->sk); |
b8ad540dd mptcp: fix memory... |
1097 1098 |
if (err) { sock_release(sf); |
2303f994b mptcp: Associate ... |
1099 |
return err; |
b8ad540dd mptcp: fix memory... |
1100 |
} |
2303f994b mptcp: Associate ... |
1101 |
|
7d14b0d2b mptcp: set correc... |
1102 1103 1104 1105 1106 1107 1108 1109 1110 |
/* the newly created socket really belongs to the owning MPTCP master * socket, even if for additional subflows the allocation is performed * by a kernel workqueue. Adjust inode references, so that the * procfs/diag interaces really show this one belonging to the correct * user. */ SOCK_INODE(sf)->i_ino = SOCK_INODE(sk->sk_socket)->i_ino; SOCK_INODE(sf)->i_uid = SOCK_INODE(sk->sk_socket)->i_uid; SOCK_INODE(sf)->i_gid = SOCK_INODE(sk->sk_socket)->i_gid; |
2303f994b mptcp: Associate ... |
1111 1112 1113 1114 |
subflow = mptcp_subflow_ctx(sf->sk); pr_debug("subflow=%p", subflow); *new_sock = sf; |
79c0949e9 mptcp: Add key ge... |
1115 |
sock_hold(sk); |
2303f994b mptcp: Associate ... |
1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 |
subflow->conn = sk; return 0; } static struct mptcp_subflow_context *subflow_create_ctx(struct sock *sk, gfp_t priority) { struct inet_connection_sock *icsk = inet_csk(sk); struct mptcp_subflow_context *ctx; ctx = kzalloc(sizeof(*ctx), priority); if (!ctx) return NULL; rcu_assign_pointer(icsk->icsk_ulp_data, ctx); |
cec37a6e4 mptcp: Handle MP_... |
1132 |
INIT_LIST_HEAD(&ctx->node); |
2303f994b mptcp: Associate ... |
1133 1134 1135 1136 1137 1138 1139 |
pr_debug("subflow=%p", ctx); ctx->tcp_sock = sk; return ctx; } |
648ef4b88 mptcp: Implement ... |
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 |
static void __subflow_state_change(struct sock *sk) { struct socket_wq *wq; rcu_read_lock(); wq = rcu_dereference(sk->sk_wq); if (skwq_has_sleeper(wq)) wake_up_interruptible_all(&wq->wait); rcu_read_unlock(); } static bool subflow_is_done(const struct sock *sk) { return sk->sk_shutdown & RCV_SHUTDOWN || sk->sk_state == TCP_CLOSE; } static void subflow_state_change(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); |
dc093db5c mptcp: drop unnee... |
1159 |
struct sock *parent = subflow->conn; |
648ef4b88 mptcp: Implement ... |
1160 1161 |
__subflow_state_change(sk); |
8fd738049 mptcp: fallback i... |
1162 1163 |
if (subflow_simultaneous_connect(sk)) { mptcp_do_fallback(sk); |
a6b118feb mptcp: add receiv... |
1164 |
mptcp_rcv_space_init(mptcp_sk(parent), sk); |
8fd738049 mptcp: fallback i... |
1165 1166 1167 1168 1169 1170 1171 |
pr_fallback(mptcp_sk(parent)); subflow->conn_finished = 1; if (inet_sk_state_load(parent) == TCP_SYN_SENT) { inet_sk_state_store(parent, TCP_ESTABLISHED); parent->sk_state_change(parent); } } |
648ef4b88 mptcp: Implement ... |
1172 1173 1174 1175 |
/* as recvmsg() does not acquire the subflow socket for ssk selection * a fin packet carrying a DSS can be unnoticed if we don't trigger * the data available machinery here. */ |
e1ff9e82e net: mptcp: impro... |
1176 |
if (mptcp_subflow_data_available(sk)) |
2e52213c7 mptcp: avoid work... |
1177 |
mptcp_data_ready(parent, sk); |
648ef4b88 mptcp: Implement ... |
1178 |
|
067a0b3dc mptcp: Only use s... |
1179 1180 |
if (__mptcp_check_fallback(mptcp_sk(parent)) && !(parent->sk_shutdown & RCV_SHUTDOWN) && |
648ef4b88 mptcp: Implement ... |
1181 1182 |
!subflow->rx_eof && subflow_is_done(sk)) { subflow->rx_eof = 1; |
59832e246 mptcp: subflow: c... |
1183 |
mptcp_subflow_eof(parent); |
648ef4b88 mptcp: Implement ... |
1184 1185 |
} } |
2303f994b mptcp: Associate ... |
1186 1187 |
static int subflow_ulp_init(struct sock *sk) { |
cec37a6e4 mptcp: Handle MP_... |
1188 |
struct inet_connection_sock *icsk = inet_csk(sk); |
2303f994b mptcp: Associate ... |
1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 |
struct mptcp_subflow_context *ctx; struct tcp_sock *tp = tcp_sk(sk); int err = 0; /* disallow attaching ULP to a socket unless it has been * created with sock_create_kern() */ if (!sk->sk_kern_sock) { err = -EOPNOTSUPP; goto out; } ctx = subflow_create_ctx(sk, GFP_KERNEL); if (!ctx) { err = -ENOMEM; goto out; } pr_debug("subflow=%p, family=%d", ctx, sk->sk_family); tp->is_mptcp = 1; |
cec37a6e4 mptcp: Handle MP_... |
1210 1211 |
ctx->icsk_af_ops = icsk->icsk_af_ops; icsk->icsk_af_ops = subflow_default_af_ops(sk); |
648ef4b88 mptcp: Implement ... |
1212 1213 1214 1215 1216 1217 |
ctx->tcp_data_ready = sk->sk_data_ready; ctx->tcp_state_change = sk->sk_state_change; ctx->tcp_write_space = sk->sk_write_space; sk->sk_data_ready = subflow_data_ready; sk->sk_write_space = subflow_write_space; sk->sk_state_change = subflow_state_change; |
2303f994b mptcp: Associate ... |
1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 |
out: return err; } static void subflow_ulp_release(struct sock *sk) { struct mptcp_subflow_context *ctx = mptcp_subflow_ctx(sk); if (!ctx) return; |
79c0949e9 mptcp: Add key ge... |
1228 1229 |
if (ctx->conn) sock_put(ctx->conn); |
2303f994b mptcp: Associate ... |
1230 1231 |
kfree_rcu(ctx, rcu); } |
cec37a6e4 mptcp: Handle MP_... |
1232 1233 1234 1235 1236 1237 1238 |
static void subflow_ulp_clone(const struct request_sock *req, struct sock *newsk, const gfp_t priority) { struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req); struct mptcp_subflow_context *old_ctx = mptcp_subflow_ctx(newsk); struct mptcp_subflow_context *new_ctx; |
f296234c9 mptcp: Add handli... |
1239 1240 |
if (!tcp_rsk(req)->is_mptcp || (!subflow_req->mp_capable && !subflow_req->mp_join)) { |
648ef4b88 mptcp: Implement ... |
1241 |
subflow_ulp_fallback(newsk, old_ctx); |
cec37a6e4 mptcp: Handle MP_... |
1242 1243 1244 1245 |
return; } new_ctx = subflow_create_ctx(newsk, priority); |
edc7e4898 mptcp: Fix code f... |
1246 |
if (!new_ctx) { |
648ef4b88 mptcp: Implement ... |
1247 |
subflow_ulp_fallback(newsk, old_ctx); |
cec37a6e4 mptcp: Handle MP_... |
1248 1249 1250 1251 1252 |
return; } new_ctx->conn_finished = 1; new_ctx->icsk_af_ops = old_ctx->icsk_af_ops; |
648ef4b88 mptcp: Implement ... |
1253 1254 1255 |
new_ctx->tcp_data_ready = old_ctx->tcp_data_ready; new_ctx->tcp_state_change = old_ctx->tcp_state_change; new_ctx->tcp_write_space = old_ctx->tcp_write_space; |
58b099196 mptcp: create msk... |
1256 1257 |
new_ctx->rel_write_seq = 1; new_ctx->tcp_sock = newsk; |
f296234c9 mptcp: Add handli... |
1258 1259 1260 1261 1262 |
if (subflow_req->mp_capable) { /* see comments in subflow_syn_recv_sock(), MPTCP connection * is fully established only after we receive the remote key */ new_ctx->mp_capable = 1; |
f296234c9 mptcp: Add handli... |
1263 1264 1265 1266 1267 |
new_ctx->local_key = subflow_req->local_key; new_ctx->token = subflow_req->token; new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->idsn = subflow_req->idsn; } else if (subflow_req->mp_join) { |
ec3edaa7c mptcp: Add handli... |
1268 |
new_ctx->ssn_offset = subflow_req->ssn_offset; |
f296234c9 mptcp: Add handli... |
1269 1270 1271 1272 |
new_ctx->mp_join = 1; new_ctx->fully_established = 1; new_ctx->backup = subflow_req->backup; new_ctx->local_id = subflow_req->local_id; |
2ff0e566f mptcp: fix subflo... |
1273 |
new_ctx->remote_id = subflow_req->remote_id; |
f296234c9 mptcp: Add handli... |
1274 1275 1276 |
new_ctx->token = subflow_req->token; new_ctx->thmac = subflow_req->thmac; } |
cec37a6e4 mptcp: Handle MP_... |
1277 |
} |
2303f994b mptcp: Associate ... |
1278 1279 1280 1281 1282 |
static struct tcp_ulp_ops subflow_ulp_ops __read_mostly = { .name = "mptcp", .owner = THIS_MODULE, .init = subflow_ulp_init, .release = subflow_ulp_release, |
cec37a6e4 mptcp: Handle MP_... |
1283 |
.clone = subflow_ulp_clone, |
2303f994b mptcp: Associate ... |
1284 |
}; |
cec37a6e4 mptcp: Handle MP_... |
1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 |
static int subflow_ops_init(struct request_sock_ops *subflow_ops) { subflow_ops->obj_size = sizeof(struct mptcp_subflow_request_sock); subflow_ops->slab_name = "request_sock_subflow"; subflow_ops->slab = kmem_cache_create(subflow_ops->slab_name, subflow_ops->obj_size, 0, SLAB_ACCOUNT | SLAB_TYPESAFE_BY_RCU, NULL); if (!subflow_ops->slab) return -ENOMEM; |
79c0949e9 mptcp: Add key ge... |
1297 |
subflow_ops->destructor = subflow_req_destructor; |
cec37a6e4 mptcp: Handle MP_... |
1298 1299 |
return 0; } |
d39dceca3 mptcp: add __init... |
1300 |
void __init mptcp_subflow_init(void) |
2303f994b mptcp: Associate ... |
1301 |
{ |
08b8d0809 mptcp: rename and... |
1302 1303 |
mptcp_subflow_request_sock_ops = tcp_request_sock_ops; if (subflow_ops_init(&mptcp_subflow_request_sock_ops) != 0) |
cec37a6e4 mptcp: Handle MP_... |
1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 |
panic("MPTCP: failed to init subflow request sock ops "); subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops; subflow_request_sock_ipv4_ops.init_req = subflow_v4_init_req; subflow_specific = ipv4_specific; subflow_specific.conn_request = subflow_v4_conn_request; subflow_specific.syn_recv_sock = subflow_syn_recv_sock; subflow_specific.sk_rx_dst_set = subflow_finish_connect; #if IS_ENABLED(CONFIG_MPTCP_IPV6) subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops; subflow_request_sock_ipv6_ops.init_req = subflow_v6_init_req; subflow_v6_specific = ipv6_specific; subflow_v6_specific.conn_request = subflow_v6_conn_request; subflow_v6_specific.syn_recv_sock = subflow_syn_recv_sock; subflow_v6_specific.sk_rx_dst_set = subflow_finish_connect; subflow_v6m_specific = subflow_v6_specific; subflow_v6m_specific.queue_xmit = ipv4_specific.queue_xmit; subflow_v6m_specific.send_check = ipv4_specific.send_check; subflow_v6m_specific.net_header_len = ipv4_specific.net_header_len; subflow_v6m_specific.mtu_reduced = ipv4_specific.mtu_reduced; subflow_v6m_specific.net_frag_header_len = 0; #endif |
5147dfb50 mptcp: allow dump... |
1331 |
mptcp_diag_subflow_init(&subflow_ulp_ops); |
2303f994b mptcp: Associate ... |
1332 1333 1334 1335 |
if (tcp_register_ulp(&subflow_ulp_ops) != 0) panic("MPTCP: failed to register subflows to ULP "); } |