| Message ID | 1542205577-21925-1-git-send-email-laoar.shao@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] tcp: clean up STATE_TRACE | expand |
On 11/14/2018 06:26 AM, Yafang Shao wrote: > Currently we can use bpf or tcp tracepoint to conveniently trace the tcp > state transition at the run time. > So we don't need to do this stuff at the compile time anymore. > > Signed-off-by: Yafang Shao <laoar.shao@gmail.com> > --- > include/net/tcp.h | 12 ------------ > net/ipv4/tcp.c | 4 ---- > 2 files changed, 16 deletions(-) Yes, sure. Signed-off-by: Eric Dumazet <edumazet@google.com>
From: Yafang Shao <laoar.shao@gmail.com> Date: Wed, 14 Nov 2018 22:26:17 +0800 > Currently we can use bpf or tcp tracepoint to conveniently trace the tcp > state transition at the run time. > So we don't need to do this stuff at the compile time anymore. > > Signed-off-by: Yafang Shao <laoar.shao@gmail.com> Applied.
diff --git a/include/net/tcp.h b/include/net/tcp.h index 4743836..9d51a20 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1328,20 +1328,8 @@ static inline bool tcp_checksum_complete(struct sk_buff *skb) bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb); int tcp_filter(struct sock *sk, struct sk_buff *skb); - -#undef STATE_TRACE - -#ifdef STATE_TRACE -static const char *statename[]={ - "Unused","Established","Syn Sent","Syn Recv", - "Fin Wait 1","Fin Wait 2","Time Wait", "Close", - "Close Wait","Last ACK","Listen","Closing" -}; -#endif void tcp_set_state(struct sock *sk, int state); - void tcp_done(struct sock *sk); - int tcp_abort(struct sock *sk, int err); static inline void tcp_sack_reset(struct tcp_options_received *rx_opt) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9e6bc4d..ca2b08c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2241,10 +2241,6 @@ void tcp_set_state(struct sock *sk, int state) * socket sitting in hash tables. */ inet_sk_state_store(sk, state); - -#ifdef STATE_TRACE - SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n", sk, statename[oldstate], statename[state]); -#endif } EXPORT_SYMBOL_GPL(tcp_set_state);
Currently we can use bpf or tcp tracepoint to conveniently trace the tcp state transition at the run time. So we don't need to do this stuff at the compile time anymore. Signed-off-by: Yafang Shao <laoar.shao@gmail.com> --- include/net/tcp.h | 12 ------------ net/ipv4/tcp.c | 4 ---- 2 files changed, 16 deletions(-)