Re: [PATCH] lttng-modules fix for RHEL 9.5 kernels

[Mathieu Desnoyers via lttng-dev]

On 2025-01-15 09:23, Martin Hicks via lttng-dev wrote:

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.

I notice that this patch appears to be based on stable-2.13 rather
than the master branch.

I will apply it to master and forward port it to master, as the
cherry-pick seems trivial, but ideally please submit patches
against the master branch of lttng-modules in the future.

Thanks!

Mathieu

Signed-off-by: Martin Hicks <mar...@sr-research.com>
---
  include/instrumentation/events/asoc.h | 8 ++++++--
  include/instrumentation/events/skb.h  | 4 +++-
  include/instrumentation/events/udp.h  | 4 +++-
  3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/instrumentation/events/asoc.h 
b/include/instrumentation/events/asoc.h
index f6b2c76..31bedfe 100644
--- 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 5556ab6..becfd80 100644
--- 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 0a94b46..c228ef6 100644
--- 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)

--
Mathieu Desnoyers
EfficiOS Inc.
https://www.efficios.com