summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch
deleted file mode 100644
index a0d932c7b7..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 9e59c2f6387aeb832ae3af3095f987529722e08f Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 22 Jan 2024 11:10:37 -0500
4Subject: [PATCH 1/5] Fix: sched_stat_runtime changed in linux 6.8.0-rc1
5
6See upstream commit:
7
8 commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7
9 Author: Peter Zijlstra <peterz@infradead.org>
10 Date: Mon Nov 6 13:41:43 2023 +0100
11
12 sched: Remove vruntime from trace_sched_stat_runtime()
13
14 Tracing the runtime delta makes sense, observer can sum over time.
15 Tracing the absolute vruntime makes less sense, inconsistent:
16 absolute-vs-delta, but also vruntime delta can be computed from
17 runtime delta.
18
19 Removing the vruntime thing also makes the two tracepoint sites
20 identical, allowing to unify the code in a later patch.
21
22Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700]
23
24Change-Id: I24ebb4e06dbb646a1af75ac62b74f3821ff197de
25Signed-off-by: Kienan Stewart <kstewart@efficios.com>
26Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
27---
28 include/instrumentation/events/sched.h | 19 +++++++++++++++++++
29 1 file changed, 19 insertions(+)
30
31diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
32index 066a0f8..24cf37c 100644
33--- a/include/instrumentation/events/sched.h
34+++ b/include/instrumentation/events/sched.h
35@@ -646,6 +646,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
36 TP_ARGS(tsk, delay))
37 #endif
38
39+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
40+/*
41+ * Tracepoint for accounting runtime (time the task is executing
42+ * on a CPU).
43+ */
44+LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
45+
46+ TP_PROTO(struct task_struct *tsk, u64 runtime),
47+
48+ TP_ARGS(tsk, runtime),
49+
50+ TP_FIELDS(
51+ ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
52+ ctf_integer(pid_t, tid, tsk->pid)
53+ ctf_integer(u64, runtime, runtime)
54+ )
55+)
56+#else
57 /*
58 * Tracepoint for accounting runtime (time the task is executing
59 * on a CPU).
60@@ -663,6 +681,7 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
61 ctf_integer(u64, vruntime, vruntime)
62 )
63 )
64+#endif
65
66 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,12,0) || \
67 LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
68--
692.39.2
70