Skip to contentSkip to conversation

tcp: Remove sk->sk_prot->orphan_count.

PATCH Applied Kuniyuki Iwashima 4 participants 4 messages Aug 29, 2025 – Sep 1, 2025

Subsystems (5)
lore
Share & tools
lore

Kuniyuki Iwashima

author maintainer
#0 lore raw

PATCH 1/1 tcp: Remove sk->sk_prot->orphan_count.

TCP tracks the number of orphaned (SOCK_DEAD but not yet destructed) sockets in tcp_orphan_count.

In some code that was shared with DCCP, tcp_orphan_count is referenced via sk->sk_prot->orphan_count.

Let's reference tcp_orphan_count directly.

inet_csk_prepare_for_destroy_sock() is moved to inet_connection_sock.c due to header dependency.

---
 .../ethernet/chelsio/inline_crypto/chtls/chtls_cm.c   |  4 ++--
 .../ethernet/chelsio/inline_crypto/chtls/chtls_cm.h   |  1 -
 include/net/inet_connection_sock.h                    |  8 +-------
 include/net/sock.h                                    |  2 --
 include/net/tcp.h                                     | 10 ++++++++++
 net/ipv4/inet_connection_sock.c                       | 11 +++++++++--
 net/ipv4/inet_hashtables.c                            |  2 +-
 net/ipv4/tcp.c                                        |  2 +-
 net/ipv4/tcp_ipv4.c                                   |  1 -
 net/ipv6/tcp_ipv6.c                                   |  1 -
 10 files changed, 24 insertions(+), 18 deletions(-)
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +2 -2
index 000116e47e38..4ee970f3bad6 100644
@@ -505,7 +505,7 @@ static void reset_listen_child(struct sock *child)
 
 	chtls_send_reset(child, CPL_ABORT_SEND_RST, skb);
 	sock_orphan(child);
-	INC_ORPHAN_COUNT(child);
+	tcp_orphan_count_inc();
 	if (child->sk_state == TCP_CLOSE)
 		inet_csk_destroy_sock(child);
 }
@@ -870,7 +870,7 @@ static void do_abort_syn_rcv(struct sock *child, struct sock *parent)
 		 * created only after 3 way handshake is done.
 		 */
 		sock_orphan(child);
-		INC_ORPHAN_COUNT(child);
+		tcp_orphan_count_inc();
 		chtls_release_resources(child);
 		chtls_conn_done(child);
 	} else {
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h +0 -1
index 667effc2a23c..29ceff5a5fcb 100644
@@ -95,7 +95,6 @@ struct deferred_skb_cb {
 #define WSCALE_OK(tp) ((tp)->rx_opt.wscale_ok)
 #define TSTAMP_OK(tp) ((tp)->rx_opt.tstamp_ok)
 #define SACK_OK(tp) ((tp)->rx_opt.sack_ok)
-#define INC_ORPHAN_COUNT(sk) this_cpu_inc(*(sk)->sk_prot->orphan_count)
 
 /* TLS SKB */
 #define skb_ulp_tls_inline(skb)      (ULP_SKB_CB(skb)->ulp.tls.ofld)
include/net/inet_connection_sock.h +1 -7
index 1735db332aab..0737d8e178dd 100644
@@ -299,14 +299,8 @@ reqsk_timeout(struct request_sock *req, unsigned long max_timeout)
 	return (unsigned long)min_t(u64, timeout, max_timeout);
 }
 
-static inline void inet_csk_prepare_for_destroy_sock(struct sock *sk)
-{
-	/* The below has to be done to allow calling inet_csk_destroy_sock */
-	sock_set_flag(sk, SOCK_DEAD);
-	this_cpu_inc(*sk->sk_prot->orphan_count);
-}
-
 void inet_csk_destroy_sock(struct sock *sk);
+void inet_csk_prepare_for_destroy_sock(struct sock *sk);
 void inet_csk_prepare_forced_close(struct sock *sk);
 
 /*
include/net/sock.h +0 -2
index 0dbc3cbe1b47..e79c04f7220b 100644
@@ -1359,8 +1359,6 @@ struct proto {
 	unsigned int		useroffset;	/* Usercopy region offset */
 	unsigned int		usersize;	/* Usercopy region size */
 
-	unsigned int __percpu	*orphan_count;
-
 	struct request_sock_ops	*rsk_prot;
 	struct timewait_sock_ops *twsk_prot;
 
include/net/tcp.h +10 -0
index 16dc9cebb9d2..0fb7923b8367 100644
@@ -54,6 +54,16 @@ extern struct inet_hashinfo tcp_hashinfo;
 DECLARE_PER_CPU(unsigned int, tcp_orphan_count);
 int tcp_orphan_count_sum(void);
 
+static inline void tcp_orphan_count_inc(void)
+{
+	this_cpu_inc(tcp_orphan_count);
+}
+
+static inline void tcp_orphan_count_dec(void)
+{
+	this_cpu_dec(tcp_orphan_count);
+}
+
 DECLARE_PER_CPU(u32, tcp_tw_isn);
 
 void tcp_time_wait(struct sock *sk, int state, int timeo);
net/ipv4/inet_connection_sock.c +9 -2
index 0ef1eacd539d..142ff8d86fc2 100644
@@ -1296,12 +1296,19 @@ void inet_csk_destroy_sock(struct sock *sk)
 
 	xfrm_sk_free_policy(sk);
 
-	this_cpu_dec(*sk->sk_prot->orphan_count);
+	tcp_orphan_count_dec();
 
 	sock_put(sk);
 }
 EXPORT_SYMBOL(inet_csk_destroy_sock);
 
+void inet_csk_prepare_for_destroy_sock(struct sock *sk)
+{
+	/* The below has to be done to allow calling inet_csk_destroy_sock */
+	sock_set_flag(sk, SOCK_DEAD);
+	tcp_orphan_count_inc();
+}
+
 /* This function allows to force a closure of a socket after the call to
  * tcp_create_openreq_child().
  */
@@ -1369,7 +1376,7 @@ static void inet_child_forget(struct sock *sk, struct request_sock *req,
 
 	sock_orphan(child);
 
-	this_cpu_inc(*sk->sk_prot->orphan_count);
+	tcp_orphan_count_inc();
 
 	if (sk->sk_protocol == IPPROTO_TCP && tcp_rsk(req)->tfo_listener) {
 		BUG_ON(rcu_access_pointer(tcp_sk(child)->fastopen_rsk) != req);
net/ipv4/inet_hashtables.c +1 -1
index ff47303fe7e0..b880b7a0dd73 100644
@@ -707,7 +707,7 @@ bool inet_ehash_nolisten(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	if (ok) {
 		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
 	} else {
-		this_cpu_inc(*sk->sk_prot->orphan_count);
+		tcp_orphan_count_inc();
 		inet_sk_set_state(sk, TCP_CLOSE);
 		sock_set_flag(sk, SOCK_DEAD);
 		inet_csk_destroy_sock(sk);
net/ipv4/tcp.c +1 -1
index 9bc8317e92b7..40b774b4f587 100644
@@ -3195,7 +3195,7 @@ void __tcp_close(struct sock *sk, long timeout)
 	/* remove backlog if any, without releasing ownership. */
 	__release_sock(sk);
 
-	this_cpu_inc(tcp_orphan_count);
+	tcp_orphan_count_inc();
 
 	/* Have we already been destroyed by a softirq or backlog? */
 	if (state != TCP_CLOSE && sk->sk_state == TCP_CLOSE)
net/ipv4/tcp_ipv4.c +0 -1
index 7c1d612afca1..1e58a8a9ff7a 100644
@@ -3517,7 +3517,6 @@ struct proto tcp_prot = {
 	.leave_memory_pressure	= tcp_leave_memory_pressure,
 	.stream_memory_free	= tcp_stream_memory_free,
 	.sockets_allocated	= &tcp_sockets_allocated,
-	.orphan_count		= &tcp_orphan_count,
 
 	.memory_allocated	= &net_aligned_data.tcp_memory_allocated,
 	.per_cpu_fw_alloc	= &tcp_memory_per_cpu_fw_alloc,
net/ipv6/tcp_ipv6.c +0 -1
index b4e56b877273..07ba32156770 100644
@@ -2353,7 +2353,6 @@ struct proto tcpv6_prot = {
 	.per_cpu_fw_alloc	= &tcp_memory_per_cpu_fw_alloc,
 
 	.memory_pressure	= &tcp_memory_pressure,
-	.orphan_count		= &tcp_orphan_count,
 	.sysctl_mem		= sysctl_tcp_mem,
 	.sysctl_wmem_offset	= offsetof(struct net, ipv4.sysctl_tcp_wmem),
 	.sysctl_rmem_offset	= offsetof(struct net, ipv4.sysctl_tcp_rmem),
Signature · 1 line
2.51.0.318.gd7df087d1a-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Kuniyuki Iwashima

TCP tracks the number of orphaned (SOCK_DEAD but not yet destructed) sockets in tcp_orphan_count.

In some code that was shared with DCCP, tcp_orphan_count is referenced via sk->sk_prot->orphan_count.

Quoted 6 lines

Let's reference tcp_orphan_count directly.

inet_csk_prepare_for_destroy_sock() is moved to inet_connection_sock.c due to header dependency.

Thanks,
Jason

Reviewed-by on v1 1/1
#2 lore raw
In reply to Kuniyuki Iwashima
Quoted 7 lines · Kuniyuki Iwashima

TCP tracks the number of orphaned (SOCK_DEAD but not yet destructed) sockets in tcp_orphan_count.

In some code that was shared with DCCP, tcp_orphan_count is referenced via sk->sk_prot->orphan_count.

Quoted 6 lines

Let's reference tcp_orphan_count directly.

inet_csk_prepare_for_destroy_sock() is moved to inet_connection_sock.c due to header dependency.

#3 lore raw
In reply to Kuniyuki Iwashima
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Fri, 29 Aug 2025 21:56:38 +0000 you wrote:

TCP tracks the number of orphaned (SOCK_DEAD but not yet destructed) sockets in tcp_orphan_count.

In some code that was shared with DCCP, tcp_orphan_count is referenced via sk->sk_prot->orphan_count.

Let's reference tcp_orphan_count directly.

[...]

Here is the summary with links:
- [v1,net-next] tcp: Remove sk->sk_prot->orphan_count.

    https://git.kernel.org/netdev/net-next/c/7051b54fb5aa

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html