diff options
author | Armin Kuster <akuster@mvista.com> | 2023-01-26 16:33:22 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-28 00:07:08 +0000 |
commit | 0c37cdbf5b599e67abb47200e39523418c2ab868 (patch) | |
tree | f68f54d9c5bfc887c74b1b289861ffeadab0137b /meta/recipes-kernel/lttng/lttng-modules | |
parent | 6830aa2a3e5f6301572cdc54db25789916068d5b (diff) | |
download | poky-0c37cdbf5b599e67abb47200e39523418c2ab868.tar.gz |
lttng-modules: Fix for 5.10.163 kernel version
(From OE-Core rev: 4ad1f430abe1e7706b43b36405f036fa23a4e6fd)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch | 52 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch | 61 |
2 files changed, 113 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch new file mode 100644 index 0000000000..bfc49294b0 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Tue, 17 Jan 2023 12:16:04 -0500 | ||
4 | Subject: [PATCH] fix: jbd2 upper bound for v5.10.163 | ||
5 | |||
6 | Use the correct upper bound of 5,11,0. | ||
7 | |||
8 | Change-Id: I435b44b940c7346ed8c3ef0d445365ed156702d0 | ||
9 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
10 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
14 | |||
15 | --- | ||
16 | include/instrumentation/events/jbd2.h | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h | ||
20 | index f7993511..9b77ab92 100644 | ||
21 | --- a/include/instrumentation/events/jbd2.h | ||
22 | +++ b/include/instrumentation/events/jbd2.h | ||
23 | @@ -28,7 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, | ||
24 | ) | ||
25 | |||
26 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
27 | - || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
28 | + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ | ||
29 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
30 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
31 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
32 | @@ -97,7 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, | ||
33 | #endif | ||
34 | |||
35 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
36 | - || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
37 | + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ | ||
38 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
39 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
40 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
41 | @@ -140,7 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, | ||
42 | ) | ||
43 | |||
44 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
45 | - || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
46 | + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ | ||
47 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
48 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
49 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
50 | -- | ||
51 | 2.35.4 | ||
52 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch new file mode 100644 index 0000000000..8067cffaab --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Tue, 17 Jan 2023 11:03:12 -0500 | ||
4 | Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 | ||
9 | Author: Bixuan Cui <cuibixuan@linux.alibaba.com> | ||
10 | Date: Tue Oct 11 19:33:44 2022 +0800 | ||
11 | |||
12 | jbd2: use the correct print format | ||
13 | |||
14 | The print format error was found when using ftrace event: | ||
15 | <...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368 | ||
16 | <...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0 | ||
17 | |||
18 | Use the correct print format for transaction, head and tid. | ||
19 | |||
20 | Change-Id: I7601f5cbb86495c2607be7b11e02724c90b3ebf9 | ||
21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
23 | |||
24 | Upstream-Status: Backport | ||
25 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
26 | |||
27 | --- | ||
28 | include/instrumentation/events/jbd2.h | 3 +++ | ||
29 | 1 file changed, 3 insertions(+) | ||
30 | |||
31 | diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h | ||
32 | index d5d8ea0c..f7993511 100644 | ||
33 | --- a/include/instrumentation/events/jbd2.h | ||
34 | +++ b/include/instrumentation/events/jbd2.h | ||
35 | @@ -28,6 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, | ||
36 | ) | ||
37 | |||
38 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
39 | + || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
40 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
41 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
42 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
43 | @@ -96,6 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, | ||
44 | #endif | ||
45 | |||
46 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
47 | + || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
48 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
49 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
50 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
51 | @@ -138,6 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, | ||
52 | ) | ||
53 | |||
54 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ | ||
55 | + || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ | ||
56 | || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ | ||
57 | || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ | ||
58 | || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) | ||
59 | -- | ||
60 | 2.35.4 | ||
61 | |||