[PATCH] net: remove unused TCPF_TSQ_DEFERRED

[PATCH] net: remove unused TCPF_TSQ_DEFERRED

[Jens Axboe]

tcp_release_cb() checks for this flag, but nobody is setting it. Just
kill it off.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 78b91bb92f0d..7d803ab7da45 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -428,7 +428,6 @@ enum tsq_enum {
 enum tsq_flags {
 	TSQF_THROTTLED			= (1UL << TSQ_THROTTLED),
 	TSQF_QUEUED			= (1UL << TSQ_QUEUED),
-	TCPF_TSQ_DEFERRED		= (1UL << TCP_TSQ_DEFERRED),
 	TCPF_WRITE_TIMER_DEFERRED	= (1UL << TCP_WRITE_TIMER_DEFERRED),
 	TCPF_DELACK_TIMER_DEFERRED	= (1UL << TCP_DELACK_TIMER_DEFERRED),
 	TCPF_MTU_REDUCED_DEFERRED	= (1UL << TCP_MTU_REDUCED_DEFERRED),
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 5079832af5c1..a53bc45a2053 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1064,8 +1064,7 @@ static void tcp_tasklet_func(struct tasklet_struct *t)
 	}
 }
 
-#define TCP_DEFERRED_ALL (TCPF_TSQ_DEFERRED |		\
-			  TCPF_WRITE_TIMER_DEFERRED |	\
+#define TCP_DEFERRED_ALL (TCPF_WRITE_TIMER_DEFERRED |	\
 			  TCPF_DELACK_TIMER_DEFERRED |	\
 			  TCPF_MTU_REDUCED_DEFERRED)
 /**
@@ -1087,10 +1086,6 @@ void tcp_release_cb(struct sock *sk)
 		nflags = flags & ~TCP_DEFERRED_ALL;
 	} while (cmpxchg(&sk->sk_tsq_flags, flags, nflags) != flags);
 
-	if (flags & TCPF_TSQ_DEFERRED) {
-		tcp_tsq_write(sk);
-		__sock_put(sk);
-	}
 	/* Here begins the tricky part :
 	 * We are called from release_sock() with :
 	 * 1) BH disabled

-- 
Jens Axboe

Re: [PATCH] net: remove unused TCPF_TSQ_DEFERRED

[Jens Axboe]

On 3/26/22 9:57 AM, Jens Axboe wrote:
> tcp_release_cb() checks for this flag, but nobody is setting it. Just
> kill it off.

Should've checked closer, bit TCP_TSQ_DEFERRED can be set of course.
So just disregard this one, sorry for the noise!

-- 
Jens Axboe