mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Song Liu <songliubraving@fb.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: David Miller <davem@davemloft.net>,
	Alexei Starovoitov <alexei.starovoitov@gmail.com>,
	Yafang Shao <laoar.shao@gmail.com>,
	"mingo@redhat.com" <mingo@redhat.com>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] tcp: Export to userspace the TCP state names for the trace events
Date: Fri, 10 Nov 2017 01:42:32 +0000	[thread overview]
Message-ID: <6439E53C-00BA-4D6E-A719-D1F45F20666A@fb.com> (raw)
In-Reply-To: <20171109195712.47fe23b6@gandalf.local.home>


> On Nov 9, 2017, at 4:57 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> 
> 
> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> 
> The TCP trace events (specifically tcp_set_state), maps emums to symbol
> names via __print_symbolic(). But this only works for reading trace events
> from the tracefs trace files. If perf or trace-cmd were to record these
> events, the event format file does not convert the enum names into numbers,
> and you get something like:
> 
> __print_symbolic(REC->oldstate,
>    { TCP_ESTABLISHED, "TCP_ESTABLISHED" },
>    { TCP_SYN_SENT, "TCP_SYN_SENT" },
>    { TCP_SYN_RECV, "TCP_SYN_RECV" },
>    { TCP_FIN_WAIT1, "TCP_FIN_WAIT1" },
>    { TCP_FIN_WAIT2, "TCP_FIN_WAIT2" },
>    { TCP_TIME_WAIT, "TCP_TIME_WAIT" },
>    { TCP_CLOSE, "TCP_CLOSE" },
>    { TCP_CLOSE_WAIT, "TCP_CLOSE_WAIT" },
>    { TCP_LAST_ACK, "TCP_LAST_ACK" },
>    { TCP_LISTEN, "TCP_LISTEN" },
>    { TCP_CLOSING, "TCP_CLOSING" },
>    { TCP_NEW_SYN_RECV, "TCP_NEW_SYN_RECV" })
> 
> Where trace-cmd and perf do not know the values of those enums.
> 
> Use the TRACE_DEFINE_ENUM() macros that will have the trace events convert
> the enum strings into their values at system boot. This will allow perf and
> trace-cmd to see actual numbers and not enums:
> 
> __print_symbolic(REC->oldstate,
>    { 1, "TCP_ESTABLISHED" },
>    { 2, "TCP_SYN_SENT" },
>    { 3, "TCP_SYN_RECV" },
>    { 4, "TCP_FIN_WAIT1" },
>    { 5, "TCP_FIN_WAIT2" },
>    { 6, "TCP_TIME_WAIT" },
>    { 7, "TCP_CLOSE" },
>    { 8, "TCP_CLOSE_WAIT" },
>    { 9, "TCP_LAST_ACK" },
>    { 10, "TCP_LISTEN" },
>    { 11, "TCP_CLOSING" },
>    { 12, "TCP_NEW_SYN_RECV" })
> 
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
> include/trace/events/tcp.h | 41 ++++++++++++++++++++++++++++-------------
> 1 file changed, 28 insertions(+), 13 deletions(-)
> 
> diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
> index 07cccca6cbf1..62e5bad7901f 100644
> --- a/include/trace/events/tcp.h
> +++ b/include/trace/events/tcp.h
> @@ -9,21 +9,36 @@
> #include <linux/tracepoint.h>
> #include <net/ipv6.h>
> 
> +#define tcp_state_names				\
> +	EM(TCP_ESTABLISHED)			\
> +	EM(TCP_SYN_SENT)			\
> +	EM(TCP_SYN_RECV)			\
> +	EM(TCP_FIN_WAIT1)			\
> +	EM(TCP_FIN_WAIT2)			\
> +	EM(TCP_TIME_WAIT)			\
> +	EM(TCP_CLOSE)				\
> +	EM(TCP_CLOSE_WAIT)			\
> +	EM(TCP_LAST_ACK)			\
> +	EM(TCP_LISTEN)				\
> +	EM(TCP_CLOSING)				\
> +	EMe(TCP_NEW_SYN_RECV)
> +
> +/* enums need to be exported to user space */
> +#undef EM
> +#undef EMe
> +#define EM(a)         TRACE_DEFINE_ENUM(a);
> +#define EMe(a)        TRACE_DEFINE_ENUM(a);
> +
> +tcp_state_names
> +
> +#undef EM
> +#undef EMe
> +#define EM(a)         tcp_state_name(a),
> +#define EMe(a)        tcp_state_name(a)
> +
> #define tcp_state_name(state)	{ state, #state }
> #define show_tcp_state_name(val)			\
> -	__print_symbolic(val,				\
> -		tcp_state_name(TCP_ESTABLISHED),	\
> -		tcp_state_name(TCP_SYN_SENT),		\
> -		tcp_state_name(TCP_SYN_RECV),		\
> -		tcp_state_name(TCP_FIN_WAIT1),		\
> -		tcp_state_name(TCP_FIN_WAIT2),		\
> -		tcp_state_name(TCP_TIME_WAIT),		\
> -		tcp_state_name(TCP_CLOSE),		\
> -		tcp_state_name(TCP_CLOSE_WAIT),		\
> -		tcp_state_name(TCP_LAST_ACK),		\
> -		tcp_state_name(TCP_LISTEN),		\
> -		tcp_state_name(TCP_CLOSING),		\
> -		tcp_state_name(TCP_NEW_SYN_RECV))
> +	__print_symbolic(val, tcp_state_names)
> 
> /*
>  * tcp event with arguments sk and skb
> -- 
> 2.13.6
> 

Reviewed-and-tested-by: Song Liu <songliubraving@fb.com>

  reply	other threads:[~2017-11-10  1:42 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-09  6:01 [PATCH] net/tcp: introduce TRACE_EVENT for TCP/IPv4 state transition Yafang Shao
2017-11-09  6:43 ` Alexei Starovoitov
2017-11-09  6:50   ` Yafang Shao
2017-11-09 18:18   ` Steven Rostedt
2017-11-09 18:34     ` Song Liu
2017-11-09 23:40       ` Song Liu
2017-11-10  0:42         ` Steven Rostedt
2017-11-10  0:57         ` [PATCH] tcp: Export to userspace the TCP state names for the trace events Steven Rostedt
2017-11-10  1:42           ` Song Liu [this message]
2017-11-10  4:56           ` Yafang Shao
2017-11-10 15:07             ` Steven Rostedt
2017-11-10 17:37               ` Song Liu
2017-11-11  2:06               ` Yafang Shao
2017-11-11  3:32                 ` Steven Rostedt
2017-11-11 13:26                   ` Yafang Shao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6439E53C-00BA-4D6E-A719-D1F45F20666A@fb.com \
    --to=songliubraving@fb.com \
    --cc=alexei.starovoitov@gmail.com \
    --cc=davem@davemloft.net \
    --cc=laoar.shao@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®