Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *lttng-modules* to *2.13.13* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am 0001-lttng-modules-upgrade-2.13.12-2.13.13.patch
- check the changes to upstream patches and summarize them in the commit
message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update
failures.
Any problem please file a bug at
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
>From 402c75221fe4257ab26d53b110df0c79f2cc71b1 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <a...@yoctoproject.org>
Date: Sat, 1 Jun 2024 14:29:32 +0000
Subject: [PATCH] lttng-modules: upgrade 2.13.12 -> 2.13.13
---
...x-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch | 93 ------------
...e-missing-CONFIG_TRACEPOINTS-to-warn.patch | 12 +-
...ponent-to-set_bias_level-events-in-l.patch | 132 ------------------
...n_migratepages-changed-in-linux-6.9-.patch | 81 -----------
...v_base_lock-removed-in-linux-6.9-rc1.patch | 57 --------
...es_2.13.12.bb => lttng-modules_2.13.13.bb} | 9 +-
6 files changed, 9 insertions(+), 375 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.12.bb =>
lttng-modules_2.13.13.bb} (77%)
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch
b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch
deleted file mode 100644
index 9d5fd0de60..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fec007d9630e010062cf5699a08460f71f46b527 Mon Sep 17 00:00:00 2001
-From: Kienan Stewart <kstew...@efficios.com>
-Date: Mon, 25 Mar 2024 08:54:42 -0400
-Subject: [PATCH 1/4] Fix: ASoC snd_doc_dapm on linux 6.9-rc1
-
-See upstream commit:
-
- commit 7df3eb4cdb6bbfa482f51548b9fd47c2723c68ba
- Author: Luca Ceresoli <luca.ceres...@bootlin.com>
- Date: Wed Mar 6 10:30:01 2024 +0100
-
- ASoC: trace: add event to snd_soc_dapm trace events
-
- Add the event value to the snd_soc_dapm_start and snd_soc_dapm_done
trace
- events to make them more informative.
-
- Trace before:
-
- aplay-229 [000] 250.140309: snd_soc_dapm_start:
card=vscn-2046
- aplay-229 [000] 250.167531: snd_soc_dapm_done:
card=vscn-2046
- aplay-229 [000] 251.169588: snd_soc_dapm_start:
card=vscn-2046
- aplay-229 [000] 251.195245: snd_soc_dapm_done:
card=vscn-2046
-
- Trace after:
-
- aplay-214 [000] 693.290612: snd_soc_dapm_start:
card=vscn-2046 event=1
- aplay-214 [000] 693.315508: snd_soc_dapm_done:
card=vscn-2046 event=1
- aplay-214 [000] 694.537349: snd_soc_dapm_start:
card=vscn-2046 event=2
- aplay-214 [000] 694.563241: snd_soc_dapm_done:
card=vscn-2046 event=2
-
-Upstream-Status: Backport [88c4e0fe Fix: ASoC snd_doc_dapm on linux 6.9-rc1]
-
-Change-Id: If0d33544b8dd1dfb3d12ca9390892190fc0444b0
-Signed-off-by: Kienan Stewart <kstew...@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
----
- include/instrumentation/events/asoc.h | 33 +++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/include/instrumentation/events/asoc.h
b/include/instrumentation/events/asoc.h
-index 21d13a0f..5126d4c1 100644
---- a/include/instrumentation/events/asoc.h
-+++ b/include/instrumentation/events/asoc.h
-@@ -51,6 +51,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card,
snd_soc_bias_level_done,
-
- )
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
-+
-+ TP_PROTO(struct snd_soc_card *card, int event),
-+
-+ TP_ARGS(card, event),
-+
-+ TP_FIELDS(
-+ ctf_string(name, card->name)
-+ ctf_integer(int, event, event)
-+ )
-+)
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic,
snd_soc_dapm_start,
-+
-+ asoc_snd_soc_dapm_start,
-+
-+ TP_PROTO(struct snd_soc_card *card, int event),
-+
-+ TP_ARGS(card, event)
-+
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic,
snd_soc_dapm_done,
-+
-+ asoc_snd_soc_dapm_done,
-+
-+ TP_PROTO(struct snd_soc_card *card, int event),
-+
-+ TP_ARGS(card, event)
-+
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
-
- TP_PROTO(struct snd_soc_card *card),
-@@ -81,6 +113,7 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done,
- TP_ARGS(card)
-
- )
-+#endif
-
- LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget,
-
---
-2.39.2
-
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index 120528bf9c..ed2ffb622d 100644
---
a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++
b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -1,4 +1,4 @@
-From 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001
+From 6cab21fdba5cd5c074bf43b0ccb90a9a15f915da Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfi...@gmail.com>
Date: Sat, 15 May 2021 10:26:38 -0400
Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
@@ -19,10 +19,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
src/Kbuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-Index: lttng-modules-2.13.10/src/Kbuild
-===================================================================
---- lttng-modules-2.13.10.orig/src/Kbuild
-+++ lttng-modules-2.13.10/src/Kbuild
+diff --git a/src/Kbuild b/src/Kbuild
+index 7137874..04eb5c9 100644
+--- a/src/Kbuild
++++ b/src/Kbuild
@@ -2,10 +2,13 @@
ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
@@ -38,7 +38,7 @@ Index: lttng-modules-2.13.10/src/Kbuild
TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
-@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-
+@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o
obj-$(CONFIG_LTTNG) += probes/
obj-$(CONFIG_LTTNG) += lib/
obj-$(CONFIG_LTTNG) += tests/
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch
b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch
deleted file mode 100644
index 6ea10ffc91..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From d8379ec6365a925db33cae94fb6783cdbdb6a922 Mon Sep 17 00:00:00 2001
-From: Kienan Stewart <kstew...@efficios.com>
-Date: Mon, 25 Mar 2024 09:40:29 -0400
-Subject: [PATCH 2/4] Fix: ASoC add component to set_bias_level events in linux
- 6.9-rc1
-
-See upstream commit:
-
- commit 6ef46a69ec32fe1cf56de67742fcd01af4bf48af
- Author: Luca Ceresoli <luca.ceres...@bootlin.com>
- Date: Wed Mar 6 10:30:00 2024 +0100
-
- ASoC: trace: add component to set_bias_level trace events
-
- The snd_soc_bias_level_start and snd_soc_bias_level_done trace events
- currently look like:
-
- aplay-229 [000] 1250.140778: snd_soc_bias_level_start:
card=vscn-2046 val=1
- aplay-229 [000] 1250.140784: snd_soc_bias_level_done:
card=vscn-2046 val=1
- aplay-229 [000] 1250.140786: snd_soc_bias_level_start:
card=vscn-2046 val=2
- aplay-229 [000] 1250.140788: snd_soc_bias_level_done:
card=vscn-2046 val=2
- kworker/u8:1-21 [000] 1250.140871: snd_soc_bias_level_start:
card=vscn-2046 val=1
- kworker/u8:0-11 [000] 1250.140951: snd_soc_bias_level_start:
card=vscn-2046 val=1
- kworker/u8:0-11 [000] 1250.140956: snd_soc_bias_level_done:
card=vscn-2046 val=1
- kworker/u8:0-11 [000] 1250.140959: snd_soc_bias_level_start:
card=vscn-2046 val=2
- kworker/u8:0-11 [000] 1250.140961: snd_soc_bias_level_done:
card=vscn-2046 val=2
- kworker/u8:1-21 [000] 1250.167219: snd_soc_bias_level_done:
card=vscn-2046 val=1
- kworker/u8:1-21 [000] 1250.167222: snd_soc_bias_level_start:
card=vscn-2046 val=2
- kworker/u8:1-21 [000] 1250.167232: snd_soc_bias_level_done:
card=vscn-2046 val=2
- kworker/u8:0-11 [000] 1250.167440: snd_soc_bias_level_start:
card=vscn-2046 val=3
- kworker/u8:0-11 [000] 1250.167444: snd_soc_bias_level_done:
card=vscn-2046 val=3
- kworker/u8:1-21 [000] 1250.167497: snd_soc_bias_level_start:
card=vscn-2046 val=3
- kworker/u8:1-21 [000] 1250.167506: snd_soc_bias_level_done:
card=vscn-2046 val=3
-
- There are clearly multiple calls, one per component, but they cannot be
- discriminated from each other.
-
- Change the ftrace events to also print the component name, to make it
clear
- which part of the code is involved. This requires changing the passed
value
- from a struct snd_soc_card, where the DAPM context is not kwown, to a
- struct snd_soc_dapm_context where it is obviously known but the a card
- pointer is also available.
-
- With this change, the resulting trace becomes:
-
- aplay-247 [000] 1436.357332: snd_soc_bias_level_start:
card=vscn-2046 component=(none) val=1
- aplay-247 [000] 1436.357338: snd_soc_bias_level_done:
card=vscn-2046 component=(none) val=1
- aplay-247 [000] 1436.357340: snd_soc_bias_level_start:
card=vscn-2046 component=(none) val=2
- aplay-247 [000] 1436.357343: snd_soc_bias_level_done:
card=vscn-2046 component=(none) val=2
- kworker/u8:4-215 [000] 1436.357437: snd_soc_bias_level_start:
card=vscn-2046 component=ff560000.codec val=1
- kworker/u8:5-231 [000] 1436.357518: snd_soc_bias_level_start:
card=vscn-2046 component=ff320000.i2s val=1
- kworker/u8:5-231 [000] 1436.357523: snd_soc_bias_level_done:
card=vscn-2046 component=ff320000.i2s val=1
- kworker/u8:5-231 [000] 1436.357526: snd_soc_bias_level_start:
card=vscn-2046 component=ff320000.i2s val=2
- kworker/u8:5-231 [000] 1436.357528: snd_soc_bias_level_done:
card=vscn-2046 component=ff320000.i2s val=2
- kworker/u8:4-215 [000] 1436.383217: snd_soc_bias_level_done:
card=vscn-2046 component=ff560000.codec val=1
- kworker/u8:4-215 [000] 1436.383221: snd_soc_bias_level_start:
card=vscn-2046 component=ff560000.codec val=2
- kworker/u8:4-215 [000] 1436.383231: snd_soc_bias_level_done:
card=vscn-2046 component=ff560000.codec val=2
- kworker/u8:5-231 [000] 1436.383468: snd_soc_bias_level_start:
card=vscn-2046 component=ff320000.i2s val=3
- kworker/u8:5-231 [000] 1436.383472: snd_soc_bias_level_done:
card=vscn-2046 component=ff320000.i2s val=3
- kworker/u8:4-215 [000] 1436.383503: snd_soc_bias_level_start:
card=vscn-2046 component=ff560000.codec val=3
- kworker/u8:4-215 [000] 1436.383513: snd_soc_bias_level_done:
card=vscn-2046 component=ff560000.codec val=3
-
-Upstream-Status: Backport [303434ab Fix: ASoC add component to set_bias_level
events in linux 6.9-rc1]
-
-Change-Id: I959f1680c002acdf29828b968d3975247f5433d8
-Signed-off-by: Kienan Stewart <kstew...@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
----
- include/instrumentation/events/asoc.h | 36 +++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
-Index: lttng-modules-2.13.12/include/instrumentation/events/asoc.h
-===================================================================
---- lttng-modules-2.13.12.orig/include/instrumentation/events/asoc.h
-+++ lttng-modules-2.13.12/include/instrumentation/events/asoc.h
-@@ -10,6 +10,7 @@
- #include <lttng/kernel-version.h>
-
- #define DAPM_DIRECT "(direct)"
-+#define DAPM_COMPONENT_NONE "(none)"
-
- #ifndef _TRACE_ASOC_DEF
- #define _TRACE_ASOC_DEF
-@@ -119,6 +120,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc
- )
- #endif
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context,
-+
-+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
-+
-+ TP_ARGS(dapm, val),
-+
-+ TP_FIELDS(
-+ ctf_string(name, dapm->card->name)
-+ ctf_string(component, dapm->component ? dapm->component->name :
DAPM_COMPONENT_NONE)
-+ ctf_integer(int, val, val)
-+ )
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context,
snd_soc_bias_level_start,
-+
-+ asoc_snd_soc_bias_level_start,
-+
-+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
-+
-+ TP_ARGS(dapm, val)
-+
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context,
snd_soc_bias_level_done,
-+
-+ asoc_snd_soc_bias_level_done,
-+
-+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
-+
-+ TP_ARGS(dapm, val)
-+
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_card,
-
- TP_PROTO(struct snd_soc_card *card, int val),
-@@ -150,6 +185,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc
- TP_ARGS(card, val)
-
- )
-+#endif
-
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
- LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch
b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch
deleted file mode 100644
index 66c48ebe8f..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f4a6415f8d5fa447868d1fdc7119e0a328966379 Mon Sep 17 00:00:00 2001
-From: Kienan Stewart <kstew...@efficios.com>
-Date: Mon, 25 Mar 2024 10:30:32 -0400
-Subject: [PATCH 3/4] Fix: mm_compaction_migratepages changed in linux 6.9-rc1
-
-See upstream commit:
-
- commit ab755bf4249b992fc2140d615ab0a686d50765b4
- Author: Baolin Wang <baolin.w...@linux.alibaba.com>
- Date: Tue Feb 20 14:16:31 2024 +0800
-
- mm: compaction: update the cc->nr_migratepages when allocating or
freeing the freepages
-
- Currently we will use 'cc->nr_freepages >= cc->nr_migratepages'
comparison
- to ensure that enough freepages are isolated in isolate_freepages(),
- however it just decreases the cc->nr_freepages without updating
- cc->nr_migratepages in compaction_alloc(), which will waste more CPU
- cycles and cause too many freepages to be isolated.
-
- So we should also update the cc->nr_migratepages when allocating or
- freeing the freepages to avoid isolating excess freepages. And I can
see
- fewer free pages are scanned and isolated when running thpcompact on my
- Arm64 server:
-
- k6.7 k6.7_patched
- Ops Compaction pages isolated 120692036.00 118160797.00
- Ops Compaction migrate scanned 131210329.00 154093268.00
- Ops Compaction free scanned 1090587971.00 1080632536.00
- Ops Compact scan efficiency 12.03 14.26
-
- Moreover, I did not see an obvious latency improvements, this is likely
- because isolating freepages is not the bottleneck in the thpcompact
test
- case.
-
- k6.7 k6.7_patched
- Amean fault-both-1 1089.76 ( 0.00%) 1080.16 * 0.88%*
- Amean fault-both-3 1616.48 ( 0.00%) 1636.65 * -1.25%*
- Amean fault-both-5 2266.66 ( 0.00%) 2219.20 * 2.09%*
- Amean fault-both-7 2909.84 ( 0.00%) 2801.90 * 3.71%*
- Amean fault-both-12 4861.26 ( 0.00%) 4733.25 * 2.63%*
- Amean fault-both-18 7351.11 ( 0.00%) 6950.51 * 5.45%*
- Amean fault-both-24 9059.30 ( 0.00%) 9159.99 * -1.11%*
- Amean fault-both-30 10685.68 ( 0.00%) 11399.02 * -6.68%*
-
-Upstream-Status: Backport [175fe77c Fix: mm_compaction_migratepages changed in
linux 6.9-rc1]
-
-Change-Id: I103a43fd1b549360b3fc978fd409b7c17ef3e192
-Signed-off-by: Kienan Stewart <kstew...@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
----
- include/instrumentation/events/compaction.h | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-Index: lttng-modules-2.13.12/include/instrumentation/events/compaction.h
-===================================================================
---- lttng-modules-2.13.12.orig/include/instrumentation/events/compaction.h
-+++ lttng-modules-2.13.12/include/instrumentation/events/compaction.h
-@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(comp
-
- #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */
-
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
-+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
-+
-+ compaction_migratepages,
-+
-+ TP_PROTO(unsigned int nr_migratepages,
-+ unsigned int nr_succeeded),
-+
-+ TP_ARGS(nr_migratepages, nr_succeeded),
-+
-+ TP_FIELDS(
-+ ctf_integer(unsigned long, nr_migrated, nr_succeeded)
-+ ctf_integer(unsigned long, nr_failed, nr_migratepages -
nr_succeeded)
-+ )
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \
- LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0))
- LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
-
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch
b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch
deleted file mode 100644
index 59ef4f9313..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 217bc2e4685050dddce9bdd2557b64f6b8c16622 Mon Sep 17 00:00:00 2001
-From: Kienan Stewart <kstew...@efficios.com>
-Date: Mon, 25 Mar 2024 10:53:46 -0400
-Subject: [PATCH 4/4] Fix: dev_base_lock removed in linux 6.9-rc1
-
-See upstream commit:
-
- commit 1b3ef46cb7f2618cc0b507393220a69810f6da12
- Author: Eric Dumazet <eduma...@google.com>
- Date: Tue Feb 13 06:32:45 2024 +0000
-
- net: remove dev_base_lock
-
- dev_base_lock is not needed anymore, all remaining users also hold
RTNL.
-
-Upstream-Status: Backport [52eb2ee9 Fix: dev_base_lock removed in linux
6.9-rc1]
-
-Change-Id: I6b07e6eed07fd398302ca14d23162ed24d74df15
-Signed-off-by: Kienan Stewart <kstew...@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
----
- src/lttng-statedump-impl.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-Index: lttng-modules-2.13.12/src/lttng-statedump-impl.c
-===================================================================
---- lttng-modules-2.13.12.orig/src/lttng-statedump-impl.c
-+++ lttng-modules-2.13.12/src/lttng-statedump-impl.c
-@@ -392,6 +392,20 @@ void lttng_enumerate_device(struct lttng
- }
- }
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
-+static
-+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
-+{
-+ struct net_device *dev;
-+
-+ rtnl_lock();
-+ for_each_netdev(&init_net, dev)
-+ lttng_enumerate_device(session, dev);
-+ rtnl_unlock();
-+
-+ return 0;
-+}
-+#else
- static
- int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
- {
-@@ -404,6 +418,7 @@ int lttng_enumerate_network_ip_interface
-
- return 0;
- }
-+#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) */
- #else /* CONFIG_INET */
- static inline
- int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
similarity index 77%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
index 95d5e2d615..0f05622bd4 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
@@ -10,16 +10,13 @@ inherit module
include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
- file://0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch \
-
file://0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch \
-
file://0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch \
- file://0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch \
- "
+
file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.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] =
"d85fcb66c7bd31003ab8735e8c77700e5e4f417b4c22fe1f20112cf435abad79"
+SRC_URI[sha256sum] =
"7d26c07a5e80b66aa7bdcfdaaf4857f00fc9a5cdde79226b2528676700d50228"
export INSTALL_MOD_DIR="kernel/lttng-modules"
--
2.44.0
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1878 entries from dependency cache.
Parsing recipes...done.
Parsing of 918 .bb files complete (915 cached, 3 parsed). 1877 targets, 35
skipped, 0 masked, 0 errors.
Removing 1 recipes from the qemux86_64 sysroot...done.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "2.9.1"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "x86_64-poky-linux"
MACHINE = "qemux86-64"
DISTRO = "poky"
DISTRO_VERSION = "5.0+snapshot-bb2c4f1e1f34ab487db7744d0cb3e42f6b80043f"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp
workspace =
"tmp-auh-upgrades:bb2c4f1e1f34ab487db7744d0cb3e42f6b80043f"
Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing
build without monitoring pressure
Sstate summary: Wanted 107 Local 95 Mirrors 0 Missed 12 Current 214 (88% match,
96% complete)
done.
NOTE: Executing Tasks
NOTE: Setscene tasks completed
NOTE: Running task 841 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_recipe_qa)
NOTE: recipe lttng-modules-2.13.13-r0: task do_recipe_qa: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_recipe_qa: Succeeded
NOTE: Task
/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_recipe_qa
unihash changed to
d20e7346827b422eb66c7509c64b74369f8ba6f89bd059e040b29ed35f0bcc8f
NOTE: Setscene tasks completed
NOTE: Running task 971 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_fetch)
NOTE: recipe lttng-modules-2.13.13-r0: task do_fetch: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_fetch: Succeeded
NOTE: Running task 972 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_unpack)
NOTE: Running task 973 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_prepare_recipe_sysroot)
NOTE: recipe lttng-modules-2.13.13-r0: task do_unpack: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_prepare_recipe_sysroot: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_unpack: Succeeded
NOTE: Running task 974 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_patch)
NOTE: Running task 975 of 990
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_collect_spdx_deps)
NOTE: recipe lttng-modules-2.13.13-r0: task do_prepare_recipe_sysroot: Succeeded
NOTE: recipe lttng-modules-2.13.13-r0: task do_patch: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_collect_spdx_deps: Started
NOTE: recipe lttng-modules-2.13.13-r0: task do_collect_spdx_deps: Succeeded
NOTE: recipe lttng-modules-2.13.13-r0: task do_patch: Failed
NOTE: Tasks Summary: Attempted 975 tasks of which 969 didn't need to be rerun
and 1 failed.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 3 seconds
NOTE: The errors for this build are stored in
/home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240601142914.txt
You can send the errors to a reports server by running:
send-error-report
/home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240601142914.txt
[-s server]
NOTE: The contents of these logs will be posted in public if you use the above
command with the default server. Please ensure you remove any identifying or
proprietary information when prompted before sending.
Summary: 1 task failed:
/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_patch
Summary: There was 1 ERROR message, returning a non-zero exit code.
ERROR: lttng-modules-2.13.13-r0 do_patch: Applying patch
'0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch' on target
directory
'/home/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.13/lttng-modules-2.13.13'
CmdError('quilt --quiltrc
/home/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.13/recipe-sysroot-native/etc/quiltrc
push', 0, 'stdout: Patch
0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch is already
applied; check your series file
stderr: ')
ERROR: Logfile of failure stored in:
/home/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.13/temp/log.do_patch.2473106
ERROR: Task
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb:do_patch)
failed with exit code '1'
0001-lttng-modules-upgrade-2.13.12-2.13.13.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200177): https://lists.openembedded.org/g/openembedded-core/message/200177 Mute This Topic: https://lists.openembedded.org/mt/106431300/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
