lttng-modules: Backport Linux 5.18+, 5.15.44+, 5.10.119+ fixes
PATCH 1/1 lttng-modules: Backport Linux 5.18+, 5.15.44+, 5.10.119+ fixes
The Linux kernel commit 14c174633f349 ("random: remove unused tracepoints") removed unused tracepoints and has been backported to stable Linux kernel releases. This causes build failure of lttng-modules:
"lttng-modules-2.11.6/probes/lttng-probe-random.c:18:10: fatal error: trace/events/random.h: No such file or directory
| 18 | #include <trace/events/random.h> | | ^~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated.
"
Backport patches from lttng-modules master branch to address the build failure on all of Linux 5.18.y, 5.15.y and 5.10.y kernel versions.
--- ...ndom-remove-unused-tracepoints-v5.18.patch | 46 +++++++++++++++++ ...emove-unused-tracepoints-v5.10-v5.15.patch | 45 ++++++++++++++++ ...racepoints-removed-in-stable-kernels.patch | 51 +++++++++++++++++++ .../lttng/lttng-modules_2.11.6.bb | 3 ++ 4 files changed, 145 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0019-fix-random-tracepoints-removed-in-stable-kernels.patch
meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 25b70c486bb96de0caf7cea1da42ed07801cca84 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <[email protected]> +Date: Mon, 4 Apr 2022 14:33:42 -0400 +Subject: [PATCH 17/19] fix: random: remove unused tracepoints (v5.18) + +See upstream commit : + + commit 14c174633f349cb41ea90c2c0aaddac157012f74 + Author: Jason A. Donenfeld <[email protected]> + Date: Thu Feb 10 16:40:44 2022 +0100 + + random: remove unused tracepoints + + These explicit tracepoints aren't really used and show sign of aging. + It's work to keep these up to date, and before I attempted to keep them + up to date, they weren't up to date, which indicates that they're not + really used. These days there are better ways of introspecting anyway. + +Upstream-Status: Backport [369d82bb1746447514c877088d7c5fd0f39140f8] +Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 +Signed-off-by: Michael Jeanson <[email protected]> +Signed-off-by: Mathieu Desnoyers <[email protected]> +--- + probes/Kbuild | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/probes/Kbuild b/probes/Kbuild +index 3ae2d39e..58da82b8 100644 +--- a/probes/Kbuild ++++ b/probes/Kbuild +@@ -215,8 +215,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) + CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 + endif + ++# Introduced in v3.6, remove in v5.18 + obj-$(CONFIG_LTTNG) += $(shell \ +- if [ $(VERSION) -ge 4 \ ++ if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ ++ -a \ ++ $(VERSION) -ge 4 \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ + -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ +-- +2.35.1 +
meta/recipes-kernel/lttng/lttng-modules/0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0019-fix-random-tracepoints-removed-in-stable-kernels.patch new file +51 -0
51 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb +3 -0
@@ -28,6 +28,9 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0014-Revert-fix-include-order-for-older-kernels.patch \ file://0015-fix-backport-of-fix-tracepoint-Optimize-using-static.patch \ file://0016-fix-adjust-version-range-for-trace_find_free_extent.patch \ + file://0017-fix-random-remove-unused-tracepoints-v5.18.patch \ + file://0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch \ + file://0019-fix-random-tracepoints-removed-in-stable-kernels.patch \ " SRC_URI[md5sum] = "8ef09fdfcdec669d33f7fc1c1c80f2c4"
Signature · 1 line
2.35.1
A message that is not in the archive (sent off-list or not yet received): YreZrhrd+GqvY/[email protected]
Quoted 12 lines · Jason A. Donenfeld
Quoted 11 lines · Marek Vasut
The Linux kernel commit
14c174633f349("random: remove unused tracepoints") removed unused tracepoints and has been backported to stable Linux kernel releases. This causes build failure of lttng-modules:"
lttng-modules-2.11.6/probes/lttng-probe-random.c:18:10: fatal error:trace/events/random.h: No such file or directory| 18 | #include <trace/events/random.h> | | ^~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated."
Quoted 4 lines
Quoted 2 lines
Backport patches from lttng-modules master branch to address the build failure on all of Linux 5.18.y, 5.15.y and 5.10.y kernel versions.
Also 5.4, 4.19, 4.14, and 4.9.
Do you want a V2 with this updated commit message ? (or, can Steve add this line when applying?)
I can add the extra info.
Steve
Quoted 24 lines · Marek Vasut
Quoted 2 lines · Jason A. Donenfeld
Quoted 1 line · Marek Vasut
The Linux kernel commit
14c174633f349("random: remove unusedtracepoints")
Quoted 1 line
Quoted 1 line
removed unused tracepoints and has been backported to stable Linux
kernel
Quoted 4 lines
Quoted 4 lines
releases. This causes build failure of lttng-modules:
"
lttng-modules-2.11.6/probes/lttng-probe-random.c:18:10: fatal error:
trace/events/random.h: No such file or directoryQuoted 9 lines
Quoted 7 lines
| 18 | #include <trace/events/random.h> | | ^~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated."
Backport patches from lttng-modules master branch to address the build failure on all of Linux 5.18.y, 5.15.y and 5.10.y kernel versions.
Also 5.4, 4.19, 4.14, and 4.9.
Do you want a V2 with this updated commit message ? (or, can Steve add this line when applying?)
Quoted 1 line · Steve Sakoman
I can add the extra info.
Nice, thanks !