summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-03-18 11:32:01 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-22 23:17:27 +0000
commitfc363acc5be39897a130893d220cc3e93974b162 (patch)
tree5a8929cb42cb857178a0bc5d2483e7da77e7e360 /meta/recipes-kernel/lttng
parent20dec1e5271942c2d0d3d10c5b63f9b0b79cc952 (diff)
downloadpoky-fc363acc5be39897a130893d220cc3e93974b162.tar.gz
lttng-modules: update to v2.13.9
Bumping lttng-modules to version v2.13.9-4-g12f43cab, which comprises the following commits: da1f5a26 Version 2.13.9 dc2d1294 fix: jbd2: use the correct print format (v5.4.229) d04c1211 fix: jbd2 upper bound for v5.10.163 4b8864fc fix: jbd2: use the correct print format (v5.10.163) 69d3aa79 fix: btrfs: move accessor helpers into accessors.h (v6.2) We drop our previously backported commits as well, since they are part of the release. (From OE-Core rev: 79d8e93adde07ff3a4a239d66649ee566a2437d6) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch45
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch52
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch61
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb)5
4 files changed, 1 insertions, 162 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
deleted file mode 100644
index 26ae605b31..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 16 Jan 2023 15:01:51 -0500
4Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2)
5
6See upstream commit :
7
8 commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703
9 Author: Josef Bacik <josef@toxicpanda.com>
10 Date: Wed Oct 19 10:51:00 2022 -0400
11
12 btrfs: move accessor helpers into accessors.h
13
14 This is a large patch, but because they're all macros it's impossible to
15 split up. Simply copy all of the item accessors in ctree.h and paste
16 them in accessors.h, and then update any files to include the header so
17 everything compiles.
18
19Upstream-Status: Backport
20
21Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52
22Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
23Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
24---
25 include/instrumentation/events/btrfs.h | 4 ++++
26 1 file changed, 4 insertions(+)
27
28diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
29index 785f16ac..01157107 100644
30--- a/include/instrumentation/events/btrfs.h
31+++ b/include/instrumentation/events/btrfs.h
32@@ -9,6 +9,10 @@
33 #include <linux/writeback.h>
34 #include <lttng/kernel-version.h>
35
36+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
37+#include <../fs/btrfs/accessors.h>
38+#endif
39+
40 #ifndef _TRACE_BTRFS_DEF_
41 #define _TRACE_BTRFS_DEF_
42 struct btrfs_root;
43--
442.34.1
45
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
deleted file mode 100644
index bfc49294b0..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Tue, 17 Jan 2023 12:16:04 -0500
4Subject: [PATCH] fix: jbd2 upper bound for v5.10.163
5
6Use the correct upper bound of 5,11,0.
7
8Change-Id: I435b44b940c7346ed8c3ef0d445365ed156702d0
9Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
10Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
11
12Upstream-Status: Backport
13Signed-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
19diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
20index 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--
512.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
deleted file mode 100644
index 8067cffaab..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Tue, 17 Jan 2023 11:03:12 -0500
4Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163)
5
6See 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
20Change-Id: I7601f5cbb86495c2607be7b11e02724c90b3ebf9
21Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
22Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
23
24Upstream-Status: Backport
25Signed-off-by: Armin Kuster <akuster@mvista.com>
26
27---
28 include/instrumentation/events/jbd2.h | 3 +++
29 1 file changed, 3 insertions(+)
30
31diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
32index 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--
602.35.4
61
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb
index c04796be16..a08386b053 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb
@@ -11,15 +11,12 @@ include lttng-platforms.inc
11 11
12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://0009-Rename-genhd-wrapper-to-blkdev.patch \ 13 file://0009-Rename-genhd-wrapper-to-blkdev.patch \
14 file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \
15 file://fix-jbd2-upper-bound-for-v5.10.163.patch \
16 file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \
17 " 14 "
18 15
19# Use :append here so that the patch is applied also when using devupstream 16# Use :append here so that the patch is applied also when using devupstream
20SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" 17SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
21 18
22SRC_URI[sha256sum] = "f525d3d48ea3a475cb535339c201666d0e4c75ec8c46d29837bcf381ea02cb19" 19SRC_URI[sha256sum] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581"
23 20
24export INSTALL_MOD_DIR="kernel/lttng-modules" 21export INSTALL_MOD_DIR="kernel/lttng-modules"
25 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 22:40:50 +0000