The following commit has been backported into the 6.6.y branch.
See upstream commit:
commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7
Author: Peter Zijlstra <peterz@infradead.org>
Date: Mon Nov 6 13:41:43 2023 +0100
sched: Remove vruntime from trace_sched_stat_runtime()
That caused building the lttng-modules report compile error:
tracepoint-event-impl.h:133:6: error: conflicting types for
'trace_sched_stat_runtime';
The fix is still pending on lttng review board, backport it to oe-core to
de-block the build issue.
(From OE-Core rev: 0562a2c75985acf9ef33034e8aeb163afdc683bf)
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5b973be9a7fbb2694d162ac06b76513525f3deed)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
While we wait for a new lttng-release, we backport 6
patches to fix the build against the 6.11 kernel.
(From OE-Core rev: 168e98c7d2118333da9450f069699128892e70db)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We're currently encouraging an "arms race" with the FLAGS variables since
a recipe might want to set a specific flag for all variants but to do so,
+= won't work due to the assignment in the native/nativesdk class files. This
means recipes are using append.
Since the default variables are constructed out of TARGET_XXX variables and
we redefine these, there is no need to re-define the un-prefixed variables. If
we drop that, the += appends and similar work and recipes don't have to resort
to append.
Change the classes and cleanup a number of recipes to adapt to the change. This
change will result in some flags appearing to some native/nativesdk variants
but that is probably what was originally expected anyway.
(From OE-Core rev: a157b2f9d93428ca21265cc860a3b58b3698b3aa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping lttng-modules to 2.13.13, which allows us to drop some
upstream patches.
We also import 4 patches that are required to build against 6.10.
(From OE-Core rev: afca89e93f402f5c17a1b9eb0bc7c7fffdda49a2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR
references in recipe do_compile/do_install tasks to use UNPACKDIR in the
appropraite places instead.
(From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
0001-tests-do-not-strip-a-helper-library.patch
refreshed for 2.13.13
Changelog:
===========
* Fix: consumerd: leak of tracing buffers on relayd connectivity issue
* Fix: consumerd: wrong timer mentioned in error logging
* Fix: consumerd: type confusion in lttng_consumer_send_error
* Fix: baddr-statedump: use $(LIBTOOL) --mode=execute
* Fix: relayd: live client not notified of inactive streams
* Fix: relayd: live: dispose of zombie viewer metadata stream
* tests: Fix typo in tests/regression/kernel/test_ns_contexts
* Fix: sessiond: freeze on channel creation on restart
* common: move utils_create_lock_file to its own file
* tests: tools/clear/test_ust wait for specific test app pid
* Fix: sessiond: crash when sending data_pending to an active session
* Tests: fix: list_triggers_cli: kallsyms contains prefixed symbols
* License: common: error_query: fix typo in SPDX specifier
(From OE-Core rev: 5d35200e089f0695cfb19b65dd9b56006aa3d4fc)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We drop our previously backported patches for v6.8 kernels as they are
part of the 2.13.12 release of lttng and we add backports for v6.9+
kernels.
Bumping lttng-modules to version v2.13.12-7-g52eb2ee9, which comprises the following commits:
52eb2ee9 Fix: dev_base_lock removed in linux 6.9-rc1
175fe77c Fix: mm_compaction_migratepages changed in linux 6.9-rc1
303434ab Fix: ASoC add component to set_bias_level events in linux 6.9-rc1
88c4e0fe Fix: ASoC snd_doc_dapm on linux 6.9-rc1
578ab207 Fix: build kvm probe on EL 8.4+
057ad399 Fix: support ext4_journal_start on EL 8.4+
3ca21738 Fix: correct RHEL range for kmem_cache_free define
4ba4f0ec Version 2.13.12
1124749b docs: Add supported versions and fix-backport policy
c302cf1d docs: Add links to project resources
d6b75831 Fix: Correct minimum version in jbd2 SLE kernel range
9e6736d6 Fix: Handle recent SLE major version codes
5d331562 Fix: build on sles15sp4
f6800492 Compile fixes for RHEL 9.3 kernels
d988f04a Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3
616c60b9 Fix: btrfs_get_extent flags and compress_type changed in linux 6.8.0-rc1
8d195927 Fix: btrfs_chunk tracepoints changed in linux 6.8.0-rc1
7e8d89d1 Fix: strlcpy removed in linux 6.8.0-rc1
f4c1678d Fix: timer_start changed in linux 6.8.0-rc1
60a1e809 Fix: sched_stat_runtime changed in linux 6.8.0-rc1
(From OE-Core rev: f8be1a87f1a7e7de714d19a6b3afe59e6f177e7d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lttng-tools supports testing the userspace application without kernel
module since oe-core commit e0d8494b, this is a fix that testcase
rotation-destroy-flush report LTTNG_ABORT_ON_ERROR when no lttng kernel
module present.
Fixes: e0d8494b (lttng-tools: skip kernel tests if no kernel modules present)
(From OE-Core rev: 34b6554f9f889e84ab6004c4af87e0714b8263c4)
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch which remove 'needed' in trace_ext4_discard_preallocations
(From OE-Core rev: 88c78fec6daf34d4bf50f788a0adc75e601994da)
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current tests will run both userspace and kernel testing. Some of use cases
only use lttng for one kind of tracing (e.g. userspace). If the lttng
modules(.ko files) is not present during the test,it would end up with lots of
failing.
Add a check in ptest script, if current system doesn't contain lttng kernel
modules, passing LTTNG_TOOLS_DISABLE_KERNEL_TESTS=1 to make to skip all lttng
kernel related testing.
(From OE-Core rev: e0d8494b569bc5fb45d9a4bafa25527a0ee3d970)
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update one of the patches to account for upstream changes.
(From OE-Core rev: e0ec2f9358be0e8b5979e534ae3a266b138cc172)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
linux-yocto-dev is updating to 6.8 and lttng-modules needs to be updated
to account for upsream kernel fixes.
These patches are all grabbed from the lttng review gerrit and
backported to lttng-modules 2.13.0.
(From OE-Core rev: 9a8c065784a9b665246bebe3e635e0ca43cfb30a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While working on the update to linux-yocto-dev lttng-modules
needed some tweaks (as usual).
With these three patches (submitted to lttng-dev), we can
once again build core-image-kernel-dev for v6.7+
(From OE-Core rev: b8b7b4d9274bde36f43c43207c463730f22e1f5f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
===========
* Fix: segmentation fault on filter interpretation in "switch" mode
* Fix: `ip` context is expressed as a base-10 field
* Fix: c99: use __asm__ __volatile__
* Fix: c99: static assert: clang build fails due to multiple typedef
* Fix: Reevaluate LTTNG_UST_TRACEPOINT_DEFINE each time tracepoint.h is included
* Fix: trace events in C++ constructors/destructors
* Fix: trace events in C constructors/destructors
* Fix: use unaligned pointer accesses for lttng_inline_memcpy
(From OE-Core rev: 656470b4b0db579308d218d1ece77bdacd168d14)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lld results in textrels in some .so used in tests, fixes
babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-minimal.so has relocations in .text
babeltrace2-ptest: ELF binary /usr/lib/babeltrace2/ptest/tests/lib/test-plugin-plugins/plugin-sfs.so has relocations in .text [textrel]
ERROR: babeltrace2-2.0.5-r0 do_package_qa: QA Issue: babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-ctf.so has relocations in .text
babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-utils.so has relocations in .text
babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel]
(From OE-Core rev: 18d443b53a0d76102fbbc1088fbcb3f8087a2b1b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
==========
* bt2: honor build system compiler/linker preferences
* Fix: clear_string_field(): set first character to 0
* Fix: src.ctf.fs: Not resolving event common ctx
* debug-info: fix -Wenum-int-mismatch problem in copy_field_class_content_internal
* fix: pass exec-prefix to python bindings install
* fix: document proper Bison version requirement
* cli: use return value of g_string_free
* babeltrace2-query(1): erroneous parameter used in example
* Fix: tests: print real values in a fixed format
* Fix: bt2: autodisc: remove thread error while inserting status in map
* tests: src.ctf.fs: add test for metadata with invalid syntax
* tests: shorten names of session-rotation trace
* bt2: ignore -Wredundant-decls warning
* ctf: fix -Wformat-overflow error in ctf-meta-resolve.cpp
* ctf-writer: fix -Wformat-overflow errors in resolve.c
* Fix: src.text.details: use write_uint_prop_value to handle unsigned values in write_int_range
* Add `dev-requirements.txt` for pip
* Fix: src.ctf.lttng-live: consider empty metadata packet as retry
* Fix: ctf: wrongfully requiring CTF metadata signature for every section
* Fix: src.ctf.lttng-live: session closed before any metadata is received
* fix: obsolete warnings with autoconf >= 2.71
* fix: explicitly disable '-Wsuggest-attribute=format'
* fix: set stable branch in gitreview config
* Fix: ctf-writer: list of reserved keywords
* compiler warning cleanup: is_signed_type: compare -1 to 1
* Update working version to Babeltrace 2.0.5
(From OE-Core rev: ae47b6c2a4bdee031d42687582049c15614faa6d)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a couple of patches from upstream which fix a failing test with gcc 13.
(From OE-Core rev: 9148de637f565578a96e8c02bad765ce3daffe27)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The recommendation from server maintainers is that the https protocol
is both faster and more reliable than the dedicated git protocol at this point.
Switch to it where possible.
(From OE-Core rev: 139102a73d4151f4748b4a861bd4ab28dda7dab7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As part of updating linux-yocto-dev to v6.3, lttng-modules needs to
have four backported patches to adjust for the new kernel version.
These are safe for inclusion in the upcoming release, as they are
version protected and provide some future proofing for folks trying
to use newer kernels than our released 6.1.
(From OE-Core rev: e9f0070631b032a143b765874a228674c19d0304)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping lttng-modules to version v2.13.9-4-g12f43cab, which comprises the following commits:
da1f5a26 Version 2.13.9
dc2d1294 fix: jbd2: use the correct print format (v5.4.229)
d04c1211 fix: jbd2 upper bound for v5.10.163
4b8864fc fix: jbd2: use the correct print format (v5.10.163)
69d3aa79 fix: btrfs: move accessor helpers into accessors.h (v6.2)
We drop our previously backported commits as well, since they are part
of the release.
(From OE-Core rev: 79d8e93adde07ff3a4a239d66649ee566a2437d6)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Improve the ptest runner script:
* log output is available should any test fail to aid debugging
* document how to limit the runner to a single test
* stop hiding errors to stderr
* allow easier single test execution by avoiding path issues with PWD
Also depend upon binutils since one of the tests uses addr2line.
(From OE-Core rev: 0f111c6eb1673a60663bcdd3d70c0f81bad370c4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a missing dependency on make so ptests can run in a minimal image.
(From OE-Core rev: 3d0c068cdeaf819a62f5b918a70c36ab4fb86e76)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tweak the ptest dependencies so they work correctly in minimal images. There
appears to be some usage of find or xargs that doesn't work with busybox.
Also improve the test runner so the test-suite.log is dumped upon error
which makes debugging much easier.
(From OE-Core rev: 6f52a0a9f0f26ac0039af3edd3df22e21bd8a4a7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backporting a patching from the 2.13.x stable branch of lttng
to fix the build against kernel 6.2+.
(From OE-Core rev: 3aed7dfe5ff6f52497dcffa58bc2f06cf709ea18)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop backported 0001-fix-mm-slab_common-drop-kmem_alloc-avoid-dereferenci.patch
0009-Rename-genhd-wrapper-to-blkdev.patch is present only on the master branch
and not on 2.13 branch, so keep it in the recipe.
(From OE-Core rev: 5b04d4cea291b8d816a3a8d880004506fbf2b390)
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backporting a patch from the lttng git repository to address
a build failure when the 6.1-dev kernel is used.
(From OE-Core rev: 95851b5c64a632f224c89372d723a22728c7dc38)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As a bunch of other assignments did, let this cover all riscv32 architectures,
not just qemuriscv32.
(From OE-Core rev: 976fe5e3fb630e9daf5bbde79ee2148a7a97694a)
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lttng upstream had a different solution to the compaction build isses
seen on mips.
We switch our patch for a backport of the upstream solution.
(From OE-Core rev: 459f746a198a8ae7840d783f5824fc14a44a8488)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building against a v5.19 mips kernel, the following errors
were triggered:
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:42: note: expected 'struct compact_control *' but argument is of type 'struct compact_control *'
| 105 | TP_PROTO(struct compact_control *cc,
| | ~~~~~~~~~~~~~~~~~~~~~~~~^~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:779:68: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_CLASS_CODE'
| 779 | static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \
| | ^~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:106:50: note: in expansion of macro 'PARAMS'
| 106 | LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, PARAMS(_proto), PARAMS(_args), , , \
| | ^~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:41:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_CLASS'
| 41 | LTTNG_TRACEPOINT_EVENT_CLASS(map, \
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:42:30: note: in expansion of macro 'PARAMS'
| 42 | PARAMS(proto), \
| | ^~~~~~
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:101:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP'
| 101 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:9: note: in expansion of macro 'TP_PROTO'
| 105 | TP_PROTO(struct compact_control *cc,
| | ^~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:112:57: error: invalid use of undefined type 'struct compact_control'
...
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:25: warning: 'struct compact_control' declared inside parameter list will not be visible outside of this definition or declaration
| 108 | TP_PROTO(struct compact_control *cc,
| | ^~~~~~~~~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:43: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP'
| 159 | void __event_template_proto___##_template(_proto);
| | ^~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:61: note: in expansion of macro 'PARAMS'
| 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args))
| | ^~~~~~
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:104:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP'
| 104 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:9: note: in expansion of macro 'TP_PROTO'
| 108 | TP_PROTO(struct compact_control *cc,
| | ^~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:6: error: conflicting types for '__event_template_proto___compaction_migratepages'; have 'void(struct compact_control *, unsigned int)'
| 159 | void __event_template_proto___##_template(_proto);
| | ^~~~~~~~~~~~~~~~~~~~~~~~~
| lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP'
| 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args))
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The root cause appears to be that this particular mips kernel does not
have CONFIG_COMPACTION avaiable, and hence we end up with the struct
declaration within this tracepoint, and then conflicting types.
While putting the conditional around only compaction_migratepages seemed
sufficient to get the build working, it doesn't look like any of the
tracepoints should be valid, so we extend it to all definitions.
Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-August/030246.html]
(From OE-Core rev: e25f7b5ca83d3f025ef2235f2ebd8233013eb406)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Xiangyu Chen
Richard Purdie
Alexander Kanavin
Bruce Ashfield
Wang Mingyu
Yogesh Tyagi
Denys Dmytriyenko
Khem Raj
Alexander Kanavin
Armin Kuster
He Zhe