Fix: net: expose sk wmem in sock_exceed_buf_limit tracepoint (4.19)

[lttng-modules.git] / instrumentation / events / lttng-module / sock.h

diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
index c9bf4bf76094e366e26f8520069b524f880ac5b1..cd0c92b79c985a5c7562dea99617d423772ebbb6 100644 (file)
--- a/instrumentation/events/lttng-module/sock.h
+++ b/instrumentation/events/lttng-module/sock.h
@@ -4,7 +4,8 @@
 #if !defined(LTTNG_TRACE_SOCK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_SOCK_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
+#include <linux/version.h>
 #include <net/sock.h>
 
 LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
@@ -20,6 +21,46 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
        )
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
+
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
+
+       TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind),
+
+       TP_ARGS(sk, prot, allocated, kind),
+
+       TP_FIELDS(
+               ctf_string(name, prot->name)
+               ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
+               ctf_integer(long, allocated, allocated)
+               ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
+               ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+               ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot))
+               ctf_integer(int, wmem_alloc, refcount_read(&sk->sk_wmem_alloc))
+               ctf_integer(int, wmem_queued, sk->sk_wmem_queued)
+               ctf_integer(int, kind, kind)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+
+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
+
+       TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
+
+       TP_ARGS(sk, prot, allocated),
+
+       TP_FIELDS(
+               ctf_string(name, prot->name)
+               ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
+               ctf_integer(long, allocated, allocated)
+               ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
+               ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
+       )
+)
+
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
+
 LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
 
        TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
@@ -35,7 +76,9 @@ LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
        )
 )
 
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) */
+
 #endif /* LTTNG_TRACE_SOCK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>