Fixes:
In file included from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87,
from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183,
from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29:
TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: error: conflicting types for 'trace_jbd2_run_stats'
130 | void trace_##_name(_proto);
| ^~~~~~
TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP'
42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP'
84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT'
107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
| ^~~~~~~~~~~~~~~~~~~~~~
In file included from TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9,
from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18:
TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: note: previous definition of 'trace_jbd2_run_stats' was here
243 | static inline void trace_##name(proto) \
| ^~~~~~
TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: note: in expansion of macro '__DECLARE_TRACE'
406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: note: in expansion of macro 'DECLARE_TRACE'
542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: note: in expansion of macro 'TRACE_EVENT'
234 | TRACE_EVENT(jbd2_run_stats,
| ^~~~~~~~~~~
CC [M] TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o
Backport from upstream master branch fixes:
b28830a0dc4fd2615b87612c99eb24
Note that master branch upstream has restructured the location of header files, so the patches
do not apply cleanly. This patch combines the changes in the above commits in the old header location.
(From OE-Core rev: 520d957e14be77f73c82a295f685d189381d8f72)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-17 (Random Act of Kindness Day) LTTng modules 2.11.8
* fix: Adjust ranges for Ubuntu 5.8.0-44 kernel
* Fix: do not use bdi_unknown_name symbol
* fix: memcg: fix a crash in wb_workfn when a device disappears (5.6)
* Fix: writeback: out-of-bound reads
* fix: Add one digit to RHEL major release version
* fix: Add one digit to SLES minor release version
* fix: RT_PATCH_VERSION is close to overflow
* fix: cast LTTNG_KERNEL_VERSION/LTTNG_LINUX_VERSION_CODE to uint64_t
* fix: UTS_UBUNTU_RELEASE_ABI is close to overflow
* fix: sublevel version overflow in LINUX_VERSION_CODE
* Namespace kernel version macros
* aarch64: blacklist gcc prior to 5.1
* fix: missing include for 'task_struct' in fdtable.h
* fix: genirq: Restrict export of irq_to_desc() (v5.11)
* fix: block: merge struct block_device and struct hd_struct (v5.11)
* fix: kprobes: Remove kretprobe hash (v5.11)
* fix: file: Rename fcheck lookup_fd_rcu (v5.11)
* fix: block: remove the request_queue argument to the block_bio_remap tracepoint (v5.11)
* fix: block: remove the request_queue argument to the block_split tracepoint (v5.11)
* fix: block: simplify and extend the block_bio_merge tracepoint class (v5.11)
* fix: block: remove the request_queue to argument request based tracepoints (v5.11)
(From OE-Core rev: fa1056f62017ea764b494c41cc7cdaefe0a80fb6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The Linux kernel commit 14c174633f349 ("random: remove unused tracepoints")
removed unused tracepoints and has been backported to stable Linux kernel
releases. This causes build failure of lttng-modules:
"
lttng-modules-2.11.6/probes/lttng-probe-random.c:18:10: fatal error: trace/events/random.h: No such file or directory
| 18 | #include <trace/events/random.h>
| | ^~~~~~~~~~~~~~~~~~~~~~~
| compilation terminated.
"
Backport patches from lttng-modules master branch to address the build
failure on all of Linux 5.18.y, 5.15.y 5.10.y, 5.4, 4.19, 4.14, and 4.9 kernel versions.
(From OE-Core rev: 9f301f5563df868626d624c2d0781dae1b81a4c0)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This was being provided by other pieces of the dependency chain but is
specifically required by configure and could fail if those pieces come
from sstate. Fix such builds by adding the missing dependency.
(From OE-Core rev: 32dd9e93c8a49c07d28c8bf240145c9e48864de7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ba2587beb2a3fb0ef9139f846e161542d2c5c4ae)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When CONFIG_TRACEPOINTS is not enabled in kernel config - module
compilation is skipped, which causes the ${D}/${nonarch_base_libdir} not
to be created.
This fails later in do_install:append() due to the fact that find
command in executed for non-existing folder.
Check for folder existence before find command in executed.
(From OE-Core rev: db8a8b53f440f37731c7c5db9561ac46ef59d891)
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit de0aa1700ed4e6f04b0a233eb1f6d2ac598e7ed8)
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To fix building against the latest 5.4.x kernels (and other versions
as well), we import the lttng patches that have been added since the
2.11.6 release.
When 2.11.7 is released, we can drop these patches and go with the
release tarball.
(From OE-Core rev: ea7e3c47af4191e69d54fc519865d125ed61d8eb)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We'll be using an upstream version bump instead of this backport
This reverts commit 348c666b2dca230308c8462dac2117b04cca6ae7.
(From OE-Core rev: 49ab42d4dc93cee75ac7e9b3a4623ff1f42b306f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backporting the kernel version changes for writeback.h to fix
compilation against kernel stable versions 5.4.62+
This is a combination of upstream commits:
87b2aff [fix: writeback: Fix sync livelock due to b_dirty_time processing (v5.9)]
b74b25f [fix: version ranges for ext4_discard_preallocations and writeback_queue_io
Upstream-status: Backport
(From OE-Core rev: 348c666b2dca230308c8462dac2117b04cca6ae7)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to version 2.11.2 in order to fix some build errors
with latest 5.4 kernel.
- conflicting types for 'trace_fast_page_fault'
Reproductible on kernel greater than v5.4.19, starting with commit
8a1cd01bee ("KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on
32-bit KVM")
Error messages:
lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6:
error:
130 | void trace_##_name(_proto);
tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21:
note: previous definition of 'trace_fast_page_fault' was here
233 | static inline void trace_##name(proto)
- conflicting types for 'trace_rcu_dyntick'
Reproductible on kernel greater than v5.4.22, starting with commit
6cf539a87a ("rcu: Fix data-race due to atomic_t copy-by-value")
Error messages:
lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6:
error: conflicting types for 'trace_rcu_dyntick'
130 | void trace_##_name
tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21:
note: previous definition of 'trace_rcu_dyntick' was here
233 | static inline void trace_##name(proto)
(From OE-Core rev: 8fcc33aea08fc1e82818893feb7b01c7cc1e6416)
Signed-off-by: Daniel Dragomir <Daniel.Dragomir@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When add below line to local.conf to enable debug build:
DEBUG_BUILD = "1"
There comes below failure when run "bitbake babeltrace2"
| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted':
| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized]
| 702 | !ds_index_entries_equal(entry, other_entry)) {
So initialize the other_entry pointer to fix the above error.
(From OE-Core rev: 1b98db372a1fdaecf9bb897b0ee4b2e72af22f81)
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Babeltrace 1 vs. Babeltrace 2
The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was released.
Babeltrace 2 is a complete rewrite of the library, Python bindings, and CLI. It
is plugin based and offers much more features and potential than Babeltrace 1.
Because Babeltrace 2 is still a young released project, some distributions still
provide packages for the Babeltrace 1 project. Both projects can coexist on the
same system as there are no common installed files.
(From OE-Core rev: be52889ba5e5a2cf02f50b3f3acee8ca72ec494d)
Signed-off-by: Anders Wallin <wallinux@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
version 2.x.x will be added with a new babeltrace2 recipe
(From OE-Core rev: 0616a5dbc61561fefcd1822ce263837437466df2)
Signed-off-by: Anders Wallin <wallinux@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream is aware, and will investigate and fix.
(From OE-Core rev: 96c286a1b2f9fc8e8bf4fb29ae62551a323af5c3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License-Update: formatting, dropped the gpl texts, as they're
not anymore in source tree, and the main file is specific enough.
(From OE-Core rev: 15ca6acb87299ffc770d35b075024f0ccaace61f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove 0001-Skip-when-testapp-is-not-present.patch as it is unclear
whether it needs to be rebased, and difficult to rebase.
Remove 0001-check-for-gettid-API-during-configure.patch as it
is no longer needed.
Ptests still seem to run ok, however they are rather slow,
so I did not wait for their completion.
(From OE-Core rev: 015aea5d93614676decd18578a8ae2d68417cfc5)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using devupstream class the SRCREV_FORMAT variable must be set.
(From OE-Core rev: 5d27db85d269f576929fd3c81f94e54d894cdf69)
Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These tmp paths end up in the test names making it hard to compare test runs
so filter them out, they're not useful for our purposes.
(From OE-Core rev: dc47b3855d03af962bab176c7aed9bd47426b419)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Upgrade from lttng-ust_2.10.3.bb to lttng-ust_2.10.4.bb.
-lttng-ust/0001-compat-work-around-broken-_SC_NPROCESSORS_CONF-on-MU.patch
Removed since this is included in 2.10.4
(From OE-Core rev: dc25e9525495e00940da7716cbba6bca96423acd)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The git based recipe is for those who want to build lttng-modules with bleeding
edge kernel, to avoid regularly backporting patches from upstream.
Note that PREFERRED_VERSION needs to be set to select the git recipe instead of
the tar ball one.
(From OE-Core rev: 18dd8e719f7c845d7e4bb1148ef6adad80a9493e)
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
They are now added automatically by the ptest class.
(From OE-Core rev: 25cf1820122bb2b15057aafe1c9e04a733f81bcf)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The lttng-tools project is essentially a "tracer" controller, the tests
depends heavily on lttng-ust and lttng-modules presence.
(From OE-Core rev: f50483cef0a65f3098018600276fba70195643da)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
