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

lttng-modules: Fix for 5.10.163 kernel version

Browse Source 
(From OE-Core rev: 72851563e22b4b4c548a610a7e9f68fd2450daaa)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 4ad1f430abe1e7706b43b36405f036fa23a4e6fd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
2023-01-26 16:33:22 -05:00
committed by Richard Purdie
parent 6b46222fc4
commit a2b403f4db
3 changed files with 115 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,52 @@
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 Normal file
View File

@@ -0,0 +1,61 @@
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

2
meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb
View File

@@ -11,6 +11,8 @@ 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 \
"
# Use :append here so that the patch is applied also when using devupstream