From patchwork Mon Mar 25 06:28:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13601631 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96F2F13CFA2; Mon, 25 Mar 2024 06:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348124; cv=none; b=FVa3CfwNJ0FKzdlFCrQK8hf9afqewkoc7M3s4zbd4R6W/GXFl25LkDP+0OrJ+nn4M+Nzs49vf9Q+PyuVsA+NKDcd8l+y4CoNw1vvqxlWO0vCGHnyFyYMTH6LdLNtE43hYif+HxFDX6v2ff+WabyTPCoBgI7sSnUOwjftpWXAbOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348124; c=relaxed/simple; bh=YIHO2ZzlfKMI78s1ALOdFjQ4kMBvR4jL2Ci5VkvLqmY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VdFtHrxXL6ti2ocwdcGqJYT2vmiPmrmNN5lA+NYDAL0ATQEIVsv9EgdI0hbSPHFJ6vgZZ41+lACrL+hy0BGfMwIOJ5n7hYyG3lsJEdub+PopddFa9Ns+ycyf8WATidDSkcmoZoD5FyoCmHEPpBt1Qm3SsEHcOgoa2aDeetOLE+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gHLCEa40; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gHLCEa40" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3c3d2d0e86dso84725b6e.2; Sun, 24 Mar 2024 23:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711348122; x=1711952922; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ufPZljtHRIDkXlW3FFcbCW4Y/MzuhDcLur+1tqDM7fk=; b=gHLCEa40pWStXi+tD9VPdY5o8fiviRZ5ZyLvB+382pP5nUBmWJg0we81ILYCq5z/ve z+jYQpGE6qb6kVcA0R2O4FzVunrym4GbZneeFFB8v4h5aRYNwTdb2Ed+UJyGE+m/zF7h Kjby4r2O2jwa3QxU2RCgHGjhawOL4qxILTlyK+nDydCa4mIY3Qcn/n8ymZSmuv5nD8kU uz3pX1enSPtLwvoiIXPu6cXYzDCTxUdZzYS930OLBXP0ihWjJssccjgYNNMLGtUFlk3u EZM+dAAXWLcDuFtR7jCCbTTO6Z4xtzdWOe5B5uHbuzE4WP7TjvOZAMoBJD4bApa9emsO NE3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711348122; x=1711952922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ufPZljtHRIDkXlW3FFcbCW4Y/MzuhDcLur+1tqDM7fk=; b=qB5dAQbDYba8hoyZZ2fs0/IZPLuzY9AzSxt+HmjL3ToDPHfUE8kN0l2T49KIKrfXRz BflRv+cpqsA8mTIFu5gwyeGjk15JswZsSZWX36+fs1OE4XsDOmuREPtSESosTgwfQeJz 0UcqDmcdTFUnEpmDUklPk7xar5n9THj0AA07AdHu2RdaufX4w8xAYe1syrpPObkmutn5 RtkaXD1rMcV3K1NoERZ8dZCIBl3u3g4jr7lys3RGURnrC9hU4DXniknBtPeAZyMWraaF 3IQHHRtOGouF6sgciVc31mJLInG2AijSquJMXOUQSLa2rNSygsRnKFdIfR0g+xSYFN4X cyiQ== X-Forwarded-Encrypted: i=1; AJvYcCWa4NYBzzbjpXehSiriK2umwYheYfhf+4IKVI23XrrggqJvvMxtHjhxAuaMKb6mCQSrjf8BP1SdMu/NHenNT+3WFSv+HupOgZmPjTit2hu1AY3M X-Gm-Message-State: AOJu0YwoQLkIYQZUCAGKDTaLjPrhfRlAUvHmvB6elkEjHVP1uoUH0QgB TRBOQrgDjfesKJH54UemB1wXi8+FQPbzOhynXCefxAAw4NMrZaM2 X-Google-Smtp-Source: AGHT+IGdfgBngQ8ZGSn+CFhtAM9BcgSrE1Dcc14DwzLZf7qSv5Z78G5BKXqeJI5OJiDcV6zLSuT6tg== X-Received: by 2002:a05:6808:1b1e:b0:3c3:cb85:2fe5 with SMTP id bx30-20020a0568081b1e00b003c3cb852fe5mr4077097oib.1.1711348121791; Sun, 24 Mar 2024 23:28:41 -0700 (PDT) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id p1-20020aa78601000000b006e697bd5285sm3520253pfn.203.2024.03.24.23.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 23:28:41 -0700 (PDT) From: Jason Xing To: edumazet@google.com, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, rostedt@goodmis.org, kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net-next v2 1/3] trace: adjust TP_STORE_ADDR_PORTS_SKB() parameters Date: Mon, 25 Mar 2024 14:28:29 +0800 Message-Id: <20240325062831.48675-2-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240325062831.48675-1-kerneljasonxing@gmail.com> References: <20240325062831.48675-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing Introducing entry_saddr and entry_daddr parameters in this macro for later use can help us record the reverse 4-tuple by analyzing the 4-tuple of the incoming skb when receiving. Signed-off-by: Jason Xing --- include/trace/events/tcp.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index 699dafd204ea..2495a1d579be 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -302,15 +302,15 @@ TRACE_EVENT(tcp_probe, __entry->skbaddr, __entry->skaddr) ); -#define TP_STORE_ADDR_PORTS_SKB_V4(__entry, skb) \ +#define TP_STORE_ADDR_PORTS_SKB_V4(skb, entry_saddr, entry_daddr) \ do { \ const struct tcphdr *th = (const struct tcphdr *)skb->data; \ - struct sockaddr_in *v4 = (void *)__entry->saddr; \ + struct sockaddr_in *v4 = (void *)entry_saddr; \ \ v4->sin_family = AF_INET; \ v4->sin_port = th->source; \ v4->sin_addr.s_addr = ip_hdr(skb)->saddr; \ - v4 = (void *)__entry->daddr; \ + v4 = (void *)entry_daddr; \ v4->sin_family = AF_INET; \ v4->sin_port = th->dest; \ v4->sin_addr.s_addr = ip_hdr(skb)->daddr; \ @@ -318,29 +318,30 @@ TRACE_EVENT(tcp_probe, #if IS_ENABLED(CONFIG_IPV6) -#define TP_STORE_ADDR_PORTS_SKB(__entry, skb) \ +#define TP_STORE_ADDR_PORTS_SKB(skb, entry_saddr, entry_daddr) \ do { \ const struct iphdr *iph = ip_hdr(skb); \ \ if (iph->version == 6) { \ const struct tcphdr *th = (const struct tcphdr *)skb->data; \ - struct sockaddr_in6 *v6 = (void *)__entry->saddr; \ + struct sockaddr_in6 *v6 = (void *)entry_saddr; \ \ v6->sin6_family = AF_INET6; \ v6->sin6_port = th->source; \ v6->sin6_addr = ipv6_hdr(skb)->saddr; \ - v6 = (void *)__entry->daddr; \ + v6 = (void *)entry_daddr; \ v6->sin6_family = AF_INET6; \ v6->sin6_port = th->dest; \ v6->sin6_addr = ipv6_hdr(skb)->daddr; \ } else \ - TP_STORE_ADDR_PORTS_SKB_V4(__entry, skb); \ + TP_STORE_ADDR_PORTS_SKB_V4(skb, entry_saddr, \ + entry_daddr); \ } while (0) #else -#define TP_STORE_ADDR_PORTS_SKB(__entry, skb) \ - TP_STORE_ADDR_PORTS_SKB_V4(__entry, skb) +#define TP_STORE_ADDR_PORTS_SKB(skb, entry_saddr, entry_daddr) \ + TP_STORE_ADDR_PORTS_SKB_V4(skb, entry_saddr, entry_daddr) #endif @@ -365,7 +366,7 @@ DECLARE_EVENT_CLASS(tcp_event_skb, memset(__entry->saddr, 0, sizeof(struct sockaddr_in6)); memset(__entry->daddr, 0, sizeof(struct sockaddr_in6)); - TP_STORE_ADDR_PORTS_SKB(__entry, skb); + TP_STORE_ADDR_PORTS_SKB(skb, __entry->saddr, __entry->daddr); ), TP_printk("skbaddr=%p src=%pISpc dest=%pISpc", From patchwork Mon Mar 25 06:28:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13601632 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15F9013CFBE; Mon, 25 Mar 2024 06:28:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348127; cv=none; b=DwJFpn6TCsTyVact/S3LL4I1flSSIS6xbvva+JVO4Kz3qbmbsj221nFDuu6LTgf77v3qwPCx2r/rJG9wt7N4uKWhSQ17mW6VIfsj8rilA8MzQoawxJBPtu015XQOQmStK7HoR/ePyIzWb9LPVuw+Q89vI/4iPYFNUrpZK3qU4HI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348127; c=relaxed/simple; bh=3TsbrJSOzVBfSEm1f87KiGiSTFzU3nb1hXePHthz8hc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DC9it4uQ2zFKdYFZ7xelxDGAb8WuP8UEyaHA40v36kkvX0fExEkv2DsVeybRjMCZzFN2Q7mF9T6Q40ec6+h1Lp1hPIpNmulKu+JsPemh/9vq7r/SFNUHBf9L/sw7nj49PuSEXRKhkUiRtN11ck0mF0u2+sZ6sXI9PUclcUZiL9U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FU8XB2ZH; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FU8XB2ZH" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6e6c0098328so2583799b3a.3; Sun, 24 Mar 2024 23:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711348125; x=1711952925; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fn59/faPZWJa6DQ5/FMJVOqEKj7CPmJpuG2HGQTJjws=; b=FU8XB2ZHRzOvKsq5bUtIwASc1CjWDVXcfghcXJ/DNU5B+2AepMGKk3HaXZsMx3T2Ly gaZbjj6RJS4OsXfx13kaB+a7d3RY7qKYddumyQobVX/TXsrKEtqWbC6sxkDZqJmsitGf 2Je298jkSE9V2HXDRpprw7HN0lXT6kKNg5b+KZWZPlo2afZ2B+1vmMmmpFEZS97tGLdS eYXVZqNBcRqfldkaSkW7+E0LcCPfHyo32DEFe/VwJZvvw+yvtm5kcRy3irv77HCMkOdI RrEm1bAtbW31sYcHhjf1Os2QpukK/NjX50loQ0wShFYaIdEJyVgD8z+vf7I3/npi+/7t tKzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711348125; x=1711952925; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fn59/faPZWJa6DQ5/FMJVOqEKj7CPmJpuG2HGQTJjws=; b=A5+cjNSEibpiceMmtktBNMJ/s2vjoKZlHoXigefV9QgbQZ26th40ZmUb52A5hej6Zl gR0zG1vmvYrIuBBUTpNx2BfaZHC+mFAZSQ64HsX8nXYOXnLtIhARRFuDHLV+OVJJCOVn ZVdj//fRLHnK6OncBD9Ijx+HeJB8Ae/RJrlujVSryuFTDnRtAd67IHPgYghg/si9LA5k pafRuT5rmGFdHzLkdsWl1nM2HERfVP+v6I66/mZjLoj9xbNZ3gxImerH063zBojhXbfz x7uqQ6cctPTDEvfMGK8NASWb4mNFoJZ2O9r9mVqOwYCLyoFFvngLsv8qLtWllJEtlXHU Ul9g== X-Forwarded-Encrypted: i=1; AJvYcCVE5z3kIZD7QVTLP8kMcnV1FvD20uHEst7EdDgz4Uahg8F7zlRHHD5uQbe5uu9hN7oZPiZCgMNhNhwpBxmR7DCl+mTrdzFR/SMrEAZnHLNCUu7n X-Gm-Message-State: AOJu0YwE56vDv8UdrjrZWAkgdkawB2tHqH5Mt2wGlrrFWwmmeLXlcG7x TwYrDOOQPT1/oua9G5xve+49NN/3yliFrqcOmEvH5QdZofHOa7py X-Google-Smtp-Source: AGHT+IFbqw90SWM21645DIJ0EKl3OIi9Sh4/7rB3TNE7E9MIWrlaxsjoIh0ttuQ59GzLuabX9DQ3Sg== X-Received: by 2002:aa7:888f:0:b0:6e6:8ca5:c0d4 with SMTP id z15-20020aa7888f000000b006e68ca5c0d4mr6366926pfe.12.1711348125187; Sun, 24 Mar 2024 23:28:45 -0700 (PDT) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id p1-20020aa78601000000b006e697bd5285sm3520253pfn.203.2024.03.24.23.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 23:28:44 -0700 (PDT) From: Jason Xing To: edumazet@google.com, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, rostedt@goodmis.org, kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net-next v2 2/3] trace: tcp: fully support trace_tcp_send_reset Date: Mon, 25 Mar 2024 14:28:30 +0800 Message-Id: <20240325062831.48675-3-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240325062831.48675-1-kerneljasonxing@gmail.com> References: <20240325062831.48675-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing Prior to this patch, what we can see by enabling trace_tcp_send is only happening under two circumstances: 1) active rst mode 2) non-active rst mode and based on the full socket That means the inconsistency occurs if we use tcpdump and trace simultaneously to see how rst happens. It's necessary that we should take into other cases into considerations, say: 1) time-wait socket 2) no socket ... By parsing the incoming skb and reversing its 4-tuple can we know the exact 'flow' which might not exist. Samples after applied this patch: 1. tcp_send_reset: skbaddr=XXX skaddr=XXX src=ip:port dest=ip:port state=TCP_ESTABLISHED 2. tcp_send_reset: skbaddr=000...000 skaddr=XXX src=ip:port dest=ip:port state=UNKNOWN Note: 1) UNKNOWN means we cannot extract the right information from skb. 2) skbaddr/skaddr could be 0 Signed-off-by: Jason Xing --- include/trace/events/tcp.h | 39 ++++++++++++++++++++++++++++++++++++-- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv6/tcp_ipv6.c | 3 ++- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index 2495a1d579be..a13eb2147a02 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -107,11 +107,46 @@ DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, * skb of trace_tcp_send_reset is the skb that caused RST. In case of * active reset, skb should be NULL */ -DEFINE_EVENT(tcp_event_sk_skb, tcp_send_reset, +TRACE_EVENT(tcp_send_reset, TP_PROTO(const struct sock *sk, const struct sk_buff *skb), - TP_ARGS(sk, skb) + TP_ARGS(sk, skb), + + TP_STRUCT__entry( + __field(const void *, skbaddr) + __field(const void *, skaddr) + __field(int, state) + __array(__u8, saddr, sizeof(struct sockaddr_in6)) + __array(__u8, daddr, sizeof(struct sockaddr_in6)) + ), + + TP_fast_assign( + __entry->skbaddr = skb; + __entry->skaddr = sk; + /* Zero means unknown state. */ + __entry->state = sk ? sk->sk_state : 0; + + memset(__entry->saddr, 0, sizeof(struct sockaddr_in6)); + memset(__entry->daddr, 0, sizeof(struct sockaddr_in6)); + + if (sk && sk_fullsock(sk)) { + const struct inet_sock *inet = inet_sk(sk); + + TP_STORE_ADDR_PORTS(__entry, inet, sk); + } else { + /* + * We should reverse the 4-tuple of skb, so later + * it can print the right flow direction of rst. + */ + TP_STORE_ADDR_PORTS_SKB(skb, entry->daddr, entry->saddr); + } + ), + + TP_printk("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s", + __entry->skbaddr, __entry->skaddr, + __entry->saddr, __entry->daddr, + __entry->state ? show_tcp_state_name(__entry->state) : "UNKNOWN") ); /* diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index a22ee5838751..d5c4a969c066 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -868,10 +868,10 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) */ if (sk) { arg.bound_dev_if = sk->sk_bound_dev_if; - if (sk_fullsock(sk)) - trace_tcp_send_reset(sk, skb); } + trace_tcp_send_reset(sk, skb); + BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) != offsetof(struct inet_timewait_sock, tw_bound_dev_if)); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 3f4cba49e9ee..8e9c59b6c00c 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1113,7 +1113,6 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) if (sk) { oif = sk->sk_bound_dev_if; if (sk_fullsock(sk)) { - trace_tcp_send_reset(sk, skb); if (inet6_test_bit(REPFLOW, sk)) label = ip6_flowlabel(ipv6h); priority = READ_ONCE(sk->sk_priority); @@ -1129,6 +1128,8 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) label = ip6_flowlabel(ipv6h); } + trace_tcp_send_reset(sk, skb); + tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, 1, ipv6_get_dsfield(ipv6h), label, priority, txhash, &key); From patchwork Mon Mar 25 06:28:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13601633 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 734CC156C5F; Mon, 25 Mar 2024 06:28:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348131; cv=none; b=U1x7jvGGKDUrLQX7aKDhTLb0/v2tV04To3CIimKcsuiDdNUPPbMtvuEXqQTvoF6LbakdJSFF2ZVuOOW1VV1ZaNUILPYQWt71V/scdLKlYVE5EgjAdrNvhG85CKsIGYkZ3ekcFGPHFhniCYfoHkdooLJqYpaeQQGuL7w2BFP0DRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711348131; c=relaxed/simple; bh=3e+bKGS7nVCM9PafOTPvFasjLkFs4xeF2YQpN+kaq04=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ga+Cv0ymTsOGthZppcdkSYVTLabGW+DUVNRJePG+OnNVExIXjcojILnHUMtwpfJg432BUZxfsLCCRL/D9wJUJ+ySgMbzJ68+nM142PmcRTycnq/DQ/bf7PjU8IMjJTFVdiBdy2W0sWq7/wAxvxwbkKr1ZONkXLA4kn19pMDwwcA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YqE2oUkj; arc=none smtp.client-ip=209.85.128.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YqE2oUkj" Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-60a3c48e70fso41355757b3.1; Sun, 24 Mar 2024 23:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711348128; x=1711952928; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w8tlSAyV4jJqvA7JB/3bzev+6NIo6ODATMwDvyBATkc=; b=YqE2oUkjt75Y0uI7xxpnTDtqKllgU7SETcSCe8j0yXlArS8Q4b8s0dTpoUHLBhiadW k06OGIN+s3zPLdzCEA//TrRcws/UgQ0RsgsStvCCKg0KE+QYUXpOxdIgtaPgCMaq/SjL K7vhD5R/oXv5nRTjo4aahrElKKfJBdWK1p0OH0SuH8nUfyZba9wZaIbb88AUub1eVDJj jRmRh74hi8aPdVrt7XpxFwC8lcV0HPb/fbAMXe6+0PxtmC7yjM3aM3XgizcyLjKvzsEh lzHiLrincgbbi07DVoQGkz0v6af7lgGJpAy8LKDvIKlT2vXP/jM9YHn4roywwsB+pILR LeZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711348128; x=1711952928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8tlSAyV4jJqvA7JB/3bzev+6NIo6ODATMwDvyBATkc=; b=bBmcu8I7DxhwTWNbcoG+OzK4sYAiYGUE333UizJcKV0wCLgiAW3vugv3iCE6v5zzli 1C952tPneJmb8hGZGxBSEMtUJihu1nlNoinr63KN0nY6UIHPqyPUaeK4QA0f6XRYn6vG hXXCSI397+7glalJUfV8Thk1ZYbVBBEmXNQOXoq4lguE2WmNnaZnDdFUEwRpfaiZ0o6u +PWOaczluue/aVGyOVNJE69SR0At3hl8bpNwNrZda1QeXhy1hiZRTXFKI5uTwfHSiGML IQxwCyizNY/LyddTGvkmCu1yy8WPaPVWLS/DEp8royBMFCWypr3E4Usr0RKcOwRt5Lmq 2LXQ== X-Forwarded-Encrypted: i=1; AJvYcCVAeLaPvneqRSed9mCFnbiBj6o5Ca4NRtpv+gU0kPqAYyzvzWMXn7NprBkuZPDTSpZiqXjrm0ZfI8N78YFIuEg7b1fjz8LHR9PzGSgmF9X3UbHh X-Gm-Message-State: AOJu0YzKeNpfM111EmHlsBeOobEhgqnhHulNeY652w2W3GyvRJt3p7oT JHIX7qLzLxIGK53bpGRnSbJyQ5B2BTelEsE3lxIA/N9vq/C5VmF5TRS6TYTt X-Google-Smtp-Source: AGHT+IF1kzeNUWm31FACJIzIuh9WTQatwj1HVeXuF2LwlipBd82E6t2tVA2ipRQ3Qp71T2TKgcURrg== X-Received: by 2002:a81:6d4a:0:b0:611:27ce:9bb0 with SMTP id i71-20020a816d4a000000b0061127ce9bb0mr5231703ywc.4.1711348128487; Sun, 24 Mar 2024 23:28:48 -0700 (PDT) Received: from KERNELXING-MB0.tencent.com ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id p1-20020aa78601000000b006e697bd5285sm3520253pfn.203.2024.03.24.23.28.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 23:28:47 -0700 (PDT) From: Jason Xing To: edumazet@google.com, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, rostedt@goodmis.org, kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net-next v2 3/3] tcp: add location into reset trace process Date: Mon, 25 Mar 2024 14:28:31 +0800 Message-Id: <20240325062831.48675-4-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240325062831.48675-1-kerneljasonxing@gmail.com> References: <20240325062831.48675-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing In addition to knowing the 4-tuple of the flow which generates RST, the reason why it does so is very important because we have some cases where the RST should be sent and have no clue which one exactly. Adding location of reset process can help us more, like what trace_kfree_skb does. Signed-off-by: Jason Xing --- include/trace/events/tcp.h | 14 ++++++++++---- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h index a13eb2147a02..8f6c1a07503c 100644 --- a/include/trace/events/tcp.h +++ b/include/trace/events/tcp.h @@ -109,13 +109,17 @@ DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, */ TRACE_EVENT(tcp_send_reset, - TP_PROTO(const struct sock *sk, const struct sk_buff *skb), + TP_PROTO( + const struct sock *sk, + const struct sk_buff *skb, + void *location), - TP_ARGS(sk, skb), + TP_ARGS(sk, skb, location), TP_STRUCT__entry( __field(const void *, skbaddr) __field(const void *, skaddr) + __field(void *, location) __field(int, state) __array(__u8, saddr, sizeof(struct sockaddr_in6)) __array(__u8, daddr, sizeof(struct sockaddr_in6)) @@ -141,12 +145,14 @@ TRACE_EVENT(tcp_send_reset, */ TP_STORE_ADDR_PORTS_SKB(skb, entry->daddr, entry->saddr); } + __entry->location = location; ), - TP_printk("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s", + TP_printk("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s location=%pS", __entry->skbaddr, __entry->skaddr, __entry->saddr, __entry->daddr, - __entry->state ? show_tcp_state_name(__entry->state) : "UNKNOWN") + __entry->state ? show_tcp_state_name(__entry->state) : "UNKNOWN", + __entry->location) ); /* diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d5c4a969c066..fec54cfc4fb3 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -870,7 +870,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) arg.bound_dev_if = sk->sk_bound_dev_if; } - trace_tcp_send_reset(sk, skb); + trace_tcp_send_reset(sk, skb, __builtin_return_address(0)); BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) != offsetof(struct inet_timewait_sock, tw_bound_dev_if)); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index e3167ad96567..fb613582817e 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3608,7 +3608,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority) /* skb of trace_tcp_send_reset() keeps the skb that caused RST, * skb here is different to the troublesome skb, so use NULL */ - trace_tcp_send_reset(sk, NULL); + trace_tcp_send_reset(sk, NULL, __builtin_return_address(0)); } /* Send a crossed SYN-ACK during socket establishment. diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 8e9c59b6c00c..7eba9c3d69f1 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1128,7 +1128,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) label = ip6_flowlabel(ipv6h); } - trace_tcp_send_reset(sk, skb); + trace_tcp_send_reset(sk, skb, __builtin_return_address(0)); tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, 1, ipv6_get_dsfield(ipv6h), label, priority, txhash,