mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-25 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

lttng-modules: update to v2.13.9

Browse Source 
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>
This commit is contained in:
Bruce Ashfield
2023-03-18 11:32:01 -04:00
committed by Richard Purdie
parent 20dec1e527
commit fc363acc5b
4 changed files with 1 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
View File

@@ -1,45 +0,0 @@
From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 16 Jan 2023 15:01:51 -0500
Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2)
See upstream commit :
commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703
Author: Josef Bacik <josef@toxicpanda.com>
Date: Wed Oct 19 10:51:00 2022 -0400
btrfs: move accessor helpers into accessors.h
This is a large patch, but because they're all macros it's impossible to
split up. Simply copy all of the item accessors in ctree.h and paste
them in accessors.h, and then update any files to include the header so
everything compiles.
Upstream-Status: Backport
Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
include/instrumentation/events/btrfs.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
index 785f16ac..01157107 100644
--- a/include/instrumentation/events/btrfs.h
+++ b/include/instrumentation/events/btrfs.h
@@ -9,6 +9,10 @@
#include <linux/writeback.h>
#include <lttng/kernel-version.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
+#include <../fs/btrfs/accessors.h>
+#endif
+
#ifndef _TRACE_BTRFS_DEF_
#define _TRACE_BTRFS_DEF_
struct btrfs_root;
--
2.34.1

52
meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch
View File

@@ -1,52 +0,0 @@
From 4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 17 Jan 2023 12:16:04 -0500
Subject: [PATCH] fix: jbd2 upper bound for v5.10.163
Use the correct upper bound of 5,11,0.
Change-Id: I435b44b940c7346ed8c3ef0d445365ed156702d0
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Upstream-Status: Backport
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
include/instrumentation/events/jbd2.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
index f7993511..9b77ab92 100644
--- a/include/instrumentation/events/jbd2.h
+++ b/include/instrumentation/events/jbd2.h
@@ -28,7 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -97,7 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
#endif
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -140,7 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
--
2.35.4

61
meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch
View File

@@ -1,61 +0,0 @@
From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 17 Jan 2023 11:03:12 -0500
Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163)
See upstream commit :
commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8
Author: Bixuan Cui <cuibixuan@linux.alibaba.com>
Date: Tue Oct 11 19:33:44 2022 +0800
jbd2: use the correct print format
The print format error was found when using ftrace event:
<...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368
<...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0
Use the correct print format for transaction, head and tid.
Change-Id: I7601f5cbb86495c2607be7b11e02724c90b3ebf9
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Upstream-Status: Backport
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
include/instrumentation/events/jbd2.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
index d5d8ea0c..f7993511 100644
--- a/include/instrumentation/events/jbd2.h
+++ b/include/instrumentation/events/jbd2.h
@@ -28,6 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -96,6 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
#endif
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -138,6 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
--
2.35.4

5
meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb → meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb
View File

@@ -11,15 +11,12 @@ include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0009-Rename-genhd-wrapper-to-blkdev.patch \
file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \
file://fix-jbd2-upper-bound-for-v5.10.163.patch \
file://0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch \
"
# 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[sha256sum] = "f525d3d48ea3a475cb535339c201666d0e4c75ec8c46d29837bcf381ea02cb19"
SRC_URI[sha256sum] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581"
export INSTALL_MOD_DIR="kernel/lttng-modules"