Commit 8a70ed95 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski

tcp: add missing family to tcp_set_ca_state() tracepoint

Before this code is copied, add the missing family, as we did in
commit 3dd344ea ("net: tracepoint: exposing sk_family in all tcp:tracepoints")

Fixes: 15fcdf6a ("tcp: Add tracepoint for tcp_set_ca_state")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Ping Gan <jacky_gam_2001@163.com>
Cc: Manjusaka <me@manjusaka.me>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20230808084923.2239142-1-edumazet@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f8d3e0dc
...@@ -381,6 +381,7 @@ TRACE_EVENT(tcp_cong_state_set, ...@@ -381,6 +381,7 @@ TRACE_EVENT(tcp_cong_state_set,
__field(const void *, skaddr) __field(const void *, skaddr)
__field(__u16, sport) __field(__u16, sport)
__field(__u16, dport) __field(__u16, dport)
__field(__u16, family)
__array(__u8, saddr, 4) __array(__u8, saddr, 4)
__array(__u8, daddr, 4) __array(__u8, daddr, 4)
__array(__u8, saddr_v6, 16) __array(__u8, saddr_v6, 16)
...@@ -396,6 +397,7 @@ TRACE_EVENT(tcp_cong_state_set, ...@@ -396,6 +397,7 @@ TRACE_EVENT(tcp_cong_state_set,
__entry->sport = ntohs(inet->inet_sport); __entry->sport = ntohs(inet->inet_sport);
__entry->dport = ntohs(inet->inet_dport); __entry->dport = ntohs(inet->inet_dport);
__entry->family = sk->sk_family;
p32 = (__be32 *) __entry->saddr; p32 = (__be32 *) __entry->saddr;
*p32 = inet->inet_saddr; *p32 = inet->inet_saddr;
...@@ -409,7 +411,8 @@ TRACE_EVENT(tcp_cong_state_set, ...@@ -409,7 +411,8 @@ TRACE_EVENT(tcp_cong_state_set,
__entry->cong_state = ca_state; __entry->cong_state = ca_state;
), ),
TP_printk("sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c cong_state=%u", TP_printk("family=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c cong_state=%u",
show_family_name(__entry->family),
__entry->sport, __entry->dport, __entry->sport, __entry->dport,
__entry->saddr, __entry->daddr, __entry->saddr, __entry->daddr,
__entry->saddr_v6, __entry->daddr_v6, __entry->saddr_v6, __entry->daddr_v6,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment