iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'trace-use-tp_store_addrs-macro'

Browse Source 
Jason Xing says:

====================
trace: use TP_STORE_ADDRS macro

Using the macro for other tracepoints use to be more concise.
No functional change.
====================

Link: https://lore.kernel.org/r/20240325034347.19522-1-kerneljasonxing@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni 2024-03-26 11:12:10 +01:00
commit 26f44b7005
3 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/trace/events/net_probe_common.h
View File

@ -41,4 +41,33 @@
#endif
#define TP_STORE_V4MAPPED(__entry, saddr, daddr) \
do { \
struct in6_addr *pin6; \
\
pin6 = (struct in6_addr *)__entry->saddr_v6; \
ipv6_addr_set_v4mapped(saddr, pin6); \
pin6 = (struct in6_addr *)__entry->daddr_v6; \
ipv6_addr_set_v4mapped(daddr, pin6); \
} while (0)
#if IS_ENABLED(CONFIG_IPV6)
#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6) \
do { \
if (sk->sk_family == AF_INET6) { \
struct in6_addr *pin6; \
\
pin6 = (struct in6_addr *)__entry->saddr_v6; \
*pin6 = saddr6; \
pin6 = (struct in6_addr *)__entry->daddr_v6; \
*pin6 = daddr6; \
} else { \
TP_STORE_V4MAPPED(__entry, saddr, daddr); \
} \
} while (0)
#else
#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6) \
TP_STORE_V4MAPPED(__entry, saddr, daddr)
#endif
#endif

35
include/trace/events/sock.h
View File

@ -10,6 +10,7 @@
#include <linux/tracepoint.h>
#include <linux/ipv6.h>
#include <linux/tcp.h>
#include <trace/events/net_probe_common.h>
#define family_names \
EM(AF_INET) \
@ -159,7 +160,6 @@ TRACE_EVENT(inet_sock_set_state,
TP_fast_assign(
const struct inet_sock *inet = inet_sk(sk);
struct in6_addr *pin6;
__be32 *p32;
__entry->skaddr = sk;
@ -177,20 +177,8 @@ TRACE_EVENT(inet_sock_set_state,
p32 = (__be32 *) __entry->daddr;
*p32 = inet->inet_daddr;
#if IS_ENABLED(CONFIG_IPV6)
if (sk->sk_family == AF_INET6) {
pin6 = (struct in6_addr *)__entry->saddr_v6;
*pin6 = sk->sk_v6_rcv_saddr;
pin6 = (struct in6_addr *)__entry->daddr_v6;
*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;
ipv6_addr_set_v4mapped(inet->inet_daddr, pin6);
}
TP_STORE_ADDRS(__entry, inet->inet_saddr, inet->inet_daddr,
sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
),
TP_printk("family=%s protocol=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c oldstate=%s newstate=%s",
@ -223,7 +211,6 @@ TRACE_EVENT(inet_sk_error_report,
TP_fast_assign(
const struct inet_sock *inet = inet_sk(sk);
struct in6_addr *pin6;
__be32 *p32;
__entry->error = sk->sk_err;
@ -238,20 +225,8 @@ TRACE_EVENT(inet_sk_error_report,
p32 = (__be32 *) __entry->daddr;
*p32 = inet->inet_daddr;
#if IS_ENABLED(CONFIG_IPV6)
if (sk->sk_family == AF_INET6) {
pin6 = (struct in6_addr *)__entry->saddr_v6;
*pin6 = sk->sk_v6_rcv_saddr;
pin6 = (struct in6_addr *)__entry->daddr_v6;
*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;
ipv6_addr_set_v4mapped(inet->inet_daddr, pin6);
}
TP_STORE_ADDRS(__entry, inet->inet_saddr, inet->inet_daddr,
sk->sk_v6_rcv_saddr, sk->sk_v6_daddr);
),
TP_printk("family=%s protocol=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4 saddrv6=%pI6c daddrv6=%pI6c error=%d",

29
include/trace/events/tcp.h
View File

@ -12,35 +12,6 @@
#include <net/tcp.h>
#include <linux/sock_diag.h>
#define TP_STORE_V4MAPPED(__entry, saddr, daddr) \
do { \
struct in6_addr *pin6; \
\
pin6 = (struct in6_addr *)__entry->saddr_v6; \
ipv6_addr_set_v4mapped(saddr, pin6); \
pin6 = (struct in6_addr *)__entry->daddr_v6; \
ipv6_addr_set_v4mapped(daddr, pin6); \
} while (0)
#if IS_ENABLED(CONFIG_IPV6)
#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6) \
do { \
if (sk->sk_family == AF_INET6) { \
struct in6_addr *pin6; \
\
pin6 = (struct in6_addr *)__entry->saddr_v6; \
*pin6 = saddr6; \
pin6 = (struct in6_addr *)__entry->daddr_v6; \
*pin6 = daddr6; \
} else { \
TP_STORE_V4MAPPED(__entry, saddr, daddr); \
} \
} while (0)
#else
#define TP_STORE_ADDRS(__entry, saddr, daddr, saddr6, daddr6) \
TP_STORE_V4MAPPED(__entry, saddr, daddr)
#endif
/*
* tcp event with arguments sk and skb
*