Commit a24c855a authored by Jason Xing's avatar Jason Xing Committed by Paolo Abeni
Browse files

trace: use TP_STORE_ADDRS() macro in inet_sk_error_report() 



As the title said, use the macro directly like the patch[1] did
to avoid those duplications. No functional change.

[1]
commit 6a6b0b99 ("tcp: Avoid preprocessor directives in tracepoint macro args")

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b3af9045

include/trace/events/sock.h

+3 −15
Original line number Diff line number Diff line
@@ -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)				\
@@ -223,7 +224,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 +238,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",