From 924b0ab5ad13570c4d4a305839684b37538064d7 Mon Sep 17 00:00:00 2001 From: Martin Hicks Date: Wed, 15 Jan 2025 09:23:00 -0500 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers --- 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 38d18878..c38e9e94 100644 --- a/include/instrumentation/events/asoc.h +++ b/include/instrumentation/events/asoc.h @@ -23,7 +23,9 @@ struct snd_soc_dapm_widget; struct snd_soc_dapm_path; #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), @@ -90,7 +92,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 0b5a95dc..dd62e177 100644 --- a/include/instrumentation/events/skb.h +++ b/include/instrumentation/events/skb.h @@ -43,7 +43,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 f79d0b03..6dc1cb19 100644 --- a/include/instrumentation/events/udp.h +++ b/include/instrumentation/events/udp.h @@ -12,7 +12,9 @@ #include #include -#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) -- 2.39.5