| Message ID | 20260409014036.1519-1-wangmy@fujitsu.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2] lttng-tools: upgrade 2.14.1 -> 2.15.0 | expand |
On Thu Apr 9, 2026 at 3:40 AM CEST, wangmy via lists.openembedded.org wrote: > From: Wang Mingyu <wangmy@fujitsu.com> > > disable-tests2.patch > refresshed for 2.15.0 > > 0001-tests-do-not-strip-a-helper-library.patch > removed since it's not available in 2.15.0 > > 0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch > added to fix compile error when enable musl > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- Hi Wang, Thanks for the new version. Some ptests looks better, but some of these are still failing: AssertionError: Failed ptests: {'lttng-tools': ["tests.serial_78_-_Test_script_'ust/stall-buffer/test_stall_buffer_complex.py'_returned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0]", "tests.serial_79_-_Test_script_'ust/stall-buffer/test_stall_buffer_simple.py'_returned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0]", "tests.serial_80_-_Test_script_'ust/stall-buffer/test_stall_buffer_timer.py'_returned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0]"]} https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/3450 https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/3472 Can you have a look at the issue? Thanks, Mathieu
I have sent a v2 patch of lttng-ust to fix this ptest error. -- Best Regards --------------------------------------------------- Wang Mingyu FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL：+86+25-86630566--8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wangmy@fujitsu.com > -----Original Message----- > From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> > Sent: Thursday, April 9, 2026 8:39 PM > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>; > openembedded-core@lists.openembedded.org > Subject: Re: [PATCH] [OE-core] [PATCH v2] lttng-tools: upgrade 2.14.1 -> 2.15.0 > > On Thu Apr 9, 2026 at 3:40 AM CEST, wangmy via lists.openembedded.org > wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > > > disable-tests2.patch > > refresshed for 2.15.0 > > > > 0001-tests-do-not-strip-a-helper-library.patch > > removed since it's not available in 2.15.0 > > > > 0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch > > added to fix compile error when enable musl > > > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > > --- > > Hi Wang, > > Thanks for the new version. > > Some ptests looks better, but some of these are still failing: > > AssertionError: > Failed ptests: > {'lttng-tools': > ["tests.serial_78_-_Test_script_'ust/stall-buffer/test_stall_buffer_complex.py'_r > eturned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0 > ]", > > "tests.serial_79_-_Test_script_'ust/stall-buffer/test_stall_buffer_simple.py'_ret > urned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0]", > > "tests.serial_80_-_Test_script_'ust/stall-buffer/test_stall_buffer_timer.py'_retu > rned_code_1._0_passed,_0_failed,_0_skipped,_unknown_planned_[total:_0]"]} > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/3450 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/3472 > > Can you have a look at the issue? > > Thanks, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
On Fri Apr 10, 2026 at 12:28 PM CEST, Mingyu Wang (Fujitsu) wrote:
> I have sent a v2 patch of lttng-ust to fix this ptest error.
Thanks, but I believe the errors are still present:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/3471
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/3494
Also, we got some reproducibility error:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3813
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260412-qjuiol67/packages/diff-html/
Thanks,
Mathieu
Thank you for running the tests. However, looking at the build log for build #3471, I noticed that the sstate summary shows: Sstate summary: Wanted 5 Local 5 Mirrors 0 Missed 0 Current 440 This indicates that only 5 tasks were actually rebuilt, and lttng-ust was most likely served from the sstate cache rather than rebuilt with the patch applied. The failure output is also identical to build #3450 (before the patch), which further confirms that the updated lttng-ust package was not used during testing. Could you please invalidate the lttng-ust sstate cache and trigger a clean rebuild before re-running the ptest image? I believe the patch is correct and the test should pass once lttng-ust is rebuilt from scratch. These ptests all pass in my qemuarm64 and qemux86-64 environments. Thanks, -- Best Regards --------------------------------------------------- Wang Mingyu FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL：+86+25-86630566--8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wangmy@fujitsu.com > -----Original Message----- > From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> > Sent: Sunday, April 12, 2026 11:31 PM > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>; > openembedded-core@lists.openembedded.org > Subject: Re: [PATCH] [OE-core] [PATCH v2] lttng-tools: upgrade 2.14.1 -> 2.15.0 > > On Fri Apr 10, 2026 at 12:28 PM CEST, Mingyu Wang (Fujitsu) wrote: > > I have sent a v2 patch of lttng-ust to fix this ptest error. > > Thanks, but I believe the errors are still present: > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/3471 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/3494 > > Also, we got some reproducibility error: > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3813 > https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260412-qjuiol67/pack > ages/diff-html/ > > Thanks, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
On Mon Apr 13, 2026 at 9:13 AM CEST, wangmy via lists.openembedded.org wrote: > Thank you for running the tests. However, looking at the build log for build #3471, I noticed that the sstate summary shows: > > Sstate summary: Wanted 5 Local 5 Mirrors 0 Missed 0 Current 440 > > This indicates that only 5 tasks were actually rebuilt, and lttng-ust was most likely served from the sstate cache rather than rebuilt with the patch applied. The failure output is also identical to build #3450 (before the patch), which further confirms that the updated lttng-ust package was not used during testing. > > Could you please invalidate the lttng-ust sstate cache and trigger a clean rebuild before re-running the ptest image? I believe the patch is correct and the test should pass once lttng-ust is rebuilt from scratch. > > These ptests all pass in my qemuarm64 and qemux86-64 environments. > > Thanks, > Hi Wang, No sorry, I can't do that on the autobuilder. If we need to invalidate the cache, we will probably have to increase the PR value of the recipe. Thanks, Mathieu
Understood. Can I add PR = "r1" to the bb file? I will remove this line during the next version upgrade. -- Best Regards --------------------------------------------------- Wang Mingyu FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL：+86+25-86630566--8568 COINS: 79988548 FAX: +86+25-83317685 MAIL: wangmy@fujitsu.com > -----Original Message----- > From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> > Sent: Monday, April 13, 2026 4:13 PM > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>; > openembedded-core@lists.openembedded.org > Subject: Re: [PATCH] [OE-core] [PATCH v2] lttng-tools: upgrade 2.14.1 -> 2.15.0 > > On Mon Apr 13, 2026 at 9:13 AM CEST, wangmy via lists.openembedded.org > wrote: > > Thank you for running the tests. However, looking at the build log for build > #3471, I noticed that the sstate summary shows: > > > > Sstate summary: Wanted 5 Local 5 Mirrors 0 Missed 0 Current 440 > > > > This indicates that only 5 tasks were actually rebuilt, and lttng-ust was most > likely served from the sstate cache rather than rebuilt with the patch applied. > The failure output is also identical to build #3450 (before the patch), which > further confirms that the updated lttng-ust package was not used during > testing. > > > > Could you please invalidate the lttng-ust sstate cache and trigger a clean > rebuild before re-running the ptest image? I believe the patch is correct and the > test should pass once lttng-ust is rebuilt from scratch. > > > > These ptests all pass in my qemuarm64 and qemux86-64 environments. > > > > Thanks, > > > > Hi Wang, > > No sorry, I can't do that on the autobuilder. If we need to invalidate the cache, > we will probably have to increase the PR value of the recipe. > > Thanks, > Mathieu > > -- > Mathieu Dubois-Briand, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
On Mon Apr 13, 2026 at 12:24 PM CEST, wangmy via lists.openembedded.org wrote: > Understood. Can I add PR = "r1" to the bb file? I will remove this line during the next version upgrade. > This looks OK for me.
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch new file mode 100644 index 0000000000..a3ac13c9fa --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch @@ -0,0 +1,97 @@ +From 18c8e9070bee05c4e205ea4885d62773bd5e3426 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Fri, 27 Mar 2026 11:37:11 +0000 +Subject: [PATCH] common: Autodetect musl libc and fix C++ compilation errors + +Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/172/changes/b50e5519cb98f02e52463a221e58ba80adb7c424] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + configure.ac | 7 +++++++ + src/common/poller.cpp | 10 +++++++++- + src/common/timerfd.hpp | 12 +++++++++++- + 3 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5d5ff5a..375f8bd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,6 +181,13 @@ AM_CONDITIONAL([HAVE_SHELLCHECK], [test "x$SHELLCHECK" != "x"]) + AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) + AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) + ++# Check for musl libc: ++case "${host_cpu}-${host_os}-${LIBC}" in ++ *-musl*) ++ AC_DEFINE([HAVE_MUSL_LIBC], [1], [Define to 1 if building against musl libc.]) ++ ;; ++esac ++ + # check for bison + AC_PROG_YACC + BISON=$YACC +diff --git a/src/common/poller.cpp b/src/common/poller.cpp +index 783d58f..500d3bb 100644 +--- a/src/common/poller.cpp ++++ b/src/common/poller.cpp +@@ -7,6 +7,10 @@ + #include <common/error.hpp> + #include <common/poller.hpp> + ++#if defined(HAVE_MUSL_LIBC) && !defined(LTTNG_MUSL_EPOLL_CLOEXEC_REPLACEMENT) ++constexpr int LTTNG_MUSL_EPOLL_CLOEXEC_REPLACEMENT = EPOLL_CLOEXEC; ++#endif ++ + namespace { + + std::uint32_t to_epoll_events(lttng::poller::event_type events) +@@ -58,7 +62,11 @@ lttng::poller::event_type from_epoll_events(std::uint32_t epoll_events) + + lttng::poller::poller() : + _epoll_fd([]() { ++#if defined(HAVE_MUSL_LIBC) ++ const auto epoll_fd = ::epoll_create1(LTTNG_MUSL_EPOLL_CLOEXEC_REPLACEMENT); ++#else + const auto epoll_fd = ::epoll_create1(::EPOLL_CLOEXEC); ++#endif + + if (epoll_fd < 0) { + LTTNG_THROW_POSIX("Failed to create epoll fd", errno); +@@ -198,4 +206,4 @@ void lttng::poller::_epoll(int timeout) const + + break; + } +-} +\ No newline at end of file ++} +diff --git a/src/common/timerfd.hpp b/src/common/timerfd.hpp +index 8ab2939..91d2029 100644 +--- a/src/common/timerfd.hpp ++++ b/src/common/timerfd.hpp +@@ -14,12 +14,22 @@ + #include <sys/timerfd.h> + #include <time.h> + ++#if defined(HAVE_MUSL_LIBC) && !defined(LTTNG_MUSL_TFD_CLOEXEC_REPLACEMENT) ++constexpr int LTTNG_MUSL_TFD_CLOEXEC_REPLACEMENT = TFD_CLOEXEC; ++#endif ++ + namespace lttng { + + class timerfd : public stream_descriptor { + public: + /* Throws a posix_error exception on failure to create the underlying resource. */ +- explicit timerfd(int flags = ::TFD_CLOEXEC); ++ explicit timerfd(int flags = ++#if defined(HAVE_MUSL_LIBC) ++ LTTNG_MUSL_TFD_CLOEXEC_REPLACEMENT ++#else ++ ::TFD_CLOEXEC ++#endif ++ ); + timerfd(const timerfd&) = delete; + timerfd& operator=(const timerfd&) = delete; + timerfd(timerfd&&) = delete; +-- +2.43.0 + diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch deleted file mode 100644 index 0547f30c02..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a45157a50e14d4bd244a3dd05d79c5703c819550 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 12 Dec 2019 16:52:07 +0100 -Subject: [PATCH] tests: do not strip a helper library - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -index 836f13e..e19a554 100644 ---- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -+++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am -@@ -14,7 +14,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la - libfoo.strip: libfoo.la - $(OBJCOPY) --strip-all .libs/libfoo.so - --all-local: libfoo.strip -+all-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for script in $(EXTRA_DIST); do \ - cp -f $(srcdir)/$$script $(builddir); \ diff --git a/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch b/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch index 5b9a07fcb8..f93d6cdc4f 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/disable-tests2.patch @@ -5,24 +5,30 @@ now. Ideally tests.serial would have occasional output when running to show acti Upstream-Status: Inappropriate [workaround for slow tests] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Index: lttng-tools-2.14.0/tests/regression/Makefile.am -=================================================================== ---- lttng-tools-2.14.0.orig/tests/regression/Makefile.am -+++ lttng-tools-2.14.0/tests/regression/Makefile.am -@@ -26,7 +26,6 @@ SERIAL_TESTS = tools/base-path/test_ust +--- + tests/regression/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am +index a7cd133..bd82e94 100644 +--- a/tests/regression/Makefile.am ++++ b/tests/regression/Makefile.am +@@ -30,7 +30,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/tracefile-limits/test_tracefile_count \ tools/tracefile-limits/test_tracefile_size \ tools/exclusion/test_exclusion \ - tools/snapshots/test_kernel \ tools/snapshots/test_ust_fast \ + tools/snapshots/test_ust_long \ tools/snapshots/test_ust_streaming \ - tools/snapshots/test_kernel_streaming \ -@@ -47,8 +46,6 @@ SERIAL_TESTS = tools/base-path/test_ust +@@ -53,7 +52,6 @@ SERIAL_TESTS = tools/base-path/test_ust \ tools/rotation/test_schedule_api \ tools/metadata/test_kernel \ tools/working-directory/test_relayd_working_directory \ -- tools/clear/test_ust \ - tools/clear/test_kernel \ tools/clear/test_live_hang.py \ tools/tracker/test_event_tracker \ tools/trigger/start-stop/test_start_stop \ +-- +2.43.0 + diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb b/meta/recipes-kernel/lttng/lttng-tools_2.15.0.bb similarity index 90% rename from meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.15.0.bb index 3a3f2cff2c..5cb7b1cc41 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.14.1.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.15.0.bb @@ -44,15 +44,15 @@ PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod" PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ - file://0001-tests-do-not-strip-a-helper-library.patch \ file://run-ptest \ file://lttng-sessiond.service \ file://disable-tests.patch \ file://disable-tests2.patch \ file://libc++.patch \ + file://0001-common-Autodetect-musl-libc-and-fix-C-compilation-er.patch \ " -SRC_URI[sha256sum] = "0e68eb27923621c4bc127cfce40422d28cf7e473fedf6229ae6c32ba5c5b7c6d" +SRC_URI[sha256sum] = "4d739116556da71d58275bc7f0a6c0a967c6774b7d90f02c2731a7875debf28a" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd @@ -78,6 +78,7 @@ INSANE_SKIP:${PN} = "libexec dev-so" INSANE_SKIP:${PN}-dbg = "libexec" PRIVATE_LIBS:${PN}-ptest = "libfoo.so" +INSANE_SKIP:${PN} = "already-stripped" do_install:append () { # install systemd unit file @@ -95,7 +96,7 @@ do_install_ptest () { install -D "${B}/$f" "${D}${PTEST_PATH}/$f" done - for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.1.xsd \ + for f in tests/utils/tap-driver.sh config/test-driver src/common/session.xsd src/common/mi-lttng-4.2.xsd \ tests/regression/tests.serial; do install -D "${S}/$f" "${D}${PTEST_PATH}/$f" done @@ -140,8 +141,8 @@ do_install_ptest () { done done - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary - chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so @@ -207,12 +208,12 @@ do_install_ptest:append:libc-musl () { } INHIBIT_PACKAGE_STRIP_FILES = "\ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \ - ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/.libs/gen-syscall-events-callstack \ "