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: Jason Xing <kernelxing@tencent.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/trace/events/net_probe_common.h b/include/trace/events/net_probe_common.h
index 3930119cab080c4243ec95fc0d799bf71e7fca47..b1f9a4d3ee13658988a065744b4afb4ff08fdc7e 100644 (file)
--- a/include/trace/events/net_probe_common.h
+++ b/include/trace/events/net_probe_common.h
@@ -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

diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
index 699dafd204eadfe5a4d702d66fd8359dac31d950..3c08a0846c47db0503de14155d76b2bad5ca97ab 100644 (file)
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@ -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
  *