From b51df1baa8433b9fe8c8debbb5ee49a98e31953e Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Sun, 22 Dec 2024 18:25:20 +0800 Subject: lttng-modules: fix sched_stat_runtime changed in Linux 6.6.66 The following commit has been backported into the 6.6.y branch. See upstream commit: commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7 Author: Peter Zijlstra Date: Mon Nov 6 13:41:43 2023 +0100 sched: Remove vruntime from trace_sched_stat_runtime() That caused building the lttng-modules report compile error: tracepoint-event-impl.h:133:6: error: conflicting types for 'trace_sched_stat_runtime'; The fix is still pending on lttng review board, backport it to oe-core to de-block the build issue. (From OE-Core rev: 5b973be9a7fbb2694d162ac06b76513525f3deed) Signed-off-by: Xiangyu Chen Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...ched_stat_runtime-changed-in-Linux-6.6.66.patch | 51 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch (limited to 'meta') diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch new file mode 100644 index 0000000000..bb40ff7243 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch @@ -0,0 +1,51 @@ +From 74cdd186fdd540b98ecded94d506b812d7d2bae5 Mon Sep 17 00:00:00 2001 +From: Kienan Stewart +Date: Sun, 22 Dec 2024 17:39:35 +0800 +Subject: [PATCH] Fix: sched_stat_runtime changed in Linux 6.6.66 + +The following commit has been backported into the 6.6.y branch. + +See upstream commit: + + commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7 + Author: Peter Zijlstra + Date: Mon Nov 6 13:41:43 2023 +0100 + + sched: Remove vruntime from trace_sched_stat_runtime() + + Tracing the runtime delta makes sense, observer can sum over time. + Tracing the absolute vruntime makes less sense, inconsistent: + absolute-vs-delta, but also vruntime delta can be computed from + runtime delta. + + Removing the vruntime thing also makes the two tracepoint sites + identical, allowing to unify the code in a later patch. + +Change-Id: I74acf0b8340c371e8411116e07e5c97b10f9c756 +Signed-off-by: Kienan Stewart + +Upstream-Status: Pending [https://review.lttng.org/c/lttng-modules/+/13813] + +[Xiangyu: BP to fix compile error on linux 6.6.66, Minor conflict resolution] +Signed-off-by: Xiangyu Chen +--- + include/instrumentation/events/sched.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h +index 32d18133..0c62f2e6 100644 +--- a/include/instrumentation/events/sched.h ++++ b/include/instrumentation/events/sched.h +@@ -647,7 +647,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked, + #endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0) || \ +- LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0)) ++ LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0) || \ ++ LTTNG_KERNEL_RANGE(6,6,66, 6,7,0)) + /* + * Tracepoint for accounting runtime (time the task is executing + * on a CPU). +-- +2.43.0 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb index feba35fd2d..f2f7947903 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb @@ -13,7 +13,9 @@ 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" +SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ + file://0001-Fix-sched_stat_runtime-changed-in-Linux-6.6.66.patch \ + " SRC_URI[sha256sum] = "6694414a3701fcd6e05b3cb20cfecae3b46b3dfb9e5361b344851c1f8052e854" -- cgit v1.2.3-54-g00ecf