From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755397AbdKIXmK (ORCPT ); Thu, 9 Nov 2017 18:42:10 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:39518 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755248AbdKIXmH (ORCPT ); Thu, 9 Nov 2017 18:42:07 -0500 From: Song Liu To: Steven Rostedt CC: Alexei Starovoitov , Yafang Shao , David Miller , "mingo@redhat.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] net/tcp: introduce TRACE_EVENT for TCP/IPv4 state transition Thread-Topic: [PATCH] net/tcp: introduce TRACE_EVENT for TCP/IPv4 state transition Thread-Index: AQHTWSY6ZdIjzxdAaEO/ZD6h0R7NJqMMW+MAgAAEcwCAAFWJAA== Date: Thu, 9 Nov 2017 23:40:13 +0000 Message-ID: References: <1510207298-14828-1-git-send-email-laoar.shao@gmail.com> <20171109064326.skfvvohg7qhgl3lp@ast-mbp> <20171109131808.373c296f@gandalf.local.home> <30A95900-7378-439F-954E-BD5487012435@fb.com> In-Reply-To: <30A95900-7378-439F-954E-BD5487012435@fb.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3273) x-originating-ip: [2620:10d:c090:200::4:8137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR15MB1511;20:xrxfv79+JysVwbZFDyZf8e9lnD+dThnVEGi4ZyOHAfGjH0rK+NvpcvQFilgcqCxYF4IPzEgbzrIzf18+cxTJFv76GGQiFx1V1QyqfZPnyrC/dUQBOnz2M88LZ7sY3yPHOlbFYEFwvsh+q1Y64OUbGKhTsVOII9Xy+SrI328s8pg= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: 4e495681-be8a-4086-6cb7-08d527cb3970 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CY4PR15MB1511; x-ms-traffictypediagnostic: CY4PR15MB1511: x-exchange-antispam-report-test: UriScan:(67672495146484); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(11241501159)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(3231021)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR15MB1511;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR15MB1511; x-forefront-prvs: 0486A0CB86 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(24454002)(199003)(189002)(53936002)(53546010)(99286004)(102836003)(2900100001)(6512007)(229853002)(6436002)(6506006)(6246003)(316002)(97736004)(7736002)(478600001)(25786009)(3660700001)(305945005)(36756003)(81166006)(8676002)(3280700002)(6116002)(2950100002)(5660300001)(68736007)(50226002)(8936002)(81156014)(6916009)(93886005)(2906002)(33656002)(76176999)(82746002)(86362001)(54906003)(83716003)(50986999)(39060400002)(4326008)(14454004)(77096006)(106356001)(189998001)(105586002)(6486002)(101416001)(57306001);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR15MB1511;H:CY4PR15MB1512.namprd15.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <63BB217189E1524B832754A5CC385323@namprd15.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 4e495681-be8a-4086-6cb7-08d527cb3970 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2017 23:40:13.7212 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1511 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-09_11:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vA9NgET5031417 > On Nov 9, 2017, at 10:34 AM, Song Liu wrote: > >> >> On Nov 9, 2017, at 10:18 AM, Steven Rostedt wrote: >> >> On Thu, 9 Nov 2017 15:43:29 +0900 >> Alexei Starovoitov wrote: >> >>>> +TRACE_EVENT(tcp_set_state, >>>> + TP_PROTO(struct sock *sk, int oldstate, int newstate), >>>> + TP_ARGS(sk, oldstate, newstate), >>>> + >>>> + TP_STRUCT__entry( >>>> + __field(__be32, dst) >>>> + __field(__be32, src) >>>> + __field(__u16, dport) >>>> + __field(__u16, sport) >>>> + __field(int, oldstate) >>>> + __field(int, newstate) >>>> + ), >>>> + >>>> + TP_fast_assign( >>>> + if (oldstate == TCP_TIME_WAIT) { >>>> + __entry->dst = inet_twsk(sk)->tw_daddr; >>>> + __entry->src = inet_twsk(sk)->tw_rcv_saddr; >>>> + __entry->dport = ntohs(inet_twsk(sk)->tw_dport); >>>> + __entry->sport = ntohs(inet_twsk(sk)->tw_sport); >>>> + } else if (oldstate == TCP_NEW_SYN_RECV) { >>>> + __entry->dst = inet_rsk(inet_reqsk(sk))->ir_rmt_addr; >>>> + __entry->src = inet_rsk(inet_reqsk(sk))->ir_loc_addr; >>>> + __entry->dport = >>>> + ntohs(inet_rsk(inet_reqsk(sk))->ir_rmt_port); >>>> + __entry->sport = inet_rsk(inet_reqsk(sk))->ir_num; >>>> + } else { >>>> + __entry->dst = inet_sk(sk)->inet_daddr; >>>> + __entry->src = inet_sk(sk)->inet_rcv_saddr; >>>> + __entry->dport = ntohs(inet_sk(sk)->inet_dport); >>>> + __entry->sport = ntohs(inet_sk(sk)->inet_sport); >>>> + } >>>> + >>>> + __entry->oldstate = oldstate; >>>> + __entry->newstate = newstate; >>>> + ), >>>> + >>>> + TP_printk("%08X:%04X %08X:%04X, %02x %02x", >>>> + __entry->src, __entry->sport, __entry->dst, __entry->dport, >>>> + __entry->oldstate, __entry->newstate) >>> >>> direct %x of state is not allowed. >>> This has to use show_tcp_state_name() like it's done in trace_tcp_set_state >> >> Hmm, I need to look at trace_tcp_set_state. I'm guessing it is in >> net-next too? > > Yes, in net-next. There are 6 tracepoints under tcp group: > > tcp_destroy_sock > tcp_receive_reset > tcp_retransmit_skb > tcp_retransmit_synack > tcp_send_reset > tcp_set_state > > They are all added recently. > >> >>> >>> Also I'm missing the reason to introduce another tracepoint >>> that looks just like trace_tcp_set_state. >> >> I want to make sure that perf and trace-cmd can parse the TP_printk(), >> if it is having helper functions like that in the TP_printk() part, >> then the libtraceevent needs to be aware of that. >> > > tcp_set_state uses __print_symbolic to show state in text format. I found > trace-cmd cannot parse that part: > > [011] 147338.660560: tcp_set_state: sport=16262 dport=48346 \ > saddr=127.0.0.6 daddr=127.0.0.6 saddrv6=2401:db00:30:317e:face:0:1f:0 \ > daddrv6=2401:db00:30:31e5:face:0:7f:0 oldstate= newstate= > > Other parts of the output looks good to me. > > Thanks, > Song I am not sure whether this is the best approach, but the following patch fixes the output of perf: 0.44% sport=16262 dport=39362 saddr=127.0.0.6 daddr=127.0.0.6 \ saddrv6=2401:db00:30:317e:face:0:1f:0 daddrv6=2401:db00:30:31e5:face:0:7f:0 \ oldstate=TCP_CLOSE_WAIT newstate=TCP_LAST_ACK Thanks, Song >>From 4b7e27631a4c7df96a38223a95ee3ede2f5f2d19 Mon Sep 17 00:00:00 2001 From: Song Liu Date: Thu, 9 Nov 2017 15:30:07 -0800 Subject: [PATCH] libtraceevent: add flags for tcp state names Names of TCP states are added to flags in event-parse.c. The names are used to print symbolic names in tracepoint: tcp/tcp_set_state. Signed-off-by: Song Liu --- tools/lib/traceevent/event-parse.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 7ce724f..4972dc2 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -3790,6 +3790,20 @@ static const struct flag flags[] = { { "HRTIMER_NORESTART", 0 }, { "HRTIMER_RESTART", 1 }, + + /* tcp state names, see include/net/tcp_states.h */ + { "TCP_ESTABLISHED", 1 }, + { "TCP_SYN_SENT", 2 }, + { "TCP_SYN_RECV", 3 }, + { "TCP_FIN_WAIT1", 4 }, + { "TCP_FIN_WAIT2", 5 }, + { "TCP_TIME_WAIT", 6 }, + { "TCP_CLOSE", 7 }, + { "TCP_CLOSE_WAIT", 8 }, + { "TCP_LAST_ACK", 9 }, + { "TCP_LISTEN", 10 }, + { "TCP_CLOSING", 11 }, + { "TCP_NEW_SYN_RECV", 12 }, }; static long long eval_flag(const char *flag) -- 2.9.5