[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core][kirkstone 08/19] lttng-modules: fix build for kernel 5.10.137
From: "Steve Sakoman" <steve () sakoman ! com>
Date: 2022-08-31 14:39:28
Message-ID: cb51e97f66285d64d188379aff6282ba597c49e9.1661956484.git.steve () sakoman ! com
[Download RAW message or body]
Content-Transfer-Encoding: 8bit
Backport patch from upstream "fix: adjust range v5.10.137 in block probe":
https://github.com/lttng/lttng-modules/commit/5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...djust-range-v5.10.137-in-block-probe.patch | 92 +++++++++++++++++++
.../lttng/lttng-modules_2.13.4.bb | 1 +
2 files changed, 93 insertions(+)
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch \
b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
new file mode 100644
index 0000000000..1c3918be5c
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch
@@ -0,0 +1,92 @@
+From 5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6 Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson@efficios.com>
+Date: Mon, 22 Aug 2022 14:16:27 -0400
+Subject: [PATCH] fix: adjust range v5.10.137 in block probe
+
+See upstream commit, backported in v5.10.137 :
+
+commit 1cb3032406423b25aa984854b4d78e0100d292dd
+Author: Christoph Hellwig <hch@lst.de>
+Date: Thu Dec 3 17:21:39 2020 +0100
+
+ block: remove the request_queue to argument request based tracepoints
+
+ [ Upstream commit a54895fa057c67700270777f7661d8d3c7fda88a ]
+
+ The request_queue can trivially be derived from the request.
+
+Change-Id: I01f96a437641421faf993b4b031171c372bd0374
+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+
+Upstream-Status: Backport \
[https://github.com/lttng/lttng-modules/commit/5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6]
+Signed-off-by: Steve Sakoman <steve@sakoman.com>
+
+---
+ include/instrumentation/events/block.h | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/include/instrumentation/events/block.h \
b/include/instrumentation/events/block.h +index 882e6e08..d4821c12 100644
+--- a/include/instrumentation/events/block.h
++++ b/include/instrumentation/events/block.h
+@@ -366,7 +366,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
+ )
+ )
+-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ /**
+ * block_rq_requeue - place block IO request back on a queue
+ * @rq: block IO operation request
+@@ -611,7 +612,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
+ ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
+ )
+ )
+-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
+
+ TP_PROTO(struct request *rq),
+@@ -746,7 +748,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
+ )
+ #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ /**
+ * block_rq_insert - insert block operation request into queue
+ * @rq: block IO operation request
+@@ -781,7 +784,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert,
+ )
+ #endif
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ /**
+ * block_rq_issue - issue pending block IO request operation to device driver
+ * @rq: block IO operation operation request
+@@ -812,7 +816,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue,
+ )
+ #endif
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ /**
+ * block_rq_merge - merge request with another one in the elevator
+ * @rq: block IO operation operation request
+@@ -1632,7 +1637,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap,
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
+ )
+ )
+-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \
++ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0))
+ /**
+ * block_rq_remap - map request for a block operation request
+ * @rq: block IO operation request
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb \
b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index f60ab3b5f5..80b9ceec3f \
100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
@@ -16,6 +16,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \
file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \
file://0001-fix-compaction.patch \
+ file://0001-fix-adjust-range-v5.10.137-in-block-probe.patch \
"
# Use :append here so that the patch is applied also when using devupstream
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170119): https://lists.openembedded.org/g/openembedded-core/message/170119
Mute This Topic: https://lists.openembedded.org/mt/93372451/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic