Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *lttng-modules* to *2.13.16* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am 0001-lttng-modules-upgrade-2.13.15-2.13.16.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 946f52201ae2c322329974b713cffe3d062f8338 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <[email protected]>
Date: Sun, 1 Dec 2024 06:26:35 +0000
Subject: [PATCH] lttng-modules: upgrade 2.13.15 -> 2.13.16
---
...-uprobe_register-return-struct-uprob.patch | 160 ------------------
...fine-the-show_inode_state-macro-defi.patch | 68 --------
...e-missing-CONFIG_TRACEPOINTS-to-warn.patch | 2 +-
...es_2.13.15.bb => lttng-modules_2.13.16.bb} | 5 +-
4 files changed, 3 insertions(+), 232 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-uprobes-make-uprobe_register-return-struct-uprob.patch
delete mode 100644
meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Refine-the-show_inode_state-macro-defi.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.15.bb =>
lttng-modules_2.13.16.bb} (85%)
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-uprobes-make-uprobe_register-return-struct-uprob.patch
b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-uprobes-make-uprobe_register-return-struct-uprob.patch
deleted file mode 100644
index 052220e7ff..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-uprobes-make-uprobe_register-return-struct-uprob.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 9b96303d2382c767eb1f507d934bcc3fe225d74c Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <[email protected]>
-Date: Thu, 17 Oct 2024 11:56:02 -0400
-Subject: [PATCH] Fix: uprobes: make uprobe_register() return struct uprobe *
- (v6.12)
-
-See upstream commits :
-
- commit 3c83a9ad0295eb63bdeb81d821b8c3b9417fbcac
- Author: Oleg Nesterov <[email protected]>
- Date: Thu Aug 1 15:27:34 2024 +0200
-
- uprobes: make uprobe_register() return struct uprobe *
-
- This way uprobe_unregister() and uprobe_apply() can use "struct uprobe *"
- rather than inode + offset. This simplifies the code and allows to avoid
- the unnecessary find_uprobe() + put_uprobe() in these functions.
-
- TODO: uprobe_unregister() still needs get_uprobe/put_uprobe to ensure that
- this uprobe can't be freed before up_write(&uprobe->register_rwsem).
-
- commit 04b01625da130c7521b768996cd5e48052198b97
- Author: Peter Zijlstra <[email protected]>
- Date: Tue Sep 3 10:46:00 2024 -0700
-
- perf/uprobe: split uprobe_unregister()
-
- With uprobe_unregister() having grown a synchronize_srcu(), it becomes
- fairly slow to call. Esp. since both users of this API call it in a
- loop.
-
- Peel off the sync_srcu() and do it once, after the loop.
-
- We also need to add uprobe_unregister_sync() into uprobe_register()'s
- error handling path, as we need to be careful about returning to the
- caller before we have a guarantee that partially attached consumer won't
- be called anymore. This is an unlikely slow path and this should be
- totally fine to be slow in the case of a failed attach.
-
- commit e04332ebc8ac128fa551e83f1161ab1c094d13a9
- Author: Oleg Nesterov <[email protected]>
- Date: Thu Aug 1 15:27:28 2024 +0200
-
- uprobes: kill uprobe_register_refctr()
-
- It doesn't make any sense to have 2 versions of _register(). Note that
- trace_uprobe_enable(), the only user of uprobe_register(), doesn't need
- to check tu->ref_ctr_offset to decide which one should be used, it could
- safely pass ref_ctr_offset == 0 to uprobe_register_refctr().
-
- Add this argument to uprobe_register(), update the callers, and kill
- uprobe_register_refctr().
-
-Upstream-Status: Backport [commit 9b96303d]
-
-Change-Id: I8d1f9a5db1f19c2bc2029709ae36f82e86f6fe58
-Signed-off-by: Michael Jeanson <[email protected]>
-Signed-off-by: Mathieu Desnoyers <[email protected]>
----
- include/lttng/events-internal.h | 1 +
- include/wrapper/uprobes.h | 7 ++++++-
- src/probes/lttng-uprobes.c | 32 ++++++++++++++++++++++++++++++++
- 3 files changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
-index a91a659e..8633608d 100644
---- a/include/lttng/events-internal.h
-+++ b/include/lttng/events-internal.h
-@@ -42,6 +42,7 @@ struct lttng_krp; /* Kretprobe
handling */
- struct lttng_uprobe_handler {
- struct lttng_kernel_event_common *event;
- loff_t offset;
-+ struct uprobe *uprobe;
- struct uprobe_consumer up_consumer;
- struct list_head node;
- };
-diff --git a/include/wrapper/uprobes.h b/include/wrapper/uprobes.h
-index 9cbbe3b2..52b72d53 100644
---- a/include/wrapper/uprobes.h
-+++ b/include/wrapper/uprobes.h
-@@ -18,9 +18,14 @@
-
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0))
- #include <linux/uprobes.h>
-+/*
-+ * No wrappers for >= 6.12, the API has changed too much, the version checks
-+ * are inlined in 'src/probes/lttng-uprobes.c'.
-+ */
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,12,0))
-
- /* Use kallsym lookup for version before 3.9. */
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
-
- static inline
- int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct
uprobe_consumer *uc)
-diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
-index f70218be..5be83cdb 100644
---- a/src/probes/lttng-uprobes.c
-+++ b/src/probes/lttng-uprobes.c
-@@ -233,8 +233,16 @@ int lttng_uprobes_add_callsite(struct lttng_uprobe
*uprobe,
- goto register_error;
- }
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,12,0))
-+ ret = 0;
-+ uprobe_handler->uprobe = uprobe_register(uprobe->inode,
-+ uprobe_handler->offset, 0, &uprobe_handler->up_consumer);
-+ if (IS_ERR(uprobe_handler->uprobe))
-+ ret = -1;
-+#else
- ret = wrapper_uprobe_register(uprobe->inode,
- uprobe_handler->offset, &uprobe_handler->up_consumer);
-+#endif
- if (ret) {
- printk(KERN_WARNING "LTTng: Error registering probe on inode
%lu "
- "and offset 0x%llx\n", uprobe->inode->i_ino,
-@@ -330,15 +338,39 @@ void lttng_uprobes_unregister(struct inode *inode,
struct list_head *head)
- {
- struct lttng_uprobe_handler *iter, *tmp;
-
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,12,0))
-+ /*
-+ * Iterate over the list of handler, unregister each uprobe.
-+ */
-+ list_for_each_entry(iter, head, node) {
-+ uprobe_unregister_nosync(iter->uprobe, &iter->up_consumer);
-+ iter->uprobe = NULL;
-+ }
-+
-+ /*
-+ * Call synchronize_srcu() on uprobes_srcu.
-+ */
-+ uprobe_unregister_sync();
-+
- /*
- * Iterate over the list of handler, remove each handler from the list
- * and free the struct.
- */
-+ list_for_each_entry_safe(iter, tmp, head, node) {
-+ list_del(&iter->node);
-+ kfree(iter);
-+ }
-+#else
-+ /*
-+ * Iterate over the list of handler, unregister each uprobe, remove
-+ * each handler from the list and free the struct.
-+ */
- list_for_each_entry_safe(iter, tmp, head, node) {
- wrapper_uprobe_unregister(inode, iter->offset,
&iter->up_consumer);
- list_del(&iter->node);
- kfree(iter);
- }
-+#endif
- }
-
- void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder
*event_recorder)
---
-2.39.2
-
diff --git
a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Refine-the-show_inode_state-macro-defi.patch
b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Refine-the-show_inode_state-macro-defi.patch
deleted file mode 100644
index 39b68eeeb2..0000000000
---
a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-writeback-Refine-the-show_inode_state-macro-defi.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4610de285daf887262a58683d8597668de62e676 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <[email protected]>
-Date: Thu, 17 Oct 2024 16:59:07 -0400
-Subject: [PATCH] fix: writeback: Refine the show_inode_state() macro
- definition (v6.12)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-See upstream commit :
-
- commit 459ca85ae1feff78d1518344df88bb79a092780c
- Author: Julian Sun <[email protected]>
- Date: Wed Aug 28 16:13:59 2024 +0800
-
- writeback: Refine the show_inode_state() macro definition
-
- Currently, the show_inode_state() macro only prints
- part of the state of inode->i_state. Let’s improve it
- to display more of its state.
-
-Upstream-Status: Backport [commit 4610de285daf887262a58]
-
-Change-Id: Idaebd56f5775205f8a5c76e117c5ab65f7f1754b
-Signed-off-by: Michael Jeanson <[email protected]>
-Signed-off-by: Mathieu Desnoyers <[email protected]>
----
- include/instrumentation/events/writeback.h | 24 +++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/include/instrumentation/events/writeback.h
b/include/instrumentation/events/writeback.h
-index c4510b44..cad01994 100644
---- a/include/instrumentation/events/writeback.h
-+++ b/include/instrumentation/events/writeback.h
-@@ -71,7 +71,29 @@ static inline struct backing_dev_info
*lttng_inode_to_bdi(struct inode *inode)
- * changed by an upstream kernel, the fact that we have a redefinition here
- * will generate a compiler warning.
- */
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,12,0))
-+#define show_inode_state(state) \
-+ __print_flags(state, "|", \
-+ {I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
-+ {I_DIRTY_DATASYNC, "I_DIRTY_DATASYNC"}, \
-+ {I_DIRTY_PAGES, "I_DIRTY_PAGES"}, \
-+ {I_NEW, "I_NEW"}, \
-+ {I_WILL_FREE, "I_WILL_FREE"}, \
-+ {I_FREEING, "I_FREEING"}, \
-+ {I_CLEAR, "I_CLEAR"}, \
-+ {I_SYNC, "I_SYNC"}, \
-+ {I_DIRTY_TIME, "I_DIRTY_TIME"}, \
-+ {I_REFERENCED, "I_REFERENCED"}, \
-+ {I_LINKABLE, "I_LINKABLE"}, \
-+ {I_WB_SWITCH, "I_WB_SWITCH"}, \
-+ {I_OVL_INUSE, "I_OVL_INUSE"}, \
-+ {I_CREATING, "I_CREATING"}, \
-+ {I_DONTCACHE, "I_DONTCACHE"}, \
-+ {I_SYNC_QUEUED, "I_SYNC_QUEUED"}, \
-+ {I_PINNING_NETFS_WB, "I_PINNING_NETFS_WB"}, \
-+ {I_LRU_ISOLATING, "I_LRU_ISOLATING"} \
-+ )
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
- LTTNG_KERNEL_RANGE(4,14,218, 4,15,0) || \
- LTTNG_KERNEL_RANGE(4,19,172, 4,20,0) || \
- LTTNG_KERNEL_RANGE(5,4,94, 5,5,0) || \
---
-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 4911982461..8d076c193c 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 60d423945bd4f4c4b7bfc6f29da9231152d05690 Mon Sep 17 00:00:00 2001
+From 36e250f88562012760d3b914eccf24f6cdfe15fc Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <[email protected]>
Date: Sat, 15 May 2021 10:26:38 -0400
Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb
similarity index 85%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb
index e05a2c9572..3d09130f61 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.15.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb
@@ -10,14 +10,13 @@ inherit module
include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
-
file://0001-fix-writeback-Refine-the-show_inode_state-macro-defi.patch \
-
file://0001-Fix-uprobes-make-uprobe_register-return-struct-uprob.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] =
"6692554eca50e9d22e71b7c2ee6c7db89d393268d404261212af37c5247c0729"
+SRC_URI[sha256sum] =
"6694414a3701fcd6e05b3cb20cfecae3b46b3dfb9e5361b344851c1f8052e854"
export INSTALL_MOD_DIR="kernel/lttng-modules"
--
2.44.1
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1877 entries from dependency cache.
Parsing recipes...done.
Parsing of 921 .bb files complete (918 cached, 3 parsed). 1877 targets, 41
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.1"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp
workspace =
"tmp-auh-upgrades:09e69f87658789ba3a13148f3e22db22f56e864b"
Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing
build without monitoring pressure
Sstate summary: Wanted 112 Local 100 Mirrors 0 Missed 12 Current 209 (89%
match, 96% complete)
done.
NOTE: Executing Tasks
NOTE: Setscene tasks completed
NOTE: Running task 837 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_recipe_qa)
NOTE: recipe lttng-modules-2.13.16-r0: task do_recipe_qa: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_recipe_qa: Succeeded
NOTE: Running task 971 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_fetch)
NOTE: recipe lttng-modules-2.13.16-r0: task do_fetch: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_fetch: Succeeded
NOTE: Running task 972 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_unpack)
NOTE: Running task 973 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_prepare_recipe_sysroot)
NOTE: recipe lttng-modules-2.13.16-r0: task do_unpack: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_prepare_recipe_sysroot: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_unpack: Succeeded
NOTE: Running task 974 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_patch)
NOTE: Running task 975 of 990
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_collect_spdx_deps)
NOTE: recipe lttng-modules-2.13.16-r0: task do_prepare_recipe_sysroot: Succeeded
NOTE: recipe lttng-modules-2.13.16-r0: task do_patch: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_collect_spdx_deps: Started
NOTE: recipe lttng-modules-2.13.16-r0: task do_collect_spdx_deps: Succeeded
NOTE: recipe lttng-modules-2.13.16-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: 1 seconds
NOTE: The errors for this build are stored in
/srv/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20241201062623.txt
You can send the errors to a reports server by running:
send-error-report
/srv/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20241201062623.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:
/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_patch
log:
/srv/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.16/temp/log.do_patch.193077
Summary: There was 1 ERROR message, returning a non-zero exit code.
ERROR: lttng-modules-2.13.16-r0 do_patch: Applying patch
'0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch' on target
directory
'/srv/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.16/lttng-modules-2.13.16'
CmdError('quilt --quiltrc
/srv/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.16/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:
/srv/pokybuild/yocto-worker/auh/build/build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.13.16/temp/log.do_patch.193077
ERROR: Task
(/srv/pokybuild/yocto-worker/auh/build/meta/recipes-kernel/lttng/lttng-modules_2.13.16.bb:do_patch)
failed with exit code '1'
0001-lttng-modules-upgrade-2.13.15-2.13.16.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208058): https://lists.openembedded.org/g/openembedded-core/message/208058 Mute This Topic: https://lists.openembedded.org/mt/109859525/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
