From patchwork Thu Dec 7 14:10:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 845585 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZKq4H4NA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ysy7y6HrGz9sNd for ; Fri, 8 Dec 2017 01:11:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753921AbdLGOK7 (ORCPT ); Thu, 7 Dec 2017 09:10:59 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:42886 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753794AbdLGOK5 (ORCPT ); Thu, 7 Dec 2017 09:10:57 -0500 Received: by mail-pg0-f67.google.com with SMTP id e14so4542397pgr.9; Thu, 07 Dec 2017 06:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7XnP4tuNPuKBltNb2d6BlpZvUCRGPMXRjh1RlerMeVQ=; b=ZKq4H4NAieDuCDr4U17EnmKVAcHZNDlCt2COmyuSrl18nSH9jwS7CWKka1pXK6E7El Ecllr696QvxTlA3j1UVNcSOUGPracKmgKR4zJsi95qSblDGMgCYoA5nnEhi88mFDnQFb vUPxAzT420cBOov2BE75icOXk7MkZHhXoIbHDs92rIi1GxqcadQCZkNW5ZudcfvuPm6u fXkT0gVPHm3LsE1hz3mMgS+zoA+xyBArVBC/Gb7sO3AoaniiEefuf4Wg6jYDUh36h7yz IEqsP/j5tu+WuTUvli5I8cJL962aEZk+/xRXM/YB1NE4Q0IHW6htrCaKoDmWEi6DMOfL mJ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7XnP4tuNPuKBltNb2d6BlpZvUCRGPMXRjh1RlerMeVQ=; b=mRCRuBEzSThD5hxFobmifdBQRC2NkUlCTKkFvBXag2bUaDLGMHjoKcnEVCSiQ55NTH qBgYj6V/YZhqqEA460dbhYRHO/IVluRsRQhPZXicNVGbkiIhkk+83p/na2AFdLK5WTmz h/2DTU+J0lKMXHVJPrFXuK/YU8Z9jKNcf8xGPg3OaLeMb1a+pxsUFk8lBncPnd9VjGiG uxI4QClbFsZj+z8dIsMnbXBDMMpduxG8wl9ni/ru36fkPRaqXF7TH3HgVLGL/ol44Ca/ 9KQQJ39o2/HIbQIWY5VtNCuWrpkYkXyvOwgoTdFqulsqCMa6P/Z4prh+WzwWcvxyjpsK y6Hw== X-Gm-Message-State: AJaThX5s0EouFfPS+g0FJbvFC7If6ybKjeiMJZIWq0dER7eYJLPw7iDn XTewrcViN8/0PdYG+pEvqko= X-Google-Smtp-Source: AGs4zMZHYBT7HgaorJmfNlYqkbcEBSRnLBgkHlyRCWsIZxJtq4ig58LQZ7dXQ36IUbpyVEP8htYS5w== X-Received: by 10.99.127.25 with SMTP id a25mr25046112pgd.10.1512655856367; Thu, 07 Dec 2017 06:10:56 -0800 (PST) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id 69sm10069866pft.11.2017.12.07.06.10.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 06:10:54 -0800 (PST) From: Yafang Shao To: davem@davemloft.net, songliubraving@fb.com, marcelo.leitner@gmail.com Cc: kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, rostedt@goodmis.org, bgregg@netflix.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH v5 net-next] net/tcp: trace all TCP/IP state transition with tcp_set_state tracepoint Date: Thu, 7 Dec 2017 14:10:42 +0000 Message-Id: <1512655842-17784-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The TCP/IP transition from TCP_LISTEN to TCP_SYN_RECV and some other transitions are not traced with tcp_set_state tracepoint. In order to trace the whole tcp lifespans, two helpers are introduced, void sk_set_state(struct sock *sk, int state); void sk_state_store(struct sock *sk, int newstate); When do TCP/IP state transition, we should use these two helpers or use tcp_set_state() other than assigning a value to sk_state directly. Signed-off-by: Yafang Shao Acked-by: Song Liu Reviewed-by: Marcelo Ricardo Leitner Signed-off-by: Yafang Shao --- v4->v5: Trace only TCP sockets, whatever it is stream socket or raw socket. v3->v4: Do not trace DCCP socket v2->v3: Per suggestion from Marcelo Ricardo Leitner, inverting __ to sk_state_store. --- include/net/sock.h | 8 ++++++-- net/core/sock.c | 15 +++++++++++++++ net/ipv4/inet_connection_sock.c | 5 +++-- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/tcp.c | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 79e1a2c..1cf7685 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2349,18 +2349,22 @@ static inline int sk_state_load(const struct sock *sk) } /** - * sk_state_store - update sk->sk_state + * __sk_state_store - update sk->sk_state * @sk: socket pointer * @newstate: new state * * Paired with sk_state_load(). Should be used in contexts where * state change might impact lockless readers. */ -static inline void sk_state_store(struct sock *sk, int newstate) +static inline void __sk_state_store(struct sock *sk, int newstate) { smp_store_release(&sk->sk_state, newstate); } +/* For tcp_set_state tracepoint */ +void sk_state_store(struct sock *sk, int newstate); +void sk_set_state(struct sock *sk, int state); + void sock_enable_timestamp(struct sock *sk, int flag); int sock_get_timestamp(struct sock *, struct timeval __user *); int sock_get_timestampns(struct sock *, struct timespec __user *); diff --git a/net/core/sock.c b/net/core/sock.c index c0b5b2f..61841a2 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -138,6 +138,7 @@ #include #include +#include #include #include @@ -2859,6 +2860,20 @@ int sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp) } EXPORT_SYMBOL(sock_get_timestampns); +void sk_state_store(struct sock *sk, int newstate) +{ + if (sk->sk_protocol == IPPROTO_TCP) + trace_tcp_set_state(sk, sk->sk_state, newstate); + __sk_state_store(sk, newstate); +} + +void sk_set_state(struct sock *sk, int state) +{ + if (sk->sk_protocol == IPPROTO_TCP) + trace_tcp_set_state(sk, sk->sk_state, state); + sk->sk_state = state; +} + void sock_enable_timestamp(struct sock *sk, int flag) { if (!sock_flag(sk, flag)) { diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 4ca46dc..41f9c87 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -783,7 +783,7 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, if (newsk) { struct inet_connection_sock *newicsk = inet_csk(newsk); - newsk->sk_state = TCP_SYN_RECV; + sk_set_state(newsk, TCP_SYN_RECV); newicsk->icsk_bind_hash = NULL; inet_sk(newsk)->inet_dport = inet_rsk(req)->ir_rmt_port; @@ -888,7 +888,8 @@ int inet_csk_listen_start(struct sock *sk, int backlog) return 0; } - sk->sk_state = TCP_CLOSE; + sk_set_state(sk, TCP_CLOSE); + return err; } EXPORT_SYMBOL_GPL(inet_csk_listen_start); diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index f6f5810..5973693 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -544,7 +544,7 @@ bool inet_ehash_nolisten(struct sock *sk, struct sock *osk) sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); } else { percpu_counter_inc(sk->sk_prot->orphan_count); - sk->sk_state = TCP_CLOSE; + sk_set_state(sk, TCP_CLOSE); sock_set_flag(sk, SOCK_DEAD); inet_csk_destroy_sock(sk); } diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1803116..ac98dc6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2065,7 +2065,7 @@ void tcp_set_state(struct sock *sk, int state) /* Change state AFTER socket is unhashed to avoid closed * socket sitting in hash tables. */ - sk_state_store(sk, state); + __sk_state_store(sk, state); #ifdef STATE_TRACE SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n", sk, statename[oldstate], statename[state]);