forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da 
 kernel/net/mptcp/subflow.c
....@@ -40,7 +40,6 @@
4040 		sock_put((struct sock *)subflow_req->msk);
4141 
4242 	mptcp_token_destroy_request(req);
43
-	tcp_request_sock_ops.destructor(req);
4443 }
4544 
4645 static void subflow_generate_hmac(u64 key1, u64 key2, u32 nonce1, u32 nonce2,
....@@ -276,7 +275,6 @@
276275 	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
277276 	struct sock *sk = subflow->conn;
278277 
279
-	tcp_set_state(ssk, TCP_CLOSE);
280278 	tcp_send_active_reset(ssk, GFP_ATOMIC);
281279 	tcp_done(ssk);
282280 	if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags) &&
....@@ -359,9 +357,8 @@
359357 	mptcp_subflow_reset(sk);
360358 }
361359 
362
-struct request_sock_ops mptcp_subflow_request_sock_ops;
363
-EXPORT_SYMBOL_GPL(mptcp_subflow_request_sock_ops);
364
-static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops;
360
+static struct request_sock_ops mptcp_subflow_v4_request_sock_ops __ro_after_init;
361
+static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops __ro_after_init;
365362 
366363 static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)
367364 {
....@@ -373,7 +370,7 @@
373370 	if (skb_rtable(skb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
374371 		goto drop;
375372 
376
-	return tcp_conn_request(&mptcp_subflow_request_sock_ops,
373
+	return tcp_conn_request(&mptcp_subflow_v4_request_sock_ops,
377374 				&subflow_request_sock_ipv4_ops,
378375 				sk, skb);
379376 drop:
....@@ -381,10 +378,17 @@
381378 	return 0;
382379 }
383380 
381
+static void subflow_v4_req_destructor(struct request_sock *req)
382
+{
383
+	subflow_req_destructor(req);
384
+	tcp_request_sock_ops.destructor(req);
385
+}
386
+
384387 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
385
-static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops;
386
-static struct inet_connection_sock_af_ops subflow_v6_specific;
387
-static struct inet_connection_sock_af_ops subflow_v6m_specific;
388
+static struct request_sock_ops mptcp_subflow_v6_request_sock_ops __ro_after_init;
389
+static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops __ro_after_init;
390
+static struct inet_connection_sock_af_ops subflow_v6_specific __ro_after_init;
391
+static struct inet_connection_sock_af_ops subflow_v6m_specific __ro_after_init;
388392 
389393 static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
390394 {
....@@ -403,14 +407,35 @@
403407 		return 0;
404408 	}
405409 
406
-	return tcp_conn_request(&mptcp_subflow_request_sock_ops,
410
+	return tcp_conn_request(&mptcp_subflow_v6_request_sock_ops,
407411 				&subflow_request_sock_ipv6_ops, sk, skb);
408412 
409413 drop:
410414 	tcp_listendrop(sk);
411415 	return 0; /* don't send reset */
412416 }
417
+
418
+static void subflow_v6_req_destructor(struct request_sock *req)
419
+{
420
+	subflow_req_destructor(req);
421
+	tcp6_request_sock_ops.destructor(req);
422
+}
413423 #endif
424
+
425
+struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops,
426
+					       struct sock *sk_listener,
427
+					       bool attach_listener)
428
+{
429
+	if (ops->family == AF_INET)
430
+		ops = &mptcp_subflow_v4_request_sock_ops;
431
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
432
+	else if (ops->family == AF_INET6)
433
+		ops = &mptcp_subflow_v6_request_sock_ops;
434
+#endif
435
+
436
+	return inet_reqsk_alloc(ops, sk_listener, attach_listener);
437
+}
438
+EXPORT_SYMBOL(mptcp_subflow_reqsk_alloc);
414439 
415440 /* validate hmac received in third ACK */
416441 static bool subflow_hmac_valid(const struct request_sock *req,
....@@ -636,7 +661,7 @@
636661 	return child;
637662 }
638663 
639
-static struct inet_connection_sock_af_ops subflow_specific;
664
+static struct inet_connection_sock_af_ops subflow_specific __ro_after_init;
640665 
641666 enum mapping_status {
642667 	MAPPING_OK,
....@@ -1017,7 +1042,7 @@
10171042 	}
10181043 }
10191044 
1020
-static struct inet_connection_sock_af_ops *
1045
+static const struct inet_connection_sock_af_ops *
10211046 subflow_default_af_ops(struct sock *sk)
10221047 {
10231048 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
....@@ -1032,7 +1057,7 @@
10321057 {
10331058 	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
10341059 	struct inet_connection_sock *icsk = inet_csk(sk);
1035
-	struct inet_connection_sock_af_ops *target;
1060
+	const struct inet_connection_sock_af_ops *target;
10361061 
10371062 	target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk);
10381063 
....@@ -1377,7 +1402,6 @@
13771402 static int subflow_ops_init(struct request_sock_ops *subflow_ops)
13781403 {
13791404 	subflow_ops->obj_size = sizeof(struct mptcp_subflow_request_sock);
1380
-	subflow_ops->slab_name = "request_sock_subflow";
13811405 
13821406 	subflow_ops->slab = kmem_cache_create(subflow_ops->slab_name,
13831407 					      subflow_ops->obj_size, 0,
....@@ -1387,16 +1411,17 @@
13871411 	if (!subflow_ops->slab)
13881412 		return -ENOMEM;
13891413 
1390
-	subflow_ops->destructor = subflow_req_destructor;
1391
-
13921414 	return 0;
13931415 }
13941416 
13951417 void __init mptcp_subflow_init(void)
13961418 {
1397
-	mptcp_subflow_request_sock_ops = tcp_request_sock_ops;
1398
-	if (subflow_ops_init(&mptcp_subflow_request_sock_ops) != 0)
1399
-		panic("MPTCP: failed to init subflow request sock ops\n");
1419
+	mptcp_subflow_v4_request_sock_ops = tcp_request_sock_ops;
1420
+	mptcp_subflow_v4_request_sock_ops.slab_name = "request_sock_subflow_v4";
1421
+	mptcp_subflow_v4_request_sock_ops.destructor = subflow_v4_req_destructor;
1422
+
1423
+	if (subflow_ops_init(&mptcp_subflow_v4_request_sock_ops) != 0)
1424
+		panic("MPTCP: failed to init subflow v4 request sock ops\n");
14001425 
14011426 	subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops;
14021427 	subflow_request_sock_ipv4_ops.init_req = subflow_v4_init_req;
....@@ -1407,6 +1432,20 @@
14071432 	subflow_specific.sk_rx_dst_set = subflow_finish_connect;
14081433 
14091434 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
1435
+	/* In struct mptcp_subflow_request_sock, we assume the TCP request sock
1436
+	 * structures for v4 and v6 have the same size. It should not changed in
1437
+	 * the future but better to make sure to be warned if it is no longer
1438
+	 * the case.
1439
+	 */
1440
+	BUILD_BUG_ON(sizeof(struct tcp_request_sock) != sizeof(struct tcp6_request_sock));
1441
+
1442
+	mptcp_subflow_v6_request_sock_ops = tcp6_request_sock_ops;
1443
+	mptcp_subflow_v6_request_sock_ops.slab_name = "request_sock_subflow_v6";
1444
+	mptcp_subflow_v6_request_sock_ops.destructor = subflow_v6_req_destructor;
1445
+
1446
+	if (subflow_ops_init(&mptcp_subflow_v6_request_sock_ops) != 0)
1447
+		panic("MPTCP: failed to init subflow v6 request sock ops\n");
1448
+
14101449 	subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops;
14111450 	subflow_request_sock_ipv6_ops.init_req = subflow_v6_init_req;
14121451