tcp: Remove use of inet6_sk and add IPv6 checks to tracepoint

386fd5da401d ("tcp: Check daddr_cache before use in tracepoint") was the
second version of the tracepoint fixup patch. This patch is the delta
between v2 and v3.  Specifically, remove the use of inet6_sk and check
sk_family as requested by Eric and add IS_ENABLED(CONFIG_IPV6) around
the use of sk_v6_rcv_saddr and sk_v6_daddr as done in sock_common (noted
by Cong).

Signed-off-by: David Ahern <[email protected]>
Reviewed-by: Eric Dumazet <[email protected]>
Tested-by: Song Liu <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
index f51c130f1e0fcc2a7504ef99fa9b9ed6af4e7a29..c3220d9144752e18a8252eff038698f199fb472f 100644 (file)
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@ -43,13 +43,15 @@ TRACE_EVENT(tcp_retransmit_skb,
                p32 = (__be32 *) __entry->daddr;
                *p32 =  inet->inet_daddr;
 
-               /* IPv6 socket ? */
-               if (inet6_sk(sk)) {
+#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 {
+               } else
+#endif
+               {
                        pin6 = (struct in6_addr *)__entry->saddr_v6;
                        ipv6_addr_set_v4mapped(inet->inet_saddr, pin6);
                        pin6 = (struct in6_addr *)__entry->daddr_v6;