lttng-modules fix for RHEL 9.5 kernels

This fixes the asoc_snd_*, kfree_skb and udp related tracepoints for the
RHEL 9.5 distro kernel.

In all cases they've updated to the format of newer kernels.

Signed-off-by: Martin Hicks <martin@sr-research.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h
index f6b2c76ea40a4c3d116cd87da202644f817ff983..31bedfe3e0bc358f861a72e3c2bf06a379802cb1 100644 (file)
--- a/include/instrumentation/events/asoc.h
+++ b/include/instrumentation/events/asoc.h
@@ -120,7 +120,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_preg, snd_soc_preg_read,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context,
 
        TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
@@ -187,7 +189,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
 
        TP_PROTO(struct snd_soc_card *card, int event),

diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
index 5556ab635adf188e5d3e1755e731f3c89ea08c2b..becfd80c816932a039401f66d568db4c7c41fa03 100644 (file)
--- a/include/instrumentation/events/skb.h
+++ b/include/instrumentation/events/skb.h
@@ -40,7 +40,9 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
 
        skb_kfree,

diff --git a/include/instrumentation/events/udp.h b/include/instrumentation/events/udp.h
index 0a94b46631292cbd7b3ba91d0a33fa9b0c47e516..c228ef6928840c18d20f00d1f81d152e63b9e9cb 100644 (file)
--- a/include/instrumentation/events/udp.h
+++ b/include/instrumentation/events/udp.h
@@ -9,7 +9,9 @@
 #include <linux/udp.h>
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1,  5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_ENUM(lttng_sk_family,
        TP_ENUM_VALUES(
                ctf_enum_value("AF_INET", AF_INET)