From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbdKIO0l (ORCPT ); Thu, 9 Nov 2017 09:26:41 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:51187 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755066AbdKIO0i (ORCPT ); Thu, 9 Nov 2017 09:26:38 -0500 X-Google-Smtp-Source: ABhQp+TGXtjnhmhA/295tuvd5LqzdKyIFljcLtNn280Om9zM3njU8q5nkoHSyuS+D6LWkVhmtvMOpQ== From: Yafang Shao To: davem@davemloft.net Cc: kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, rostedt@goodmis.org, mingo@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH net-next 2/2] tcp: handle TCP_TIME_WAIT/TCP_NEW_SYN_RECV in tcp_set_state tracepoint Date: Thu, 9 Nov 2017 14:26:04 +0000 Message-Id: <1510237564-6013-2-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1510237564-6013-1-git-send-email-laoar.shao@gmail.com> References: <1510237564-6013-1-git-send-email-laoar.shao@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When TCP connetion in TCP_TIME_WAIT or TCP_NEW_SYN_RECV state, it can't get the sport/dport/saddr/daddr from inet_sock. trace_tcp_set_state may be called when the oldstate in these two states. Signed-off-by: Yafang Shao --- include/trace/events/tcp.h | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index 07cccca..1982a71 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -196,7 +196,6 @@ ), TP_fast_assign( - struct inet_sock *inet = inet_sk(sk); struct in6_addr *pin6; __be32 *p32; @@ -204,14 +203,34 @@ __entry->oldstate = oldstate; __entry->newstate = newstate; - __entry->sport = ntohs(inet->inet_sport); - __entry->dport = ntohs(inet->inet_dport); + if (oldstate == TCP_TIME_WAIT) { + __entry->sport = ntohs(inet_twsk(sk)->tw_sport); + __entry->dport = ntohs(inet_twsk(sk)->tw_dport); - p32 = (__be32 *) __entry->saddr; - *p32 = inet->inet_saddr; + p32 = (__be32 *) __entry->saddr; + *p32 = inet_twsk(sk)->tw_rcv_saddr; - p32 = (__be32 *) __entry->daddr; - *p32 = inet->inet_daddr; + p32 = (__be32 *) __entry->daddr; + *p32 = inet_twsk(sk)->tw_daddr; + } else if (oldstate == TCP_NEW_SYN_RECV) { + __entry->sport = inet_rsk(inet_reqsk(sk))->ir_num; + __entry->dport = ntohs(inet_rsk(inet_reqsk(sk))->ir_rmt_port); + + p32 = (__be32 *) __entry->saddr; + *p32 = inet_rsk(inet_reqsk(sk))->ir_loc_addr; + + p32 = (__be32 *) __entry->daddr; + *p32 = inet_rsk(inet_reqsk(sk))->ir_rmt_addr; + } else { + __entry->sport = ntohs(inet_sk(sk)->inet_sport); + __entry->dport = ntohs(inet_sk(sk)->inet_dport); + + p32 = (__be32 *) __entry->saddr; + *p32 = inet_sk(sk)->inet_saddr; + + p32 = (__be32 *) __entry->daddr; + *p32 = inet_sk(sk)->inet_daddr; + } #if IS_ENABLED(CONFIG_IPV6) if (sk->sk_family == AF_INET6) { -- 1.8.3.1