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

trace: move to TP_STORE_ADDRS related macro to net_probe_common.h 



Put the macro into another standalone file for better extension.
Some tracepoints can use this common part in the future.

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

include/trace/events/net_probe_common.h

+29 −0
Original line number Diff line number Diff line
@@ -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

include/trace/events/tcp.h

+0 −29
Original line number Diff line number Diff line
@@ -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

 *