From patchwork Tue Oct 17 20:09:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 827286 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="cEPlP5Z2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGmWB6SHgz9t2m for ; Wed, 18 Oct 2017 07:09:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764132AbdJQUJk (ORCPT ); Tue, 17 Oct 2017 16:09:40 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:48877 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755964AbdJQUJj (ORCPT ); Tue, 17 Oct 2017 16:09:39 -0400 Received: by mail-pf0-f196.google.com with SMTP id b79so2147175pfk.5 for ; Tue, 17 Oct 2017 13:09:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8Uw3pYHEPVERQEHjYySVRXihb8Cw7DwAcRnOueONH0Y=; b=cEPlP5Z2MVfY0P7442Se5w8d25XPvWh/ai7LtKXXzU4DAvh6juub5W+YzP5f7/6I0b fmmZikKV68ydaPRRcoAukRgD1XejNoYLdat3RZ7ac4yXyXFIZiQ40LCAk6263gFU+ZIU uPwj9p80va5wDXzWeI/zrLs2fs8ACtDTpQKFeMMo7S3AE4TMn+mIV8Nmz8DtktlEnJR8 ePLkWwioK96zIlsvYn9tcmTC8L7O2uIuJ+594YZgjPYgNim5/HQAr2jjGgIAgFaqGk1j WJ+4xHz0PW+0qfH8SRujC9GfIcJ4ii7t8Oh0SYfR5hTP9/tI6mbklTPeGyA5z7B5uEwQ epWQ== 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=8Uw3pYHEPVERQEHjYySVRXihb8Cw7DwAcRnOueONH0Y=; b=NcrynXn6FsELmH2fuv0666QoPfef5BHRBh80r2kIYZFB41km4l8FwLY2WAECQLGBtM 6cccHl4N+7W23qud4SzDVKgo+73a4NnfqT5mKiLDvC46ggMpFoi05ap4mdoACc+c8WzQ QbZTqgTUA3H72Gd/EaCyyB/8tmELjYys3VhrKyPUQUXD1FtAw1IPpz3ec5qGm+ROGd0Y a1C0GA2PYt9IElCK2x9c4mqIiXJGYJesDlgyr9Umz9EfsQhp5XJd9nbn92raGo2AN+jg pqxdZjXd11XFt/4z3xp/OmKb6cgmg3A1oe7Y5lYugsqm5lcni6d4Z+c+xrOPznt6cgjB mzQA== X-Gm-Message-State: AMCzsaXERMciNQh/42KpSAFLQNt1A32kaydAKE3ZIGmwkBoDY6LawX6s y0l5DS9W+JdNLKq08Si4Oi1yhg== X-Google-Smtp-Source: AOwi7QDyDRnD4y+JYArjmVLp94SumdIJY+uEROjIHi7aIX678dxMzrH7FewrRQaVyAOwjIRZ2hG2Yg== X-Received: by 10.98.102.216 with SMTP id s85mr12622617pfj.334.1508270978598; Tue, 17 Oct 2017 13:09:38 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id n29sm18172838pgf.44.2017.10.17.13.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Oct 2017 13:09:37 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: xiyou.wangcong@gmail.com, eric.dumazet@gmail.com, David Ahern Subject: [PATCH v3 net-next] tcp: Remove use of daddr_cache in tracepoint Date: Tue, 17 Oct 2017 13:09:33 -0700 Message-Id: <1508270973-23789-1-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Running perf in one window to capture tcp_retransmit_skb tracepoint: $ perf record -e tcp:tcp_retransmit_skb -a And causing a retransmission on an active TCP session (e.g., dropping packets in the receiver, changing MTU on the interface to 500 and back to 1500) triggers a panic: [ 58.543144] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 [ 58.545300] IP: perf_trace_tcp_retransmit_skb+0xd0/0x145 [ 58.546770] PGD 0 P4D 0 [ 58.547472] Oops: 0000 [#1] SMP [ 58.548328] Modules linked in: vrf [ 58.549262] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.14.0-rc4+ #26 [ 58.551004] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014 [ 58.554560] task: ffffffff81a0e540 task.stack: ffffffff81a00000 [ 58.555817] RIP: 0010:perf_trace_tcp_retransmit_skb+0xd0/0x145 [ 58.557137] RSP: 0018:ffff88003fc03d68 EFLAGS: 00010282 [ 58.558292] RAX: 0000000000000000 RBX: ffffe8ffffc0ec80 RCX: ffff880038543098 [ 58.559850] RDX: 0400000000000000 RSI: ffff88003fc03d70 RDI: ffff88003fc14b68 [ 58.561099] RBP: ffff88003fc03da8 R08: 0000000000000000 R09: ffffea0000d3224a [ 58.562005] R10: ffff88003fc03db8 R11: 0000000000000010 R12: ffff8800385428c0 [ 58.562930] R13: ffffe8ffffc0e478 R14: ffffffff81a93a40 R15: ffff88003d4f0c00 [ 58.563845] FS: 0000000000000000(0000) GS:ffff88003fc00000(0000) knlGS:0000000000000000 [ 58.564873] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 58.565613] CR2: 0000000000000008 CR3: 000000003d68f004 CR4: 00000000000606f0 [ 58.566538] Call Trace: [ 58.566865] [ 58.567140] __tcp_retransmit_skb+0x4ab/0x4c6 [ 58.567704] ? tcp_set_ca_state+0x22/0x3f [ 58.568231] tcp_retransmit_skb+0x14/0xa3 [ 58.568754] tcp_retransmit_timer+0x472/0x5e3 [ 58.569324] ? tcp_write_timer_handler+0x1e9/0x1e9 [ 58.569946] tcp_write_timer_handler+0x95/0x1e9 [ 58.570548] tcp_write_timer+0x2a/0x58 Remove use of ipv6_pinfo in favor of data in sock_common. Fixes: e086101b150a ("tcp: add a tracepoint for tcp retransmission") Signed-off-by: David Ahern Acked-by: Cong Wang Reviewed-by: Eric Dumazet --- v3 - remove use of inet6_sk and check sk_family (requested by Eric) - Add IS_ENABLED(CONFIG_IPV6) around use of sk_v6_rcv_saddr and sk_v6_daddr as done in sock_common (noted by Cong) v2 - remove np and get addresses from sock_common include/trace/events/tcp.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index 3d1cbd072b7e..271812216ce3 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -27,7 +27,6 @@ TRACE_EVENT(tcp_retransmit_skb, ), TP_fast_assign( - struct ipv6_pinfo *np = inet6_sk(sk); struct inet_sock *inet = inet_sk(sk); struct in6_addr *pin6; __be32 *p32; @@ -44,12 +43,15 @@ TRACE_EVENT(tcp_retransmit_skb, p32 = (__be32 *) __entry->daddr; *p32 = inet->inet_daddr; - if (np) { +#if IS_ENABLED(CONFIG_IPV6) + if (sk->sk_family == AF_INET6) { pin6 = (struct in6_addr *)__entry->saddr_v6; - *pin6 = np->saddr; + *pin6 = sk->sk_v6_rcv_saddr; pin6 = (struct in6_addr *)__entry->daddr_v6; - *pin6 = *(np->daddr_cache); - } else { + *pin6 = sk->sk_v6_daddr; + } else +#endif + { pin6 = (struct in6_addr *)__entry->saddr_v6; ipv6_addr_set_v4mapped(inet->inet_saddr, pin6); pin6 = (struct in6_addr *)__entry->daddr_v6;