From patchwork Wed Nov 8 10:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 835747 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yX1yS19ksz9sNc for ; Wed, 8 Nov 2017 21:00:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752027AbdKHKAb (ORCPT ); Wed, 8 Nov 2017 05:00:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:44950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbdKHKA2 (ORCPT ); Wed, 8 Nov 2017 05:00:28 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8BA53218B4; Wed, 8 Nov 2017 10:00:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BA53218B4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: Ingo Molnar , Ian McDonald , Vlad Yasevich , Stephen Hemminger , Steven Rostedt Cc: Peter Zijlstra , Thomas Gleixner , LKML , "H . Peter Anvin" , Gerrit Renker , "David S . Miller" , Neil Horman , dccp@vger.kernel.org, netdev@vger.kernel.org, linux-sctp@vger.kernel.org, Stephen Rothwell Subject: [RFC PATCH -tip 0/6] net: tcp: sctp: dccp: Replace jprobe usage with trace events Date: Wed, 8 Nov 2017 19:00:02 +0900 Message-Id: <151013520119.7294.3518752184394738314.stgit@devbox> X-Mailer: git-send-email 2.13.6 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, This series introduce new trace events which allows user to trace network congestion window etc. via ftrace or perftools. And remove jprobe usages (tcp_probe/dccp_probe/sctp_probe). So this series removes all register_jprobe users from the kernel tree. So following example in https://wiki.linuxfoundation.org/networking/tcpprobe # modprobe tcp_probe port=5001 # cat /proc/net/tcpprobe >/tmp/data.out & # pid=$! # iperf -c otherhost # kill $pid will be changed as below; # cd /tracing # echo 1 > events/tcp/tcp_probe/enable # echo "sport == 5001 || dport == 5001" > events/tcp/tcp_probe/filter # tail -f trace_pipe > /tmp/data.out & # pid=$! # iperf -c otherhost # kill $pid And it outouts logs lile below; # tracer: nop # # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / delay # TASK-PID CPU# |||| TIMESTAMP FUNCTION # | | | |||| | | -0 [000] ..s2 1089.238049: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=37 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28960 -0 [000] ..s2 1090.156938: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=37 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28992 -0 [000] ..s2 1091.333729: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=38 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28992 -0 [000] ..s2 1092.300330: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=37 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28992 -0 [000] ..s2 1095.044739: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=36 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28992 -0 [000] ..s2 1096.573825: tcp_probe: src=[::ffff:192.168.139.2]:5001 dest=[::ffff:192.168.139.1]:56256 mark=0x0 length=32 snd_nxt=0xee4abe9c snd_una=0xee4abe9c snd_cwnd=10 ssthresh=2147483647 snd_wnd=29312 srtt=478 rcv_wnd=28992 I need your feedback for this change, like formatting etc. Also, I need more test for this events by who can setup DCCP and SCTP, since those are special protocols, I have no environment to test it. Steve, I also wrote a hack in sctp_probe event. Because it requires to record several events at once, sctp_probe_path events will be called from assignment code. This means ring-buffer write will be recursively called (reserve-commit pair will be recursed). As far as I can see, that seems OK. But I need your review too. Thank you, --- Masami Hiramatsu (6): net: tcp: Add trace events for TCP congestion window tracing net: tcp: Remove TCP probe module net: sctp: Add SCTP ACK tracking trace event net: sctp: Remove debug SCTP probe module net: dccp: Add DCCP sendmsg trace event net: dccp: Remove dccpprobe module include/trace/events/sctp.h | 96 ++++++++++++++ include/trace/events/tcp.h | 96 ++++++++++++++ net/Kconfig | 17 -- net/core/net-traces.c | 1 net/dccp/Kconfig | 17 -- net/dccp/Makefile | 2 net/dccp/probe.c | 203 ----------------------------- net/dccp/proto.c | 5 + net/dccp/trace.h | 105 +++++++++++++++ net/ipv4/Makefile | 1 net/ipv4/tcp_input.c | 4 + net/ipv4/tcp_probe.c | 301 ------------------------------------------- net/sctp/Kconfig | 12 -- net/sctp/Makefile | 3 net/sctp/probe.c | 244 ----------------------------------- net/sctp/sm_statefuns.c | 5 + 16 files changed, 312 insertions(+), 800 deletions(-) create mode 100644 include/trace/events/sctp.h create mode 100644 include/trace/events/tcp.h delete mode 100644 net/dccp/probe.c create mode 100644 net/dccp/trace.h delete mode 100644 net/ipv4/tcp_probe.c delete mode 100644 net/sctp/probe.c -- Masami Hiramatsu (Linaro)