diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch deleted file mode 100644 index 662a803680..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch +++ /dev/null @@ -1,36 +0,0 @@ -From de7ca66c797ba0b3273a217a47c8fb791d896f7c Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Fri, 27 Feb 2026 17:54:39 -0500 -Subject: [PATCH] fix: adjust range in btrfs probe for v6.18.14 - -Upstream commit c5667f9c8eb9 ("btrfs: headers cleanup to remove -unnecessary local includes") was backported in v6.18.14, adjust the -range accordingly in the btrfs probe. - -Upstream-Status: Backport from commit ca93dc3b05fcb - -Change-Id: I51c5cb6345c6a1e1aa4e5e3cb9a4af2ec962ecb2 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers -Signed-off-by: Xiangyu Chen ---- - include/instrumentation/events/btrfs.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h -index feb4f40b..e87f0085 100644 ---- a/include/instrumentation/events/btrfs.h -+++ b/include/instrumentation/events/btrfs.h -@@ -12,7 +12,8 @@ - #include - #include - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,19,0) || \ -+ LTTNG_KERNEL_RANGE(6,18,14, 6,19,0)) - #include <../fs/btrfs/ordered-data.h> - #endif - --- -2.47.3 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch deleted file mode 100644 index a6fe47737e..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch +++ /dev/null @@ -1,103 +0,0 @@ -From b77f94c7a7109e70a97bf936b72d66d611187d61 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 25 May 2026 10:38:18 -0400 -Subject: [PATCH] fix: hrtimer: Reduce trace noise in hrtimer_start() (v7.1) - -See upstream commit: - - commit f2e388a019e4cf83a15883a3d1f1384298e9a6aa - Author: Thomas Gleixner - Date: Tue Feb 24 17:36:59 2026 +0100 - - hrtimer: Reduce trace noise in hrtimer_start() - - hrtimer_start() when invoked with an already armed timer traces like: - - -.. [032] d.h2. 5.002263: hrtimer_cancel: hrtimer= .... - -.. [032] d.h1. 5.002263: hrtimer_start: hrtimer= .... - - Which is incorrect as the timer doesn't get canceled. Just the expiry time - changes. The internal dequeue operation which is required for that is not - really interesting for trace analysis. But it makes it tedious to keep real - cancellations and the above case apart. - - Remove the cancel tracing in hrtimer_start() and add a 'was_armed' - indicator to the hrtimer start tracepoint, which clearly indicates what the - state of the hrtimer is when hrtimer_start() is invoked: - - -.. [032] d.h1. 6.200103: hrtimer_start: hrtimer= .... was_armed=0 - -.. [032] d.h1. 6.200558: hrtimer_start: hrtimer= .... was_armed=1 - -Change-Id: I37ee0ae0af665a51fd4f92adffb6b1dcb2ecd9d2 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/b77f94c7a7109e70a97bf936b72d66d611187d61] -Signed-off-by: He Zhe ---- - include/instrumentation/events/timer.h | 39 ++++++++++++++++++++++++-- - 1 file changed, 37 insertions(+), 2 deletions(-) - -diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h -index f69e069b..dfc295e0 100644 ---- a/include/instrumentation/events/timer.h -+++ b/include/instrumentation/events/timer.h -@@ -220,12 +220,43 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init, - ) - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(7,1,0) || \ -+ LTTNG_KERNEL_RANGE(7,0,10, 7,1,0) || \ -+ LTTNG_KERNEL_RANGE(6,18,33, 6,19,0) || \ -+ LTTNG_KERNEL_RANGE(6,12,91, 6,13,0) || \ -+ LTTNG_KERNEL_RANGE(6,6,141, 6,7,0)) - /** - * hrtimer_start - called when the hrtimer is started -- * @timer: pointer to struct hrtimer -+ * @hrtimer: pointer to struct hrtimer -+ * @mode: the hrtimers mode -+ * @was_armed: Was armed when hrtimer_start*() was invoked - */ --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0) || \ -+LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, -+ -+ timer_hrtimer_start, -+ -+ TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode, bool was_armed), -+ -+ TP_ARGS(hrtimer, mode, was_armed), -+ -+ TP_FIELDS( -+ ctf_integer_hex(void *, hrtimer, hrtimer) -+ ctf_integer_hex(void *, function, hrtimer->function) -+ ctf_integer(s64, expires, -+ lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer))) -+ ctf_integer(s64, softexpires, -+ lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer))) -+ ctf_enum(hrtimer_mode, unsigned int, mode, mode) -+ ctf_integer(bool, was_armed, was_armed) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,16,0) || \ - LTTNG_RT_KERNEL_RANGE(4,14,0,0, 4,15,0,0)) -+/** -+ * hrtimer_start - called when the hrtimer is started -+ * @hrtimer: pointer to struct hrtimer -+ * @mode: the hrtimers mode -+ */ - LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, - - timer_hrtimer_start, -@@ -245,6 +276,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, - ) - ) - #else -+/** -+ * hrtimer_start - called when the hrtimer is started -+ * @hrtimer: pointer to struct hrtimer -+ */ - LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, - - timer_hrtimer_start, --- -2.34.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.14.7.bb similarity index 87% rename from meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.14.7.bb index d0983f58cb..8a6ab93dc1 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.14.4.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.14.7.bb @@ -20,10 +20,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ - file://0001-fix-adjust-range-in-btrfs-probe-for-v6.18.14.patch \ - file://0001-fix-hrtimer-Reduce-trace-noise-in-hrtimer_start-v7.1.patch \ " -SRC_URI[sha256sum] = "63deefbc15d9ce7c43d858187533367b01dcb6e8469d6b69ccb757d6d3dbb0ad" +SRC_URI[sha256sum] = "fe304c31ad3e8f68a48f52b538ed2c1bf9b9fe62d8ee528ebc96d0a321287145" export INSTALL_MOD_DIR = "kernel/lttng-modules"