* [PATCH] lttng-modules fix for RHEL 9.5 kernels
@ 2025-01-15 14:23 Martin Hicks via lttng-dev
2025-01-21 19:56 ` Mathieu Desnoyers via lttng-dev
0 siblings, 1 reply; 3+ messages in thread
From: Martin Hicks via lttng-dev @ 2025-01-15 14:23 UTC (permalink / raw)
To: lttng-dev
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>
---
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)
--
2.43.5
--
Martin Hicks
SR Research Ltd.
Fast, Accurate, Reliable Eye Tracking
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] lttng-modules fix for RHEL 9.5 kernels
2025-01-15 14:23 [PATCH] lttng-modules fix for RHEL 9.5 kernels Martin Hicks via lttng-dev
@ 2025-01-21 19:56 ` Mathieu Desnoyers via lttng-dev
2025-01-22 13:08 ` Martin Hicks via lttng-dev
0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Desnoyers via lttng-dev @ 2025-01-21 19:56 UTC (permalink / raw)
To: Martin Hicks, 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 <martin@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] lttng-modules fix for RHEL 9.5 kernels
2025-01-21 19:56 ` Mathieu Desnoyers via lttng-dev
@ 2025-01-22 13:08 ` Martin Hicks via lttng-dev
0 siblings, 0 replies; 3+ messages in thread
From: Martin Hicks via lttng-dev @ 2025-01-22 13:08 UTC (permalink / raw)
To: Mathieu Desnoyers; +Cc: lttng-dev
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
On Tue, Jan 21, 2025 at 2:56 PM Mathieu Desnoyers <
mathieu.desnoyers@efficios.com> wrote:
> 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.
>
Ah, you're right. I'll do that in the future. Sorry about that.
mh
--
Martin Hicks
SR Research Ltd.
Fast, Accurate, Reliable Eye Tracking
[-- Attachment #2: Type: text/html, Size: 1366 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-22 13:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-15 14:23 [PATCH] lttng-modules fix for RHEL 9.5 kernels Martin Hicks via lttng-dev
2025-01-21 19:56 ` Mathieu Desnoyers via lttng-dev
2025-01-22 13:08 ` Martin Hicks via lttng-dev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox