Skip to contentSkip to conversation

net: tracepoint: exposing sk_family in all tcp:tracepoints

PATCH In review Hariharan Ananthakrishnan 6 participants 10 messages Jan 29, 2021 – Feb 4, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: tracepoint: exposing sk_family in all tcp:tracepoints

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

---
 include/trace/events/tcp.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
include/trace/events/tcp.h +16 -4
index cf97f6339acb..a319d2f86cd9 100644
@@ -59,6 +59,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
 		__field(int, state)
 		__field(__u16, sport)
 		__field(__u16, dport)
+		__field(__u16, family)
 		__array(__u8, saddr, 4)
 		__array(__u8, daddr, 4)
 		__array(__u8, saddr_v6, 16)
@@ -75,6 +76,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
 
 		__entry->sport = ntohs(inet->inet_sport);
 		__entry->dport = ntohs(inet->inet_dport);
+		__entry->family = sk->sk_family;
 
 		p32 = (__be32 *) __entry->saddr;
 		*p32 = inet->inet_saddr;
@@ -86,7 +88,8 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
 			      sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
 	),
 
-	TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
+	TP_printk("family=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c state=%s",
+		  show_family_name(__entry->family),
 		  __entry->sport, __entry->dport, __entry->saddr, __entry->daddr,
 		  __entry->saddr_v6, __entry->daddr_v6,
 		  show_tcp_state_name(__entry->state))
@@ -125,6 +128,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk,
 		__field(const void *, skaddr)
 		__field(__u16, sport)
 		__field(__u16, dport)
+		__field(__u16, family)
 		__array(__u8, saddr, 4)
 		__array(__u8, daddr, 4)
 		__array(__u8, saddr_v6, 16)
@@ -140,6 +144,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk,
 
 		__entry->sport = ntohs(inet->inet_sport);
 		__entry->dport = ntohs(inet->inet_dport);
+		__entry->family = sk->sk_family;
 
 		p32 = (__be32 *) __entry->saddr;
 		*p32 = inet->inet_saddr;
@@ -153,7 +158,8 @@ DECLARE_EVENT_CLASS(tcp_event_sk,
 		__entry->sock_cookie = sock_gen_cookie(sk);
 	),
 
-	TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c sock_cookie=%llx",
+	TP_printk("family=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c sock_cookie=%llx",
+		  show_family_name(__entry->family),
 		  __entry->sport, __entry->dport,
 		  __entry->saddr, __entry->daddr,
 		  __entry->saddr_v6, __entry->daddr_v6,
@@ -192,6 +198,7 @@ TRACE_EVENT(tcp_retransmit_synack,
 		__field(const void *, req)
 		__field(__u16, sport)
 		__field(__u16, dport)
+		__field(__u16, family)
 		__array(__u8, saddr, 4)
 		__array(__u8, daddr, 4)
 		__array(__u8, saddr_v6, 16)
@@ -207,6 +214,7 @@ TRACE_EVENT(tcp_retransmit_synack,
 
 		__entry->sport = ireq->ir_num;
 		__entry->dport = ntohs(ireq->ir_rmt_port);
+		__entry->family = sk->sk_family;
 
 		p32 = (__be32 *) __entry->saddr;
 		*p32 = ireq->ir_loc_addr;
@@ -218,7 +226,8 @@ TRACE_EVENT(tcp_retransmit_synack,
 			      ireq->ir_v6_loc_addr, ireq->ir_v6_rmt_addr);
 	),
 
-	TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c",
+	TP_printk("family=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c",
+	          show_family_name(__entry->family),
 		  __entry->sport, __entry->dport,
 		  __entry->saddr, __entry->daddr,
 		  __entry->saddr_v6, __entry->daddr_v6)
@@ -238,6 +247,7 @@ TRACE_EVENT(tcp_probe,
 		__array(__u8, daddr, sizeof(struct sockaddr_in6))
 		__field(__u16, sport)
 		__field(__u16, dport)
+		__field(__u16, family)
 		__field(__u32, mark)
 		__field(__u16, data_len)
 		__field(__u32, snd_nxt)
@@ -264,6 +274,7 @@ TRACE_EVENT(tcp_probe,
 		__entry->sport = ntohs(inet->inet_sport);
 		__entry->dport = ntohs(inet->inet_dport);
 		__entry->mark = skb->mark;
+		__entry->family = sk->sk_family;
 
 		__entry->data_len = skb->len - __tcp_hdrlen(th);
 		__entry->snd_nxt = tp->snd_nxt;
@@ -276,7 +287,8 @@ TRACE_EVENT(tcp_probe,
 		__entry->sock_cookie = sock_gen_cookie(sk);
 	),
 
-	TP_printk("src=%pISpc dest=%pISpc mark=%#x data_len=%d snd_nxt=%#x snd_una=%#x snd_cwnd=%u ssthresh=%u snd_wnd=%u srtt=%u rcv_wnd=%u sock_cookie=%llx",
+	TP_printk("family=%s src=%pISpc dest=%pISpc mark=%#x data_len=%d snd_nxt=%#x snd_una=%#x snd_cwnd=%u ssthresh=%u snd_wnd=%u srtt=%u rcv_wnd=%u sock_cookie=%llx",
+		  show_family_name(__entry->family),
 		  __entry->saddr, __entry->daddr, __entry->mark,
 		  __entry->data_len, __entry->snd_nxt, __entry->snd_una,
 		  __entry->snd_cwnd, __entry->ssthresh, __entry->snd_wnd,

base-commit: bbc20b70424aeb3c84f833860f6340adda5141fc

Signature · 1 line
2.27.0
#1 lore raw
Quoted 24 lines · Hariharan Ananthakrishnan

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

---
 include/trace/events/tcp.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
include/trace/events/tcp.h +0 -0
index cf97f6339acb..a319d2f86cd9 100644

include/trace/events/tcp.h DECLARE_EVENT_CLASS(tcp_event_sk_skb, · line 65

Quoted 7 lines
include/trace/events/tcp.h +1 -0
@@ -59,6 +59,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
                __field(int, state)
                __field(__u16, sport)
                __field(__u16, dport)
+               __field(__u16, family)
                __array(__u8, saddr, 4)
                __array(__u8, daddr, 4)
                __array(__u8, saddr_v6, 16)

raw tracepoint can access all sk and skb fields already. Why do you need this?

#2 lore raw
Quoted 22 lines · Alexei Starovoitov
Quoted 19 lines · Hariharan Ananthakrishnan

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

---
 include/trace/events/tcp.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
Quoted 15 lines

include/trace/events/tcp.h DECLARE_EVENT_CLASS(tcp_event_sk_skb, · line 65

Quoted 12 lines
include/trace/events/tcp.h +1 -0
index cf97f6339acb..a319d2f86cd9 100644
@@ -59,6 +59,7 @@ DECLARE_EVENT_CLASS(tcp_event_sk_skb,
                __field(int, state)
                __field(__u16, sport)
                __field(__u16, dport)
+               __field(__u16, family)
                __array(__u8, saddr, 4)
                __array(__u8, daddr, 4)
                __array(__u8, saddr_v6, 16)

raw tracepoint can access all sk and skb fields already. Why do you need this?

We (Netflix) can dig it out using raw tracepoints and BTF (once it's rolled out) but this was about fixing the existing tracepoints so they were more useful.

I think tracepoints and their arguments suit a class of non-kernel-hacker users: SREs, operators, sysadmins, etc. People who run and tweak bpftrace one-liners.

Brendan

Signature · 1 line
Brendan Gregg, Senior Performance Architect, Netflix
maintainer
#3 lore raw
In reply to Hariharan Ananthakrishnan
Quoted 12 lines · On Fri, 29 Jan 2021 00:12:10 +0000 Hariharan Ananthakrishnan wrote:

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

Quoted 2 lines

Eric, any thoughts?

#4 lore raw
Quoted 14 lines · Jakub Kicinski
Quoted 12 lines · On Fri, 29 Jan 2021 00:12:10 +0000 Hariharan Ananthakrishnan wrote:

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

Quoted 4 lines
Quoted 2 lines

Eric, any thoughts?

I do not use these tracepoints in production scripts, but I wonder if existing tools could break after this change ?

Or do we consider tracepoints format is not part of the ABI and can be arbitrarily changed by anyone ?

#5 lore raw
Quoted 18 lines · Eric Dumazet
Quoted 17 lines · Jakub Kicinski
Quoted 14 lines · On Fri, 29 Jan 2021 00:12:10 +0000 Hariharan Ananthakrishnan wrote:

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

Quoted 8 lines
Quoted 1 line

Eric, any thoughts?

I do not use these tracepoints in production scripts, but I wonder if existing tools could break after this change ?

Or do we consider tracepoints format is not part of the ABI and can be arbitrarily changed by anyone ?

They are not ABI and since we are extending tracepoints with additional info (and not removing any existing fields) it shouldn't be a problem.

maintainer
#6 lore raw
Quoted 4 lines · On Wed, 3 Feb 2021 08:26:04 -0800 [email protected] wrote:
Quoted 2 lines · Eric Dumazet
Quoted 1 line · Jakub Kicinski

Eric, any thoughts?

Quoted 8 lines
Quoted 5 lines

I do not use these tracepoints in production scripts, but I wonder if existing tools could break after this change ?

Or do we consider tracepoints format is not part of the ABI and can be arbitrarily changed by anyone ?

They are not ABI and since we are extending tracepoints with additional info (and not removing any existing fields) it shouldn't be a problem.

Okay, but we should perhaps add the field at the end just to be on the safe side (and avoid weird alignment of the IP addresses).

#7 lore raw
Quoted 9 lines · Jakub Kicinski
Quoted 7 lines · On Wed, 3 Feb 2021 08:26:04 -0800 [email protected] wrote:
Quoted 5 lines · Eric Dumazet
Quoted 1 line · Jakub Kicinski

Eric, any thoughts?

I do not use these tracepoints in production scripts, but I wonder if existing tools could break after this change ?

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Or do we consider tracepoints format is not part of the ABI and can be arbitrarily changed by anyone ?

They are not ABI and since we are extending tracepoints with additional info (and not removing any existing fields) it shouldn't be a problem.

Okay, but we should perhaps add the field at the end just to be on the safe side (and avoid weird alignment of the IP addresses).

I added it after dport to be consistent with the earlier patch to sock:inet_sock_set_state
https://lore.kernel.org/patchwork/patch/870492/.

maintainer
#8 lore raw
Quoted 10 lines · On Wed, 3 Feb 2021 10:25:11 -0800 Hariharan Ananthakrishnan wrote:
Quoted 6 lines · Jakub Kicinski
Quoted 2 lines · On Wed, 3 Feb 2021 08:26:04 -0800 [email protected] wrote:

They are not ABI and since we are extending tracepoints with additional info (and not removing any existing fields) it shouldn't be a problem.

Okay, but we should perhaps add the field at the end just to be on the safe side (and avoid weird alignment of the IP addresses).

I added it after dport to be consistent with the earlier patch to sock:inet_sock_set_state
https://lore.kernel.org/patchwork/patch/870492/.

I see :(

I'll give it a few more hours and if there are no objections apply the patch.

maintainer
#9 lore raw
In reply to Hariharan Ananthakrishnan
Quoted 12 lines · On Fri, 29 Jan 2021 00:12:10 +0000 Hariharan Ananthakrishnan wrote:

Similar to sock:inet_sock_set_state tracepoint, expose sk_family to distinguish AF_INET and AF_INET6 families.

The following tcp tracepoints are updated:
tcp:tcp_destroy_sock
tcp:tcp_rcv_space_adjust
tcp:tcp_retransmit_skb
tcp:tcp_send_reset
tcp:tcp_receive_reset
tcp:tcp_retransmit_synack
tcp:tcp_probe

Quoted 2 lines

Fixed up white space and applied, thanks!