mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

lttng-modules: update to v2.14.0

Browse Source 
As part of this update:

  - drop one patch that is upstream now
  - refresh one patch for new context
  - backport two patches to fix the build against 6.16 (drop them in
    2.14.1+

  - update the license checksum, as the following change has been made
    to the license:

    commit 61baff6e8de2462f45006662bc34bcbf5f645ba0
    Author: Michael Jeanson <mjeanson@efficios.com>
    Date:   Tue Jun 18 14:35:38 2024 -0400

        Implement REUSE 3.0 with SPDX identifiers

        Implement the full REUSE spec [1] to help with copyright and licensing
        audits and compliance. This will reduce a lot of manual work for the
        licensing audit required in Debian on each update and also allow using
        automated tools.

        For files that lacked copyright and licensing information, I used the
        following guidelines. If a clear author could be determined from the git
        history use it, otherwise use 'EfficiOS Inc.'. For code use
        'GPL-2.0-only OR LGPL-2.1-only' unless otherwise stated, for
        documentation 'CC-BY-SA-4.0' and for data files 'CC0-1.0'.

        Freeform text files were converted to Markdown to allow licensing
        comments.

        Running the reuse tool on the repo is now succesful:

          $ reuse lint

          # SUMMARY

          * Bad licenses: 0
          * Deprecated licenses: 0
          * Licenses without file extension: 0
          * Missing licenses: 0
          * Unused licenses: 0
          * Used licenses: CC0-1.0, GPL-2.0-only, CC-BY-SA-4.0, MIT, LGPL-2.1-only
          * Read errors: 0
          * files with copyright information: 358 / 358
          * files with license information: 358 / 358

          Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)

        [1] https://reuse.software/tutorial/

        Change-Id: I1755cab24a6fcec7a6c9a2136891418203ec34b8
        Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
        Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

(From OE-Core rev: 114bc08add61adfa72470767f583eeafeb51331c)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2025-08-13 16:49:20 -04:00
committed by Richard Purdie
parent 80b3439164
commit ef6155e70f
5 changed files with 496 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch
View File

@@ -1,35 +0,0 @@
From 0e2095bcc50e7a07d3478f8d3c0ae5ad46575594 Mon Sep 17 00:00:00 2001
From: Mikko Rapeli <mikko.rapeli@linaro.org>
Date: Mon, 28 Apr 2025 12:07:24 +0000
Subject: [PATCH] lttng-modules: fix sigaction build without
CONFIG_COMPAT_OLD_SIGACTION
Workaround build failure when CONFIG_COMPAT_OLD_SIGACTION is not enabled
in kernel config.
Upstream-Status: Submitted [https://bugs.lttng.org/issues/1426]
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
.../instrumentation/syscalls/headers/arm-32-syscalls_pointers.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h b/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h
index 5f4ca5b..1514cae 100644
--- a/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h
+++ b/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h
@@ -1890,9 +1890,11 @@ TRACE_SYSCALL_TABLE(chroot, chroot, 61, 1)
#ifndef OVERRIDE_TABLE_32_ustat
TRACE_SYSCALL_TABLE(ustat, ustat, 62, 2)
#endif
+#ifdef CONFIG_COMPAT_OLD_SIGACTION
#ifndef OVERRIDE_TABLE_32_sigaction
TRACE_SYSCALL_TABLE(sigaction, sigaction, 67, 3)
#endif
+#endif /* CONFIG_COMPAT_OLD_SIGACTION */
#ifndef OVERRIDE_TABLE_32_sigpending
TRACE_SYSCALL_TABLE(sigpending, sigpending, 73, 1)
#endif
--
2.49.0

18
meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
View File

@@ -19,11 +19,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
src/Kbuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Kbuild b/src/Kbuild
index 7137874..04eb5c9 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -2,10 +2,13 @@
Index: lttng-modules-2.14.0/src/Kbuild
===================================================================
--- lttng-modules-2.14.0.orig/src/Kbuild
+++ lttng-modules-2.14.0/src/Kbuild
@@ -3,10 +3,13 @@
ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
ifeq ($(CONFIG_TRACEPOINTS),)
@@ -38,9 +38,9 @@ index 7137874..04eb5c9 100644
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-impl.o
obj-$(CONFIG_LTTNG) += probes/
obj-$(CONFIG_LTTNG) += lib/
obj-$(CONFIG_LTTNG) += tests/
@@ -168,3 +171,5 @@
obj-$(CONFIG_LTTNG_SYSCALLS_EXTRACTOR) += lttng-syscalls-extractor.o
# vim:syntax=make
+
+endif # DISABLE_MODULE

45
meta/recipes-kernel/lttng/lttng-modules/0001-writeback-instrumentation-Add-missing-provider-name-.patch Normal file
View File

@@ -0,0 +1,45 @@
From 039dbff4ba95eca58f8ebbcf1640a46b482c24e0 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 4 Jul 2025 11:34:45 -0400
Subject: [PATCH 1/2] writeback instrumentation: Add missing provider name
prefix
The events folio_wait_writeback and wait_on_page_writeback do not have
the writeback event name prefix mandated by the sanity check in
lttng_kernel_probe_register, which trigger a console warning.
Change those event names to provide the relevant provider name prefix.
Upstream-Status: Backport [commit 039dbff4]
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ia069e2dac4a373170e059792a947cffb6c956cb2
---
include/instrumentation/events/writeback.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h
index d694e323..b9e26b5b 100644
--- a/include/instrumentation/events/writeback.h
+++ b/include/instrumentation/events/writeback.h
@@ -122,7 +122,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_folio_template, writeback_dirty_folio,
TP_ARGS(folio, mapping)
)
-LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_folio_template, folio_wait_writeback,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_folio_template, writeback_folio_wait,
TP_PROTO(struct folio *folio, struct address_space *mapping),
@@ -150,7 +150,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_page_template, writeback_dirty_page,
TP_ARGS(page, mapping)
)
-LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_page_template, wait_on_page_writeback,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_page_template, writeback_wait_on_page,
TP_PROTO(struct page *page, struct address_space *mapping),
--
2.39.2

438
meta/recipes-kernel/lttng/lttng-modules/0002-fix-percpu-repurpose-__percpu-tag-as-a-named-address.patch Normal file
View File

@@ -0,0 +1,438 @@
From 243dbd5c83fd647144b4e6f4e6e01e9e59fe910f Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 29 Jul 2025 15:34:23 -0400
Subject: [PATCH 2/2] fix: percpu: repurpose __percpu tag as a named address
space qualifier (v6.15)
The '__percpu' annotation was repurposed as a named address space
qualifier, with compilers supporting 'typeof_unqual' like GCC 14 and
Clang 19 this is now enforced at build time.
See upstream commits:
commit 6cea5ae714ba47ea4807d15903baca9857a450e6
Author: Uros Bizjak <ubizjak@gmail.com>
Date: Mon Jan 27 17:05:09 2025 +0100
percpu: repurpose __percpu tag as a named address space qualifier
The patch introduces __percpu_qual define and repurposes __percpu tag as a
named address space qualifier using the new define.
Arches can now conditionally define __percpu_qual as their named address
space qualifier for percpu variables.
commit 6a367577153acd9b432a5340fb10891eeb7e10f1
Author: Uros Bizjak <ubizjak@gmail.com>
Date: Mon Jan 27 17:05:10 2025 +0100
percpu/x86: enable strict percpu checks via named AS qualifiers
This patch declares percpu variables in __seg_gs/__seg_fs named AS and
keeps them named AS qualified until they are dereferenced with percpu
accessor. This approach enables various compiler check for
cross-namespace variable assignments.
Upstream-Status: Backport [commit 243dbd5c]
Change-Id: Ib212cb4ef077da994867f0541921529dd4a799a0
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
include/ringbuffer/backend_types.h | 5 ++-
include/ringbuffer/frontend_api.h | 4 +-
src/lib/ringbuffer/ring_buffer_backend.c | 30 +++++++-------
src/lib/ringbuffer/ring_buffer_frontend.c | 40 +++++++++----------
src/lib/ringbuffer/ring_buffer_iterator.c | 8 ++--
src/lttng-context-callstack.c | 2 +-
src/lttng-ring-buffer-event-notifier-client.h | 2 +-
src/lttng-ring-buffer-metadata-client.h | 2 +-
8 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/include/ringbuffer/backend_types.h b/include/ringbuffer/backend_types.h
index c23889ea..caafe4da 100644
--- a/include/ringbuffer/backend_types.h
+++ b/include/ringbuffer/backend_types.h
@@ -79,7 +79,10 @@ struct channel_backend {
*/
unsigned int buf_size_order; /* Order of buffer size */
unsigned int extra_reader_sb:1; /* has extra reader subbuffer ? */
- struct lttng_kernel_ring_buffer *buf; /* Channel per-cpu buffers */
+ union {
+ struct lttng_kernel_ring_buffer *global_buf; /* Channel global buffer */
+ struct lttng_kernel_ring_buffer __percpu *percpu_buf; /* Channel per-cpu buffers */
+ };
unsigned long num_subbuf; /* Number of sub-buffers for writer */
u64 start_timestamp; /* Channel creation timestamp value */
diff --git a/include/ringbuffer/frontend_api.h b/include/ringbuffer/frontend_api.h
index e8d77d95..a0319c98 100644
--- a/include/ringbuffer/frontend_api.h
+++ b/include/ringbuffer/frontend_api.h
@@ -153,9 +153,9 @@ int lib_ring_buffer_reserve(const struct lttng_kernel_ring_buffer_config *config
return -EAGAIN;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
- buf = per_cpu_ptr(chan->backend.buf, ctx->priv.reserve_cpu);
+ buf = per_cpu_ptr(chan->backend.percpu_buf, ctx->priv.reserve_cpu);
else
- buf = chan->backend.buf;
+ buf = chan->backend.global_buf;
if (unlikely(atomic_read(&buf->record_disabled)))
return -EAGAIN;
ctx->priv.buf = buf;
diff --git a/src/lib/ringbuffer/ring_buffer_backend.c b/src/lib/ringbuffer/ring_buffer_backend.c
index 3eaa1b96..b5ecde4d 100644
--- a/src/lib/ringbuffer/ring_buffer_backend.c
+++ b/src/lib/ringbuffer/ring_buffer_backend.c
@@ -279,7 +279,7 @@ int lttng_cpuhp_rb_backend_prepare(unsigned int cpu,
CHAN_WARN_ON(chanb, config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL);
- buf = per_cpu_ptr(chanb->buf, cpu);
+ buf = per_cpu_ptr(chanb->percpu_buf, cpu);
ret = lib_ring_buffer_create(buf, chanb, cpu);
if (ret) {
printk(KERN_ERR
@@ -320,7 +320,7 @@ int lib_ring_buffer_cpu_hp_callback(struct notifier_block *nb,
switch (action) {
case CPU_UP_PREPARE:
case CPU_UP_PREPARE_FROZEN:
- buf = per_cpu_ptr(chanb->buf, cpu);
+ buf = per_cpu_ptr(chanb->percpu_buf, cpu);
ret = lib_ring_buffer_create(buf, chanb, cpu);
if (ret) {
printk(KERN_ERR
@@ -415,8 +415,8 @@ int channel_backend_init(struct channel_backend *chanb,
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
/* Allocating the buffer per-cpu structures */
- chanb->buf = alloc_percpu(struct lttng_kernel_ring_buffer);
- if (!chanb->buf)
+ chanb->percpu_buf = alloc_percpu(struct lttng_kernel_ring_buffer);
+ if (!chanb->percpu_buf)
goto free_cpumask;
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
@@ -447,7 +447,7 @@ int channel_backend_init(struct channel_backend *chanb,
lttng_cpus_read_lock();
for_each_online_cpu(i) {
- ret = lib_ring_buffer_create(per_cpu_ptr(chanb->buf, i),
+ ret = lib_ring_buffer_create(per_cpu_ptr(chanb->percpu_buf, i),
chanb, i);
if (ret)
goto free_bufs; /* cpu hotplug locked */
@@ -455,7 +455,7 @@ int channel_backend_init(struct channel_backend *chanb,
lttng_cpus_read_unlock();
#else
for_each_possible_cpu(i) {
- ret = lib_ring_buffer_create(per_cpu_ptr(chanb->buf, i),
+ ret = lib_ring_buffer_create(per_cpu_ptr(chanb->percpu_buf, i),
chanb, i);
if (ret)
goto free_bufs;
@@ -464,10 +464,10 @@ int channel_backend_init(struct channel_backend *chanb,
}
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
} else {
- chanb->buf = kzalloc(sizeof(struct lttng_kernel_ring_buffer), GFP_KERNEL);
- if (!chanb->buf)
+ chanb->global_buf = kzalloc(sizeof(struct lttng_kernel_ring_buffer), GFP_KERNEL);
+ if (!chanb->global_buf)
goto free_cpumask;
- ret = lib_ring_buffer_create(chanb->buf, chanb, -1);
+ ret = lib_ring_buffer_create(chanb->global_buf, chanb, -1);
if (ret)
goto free_bufs;
}
@@ -491,15 +491,15 @@ free_bufs:
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
for_each_possible_cpu(i) {
struct lttng_kernel_ring_buffer *buf =
- per_cpu_ptr(chanb->buf, i);
+ per_cpu_ptr(chanb->percpu_buf, i);
if (!buf->backend.allocated)
continue;
lib_ring_buffer_free(buf);
}
- free_percpu(chanb->buf);
+ free_percpu(chanb->percpu_buf);
} else
- kfree(chanb->buf);
+ kfree(chanb->global_buf);
free_cpumask:
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
free_cpumask_var(chanb->cpumask);
@@ -542,16 +542,16 @@ void channel_backend_free(struct channel_backend *chanb)
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
for_each_possible_cpu(i) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chanb->buf, i);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chanb->percpu_buf, i);
if (!buf->backend.allocated)
continue;
lib_ring_buffer_free(buf);
}
free_cpumask_var(chanb->cpumask);
- free_percpu(chanb->buf);
+ free_percpu(chanb->percpu_buf);
} else {
- struct lttng_kernel_ring_buffer *buf = chanb->buf;
+ struct lttng_kernel_ring_buffer *buf = chanb->global_buf;
CHAN_WARN_ON(chanb, !buf->backend.allocated);
lib_ring_buffer_free(buf);
diff --git a/src/lib/ringbuffer/ring_buffer_frontend.c b/src/lib/ringbuffer/ring_buffer_frontend.c
index 1ed9dc47..f9def043 100644
--- a/src/lib/ringbuffer/ring_buffer_frontend.c
+++ b/src/lib/ringbuffer/ring_buffer_frontend.c
@@ -505,7 +505,7 @@ int lttng_cpuhp_rb_frontend_dead(unsigned int cpu,
{
struct lttng_kernel_ring_buffer_channel *chan = container_of(node, struct lttng_kernel_ring_buffer_channel,
cpuhp_prepare);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
CHAN_WARN_ON(chan, config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL);
@@ -526,7 +526,7 @@ int lttng_cpuhp_rb_frontend_online(unsigned int cpu,
{
struct lttng_kernel_ring_buffer_channel *chan = container_of(node, struct lttng_kernel_ring_buffer_channel,
cpuhp_online);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
CHAN_WARN_ON(chan, config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL);
@@ -543,7 +543,7 @@ int lttng_cpuhp_rb_frontend_offline(unsigned int cpu,
{
struct lttng_kernel_ring_buffer_channel *chan = container_of(node, struct lttng_kernel_ring_buffer_channel,
cpuhp_online);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
CHAN_WARN_ON(chan, config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL);
@@ -574,7 +574,7 @@ int lib_ring_buffer_cpu_hp_callback(struct notifier_block *nb,
unsigned int cpu = (unsigned long)hcpu;
struct lttng_kernel_ring_buffer_channel *chan = container_of(nb, struct lttng_kernel_ring_buffer_channel,
cpu_hp_notifier);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
if (!chan->cpu_hp_enable)
@@ -741,7 +741,7 @@ static void channel_unregister_notifiers(struct lttng_kernel_ring_buffer_channel
lttng_cpus_read_lock();
chan->cpu_hp_enable = 0;
for_each_online_cpu(cpu) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
lib_ring_buffer_stop_switch_timer(buf);
lib_ring_buffer_stop_read_timer(buf);
@@ -750,7 +750,7 @@ static void channel_unregister_notifiers(struct lttng_kernel_ring_buffer_channel
unregister_cpu_notifier(&chan->cpu_hp_notifier);
#else
for_each_possible_cpu(cpu) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
lib_ring_buffer_stop_switch_timer(buf);
lib_ring_buffer_stop_read_timer(buf);
@@ -759,7 +759,7 @@ static void channel_unregister_notifiers(struct lttng_kernel_ring_buffer_channel
}
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
} else {
- struct lttng_kernel_ring_buffer *buf = chan->backend.buf;
+ struct lttng_kernel_ring_buffer *buf = chan->backend.global_buf;
lib_ring_buffer_stop_switch_timer(buf);
lib_ring_buffer_stop_read_timer(buf);
@@ -788,14 +788,14 @@ void lib_ring_buffer_set_quiescent_channel(struct lttng_kernel_ring_buffer_chann
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
lttng_cpus_read_lock();
for_each_channel_cpu(cpu, chan) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
lib_ring_buffer_set_quiescent(buf);
}
lttng_cpus_read_unlock();
} else {
- struct lttng_kernel_ring_buffer *buf = chan->backend.buf;
+ struct lttng_kernel_ring_buffer *buf = chan->backend.global_buf;
lib_ring_buffer_set_quiescent(buf);
}
@@ -810,14 +810,14 @@ void lib_ring_buffer_clear_quiescent_channel(struct lttng_kernel_ring_buffer_cha
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
lttng_cpus_read_lock();
for_each_channel_cpu(cpu, chan) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
lib_ring_buffer_clear_quiescent(buf);
}
lttng_cpus_read_unlock();
} else {
- struct lttng_kernel_ring_buffer *buf = chan->backend.buf;
+ struct lttng_kernel_ring_buffer *buf = chan->backend.global_buf;
lib_ring_buffer_clear_quiescent(buf);
}
@@ -915,7 +915,7 @@ struct lttng_kernel_ring_buffer_channel *channel_create(const struct lttng_kerne
lttng_cpus_read_lock();
for_each_online_cpu(cpu) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
spin_lock(&per_cpu(ring_buffer_nohz_lock, cpu));
lib_ring_buffer_start_switch_timer(buf);
@@ -926,7 +926,7 @@ struct lttng_kernel_ring_buffer_channel *channel_create(const struct lttng_kerne
lttng_cpus_read_unlock();
#else
for_each_possible_cpu(cpu) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
spin_lock(&per_cpu(ring_buffer_nohz_lock, cpu));
lib_ring_buffer_start_switch_timer(buf);
@@ -947,7 +947,7 @@ struct lttng_kernel_ring_buffer_channel *channel_create(const struct lttng_kerne
#endif /* defined(CONFIG_NO_HZ) && defined(CONFIG_LIB_RING_BUFFER) */
} else {
- struct lttng_kernel_ring_buffer *buf = chan->backend.buf;
+ struct lttng_kernel_ring_buffer *buf = chan->backend.global_buf;
lib_ring_buffer_start_switch_timer(buf);
lib_ring_buffer_start_read_timer(buf);
@@ -1004,7 +1004,7 @@ void *channel_destroy(struct lttng_kernel_ring_buffer_channel *chan)
* unregistered.
*/
for_each_channel_cpu(cpu, chan) {
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf,
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf,
cpu);
if (config->cb.buffer_finalize)
@@ -1019,7 +1019,7 @@ void *channel_destroy(struct lttng_kernel_ring_buffer_channel *chan)
wake_up_interruptible(&buf->read_wait);
}
} else {
- struct lttng_kernel_ring_buffer *buf = chan->backend.buf;
+ struct lttng_kernel_ring_buffer *buf = chan->backend.global_buf;
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf, chan->backend.priv, -1);
@@ -1044,9 +1044,9 @@ struct lttng_kernel_ring_buffer *channel_get_ring_buffer(
struct lttng_kernel_ring_buffer_channel *chan, int cpu)
{
if (config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL)
- return chan->backend.buf;
+ return chan->backend.global_buf;
else
- return per_cpu_ptr(chan->backend.buf, cpu);
+ return per_cpu_ptr(chan->backend.percpu_buf, cpu);
}
EXPORT_SYMBOL_GPL(channel_get_ring_buffer);
@@ -2271,9 +2271,9 @@ static struct lttng_kernel_ring_buffer *get_current_buf(struct lttng_kernel_ring
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
- return per_cpu_ptr(chan->backend.buf, cpu);
+ return per_cpu_ptr(chan->backend.percpu_buf, cpu);
else
- return chan->backend.buf;
+ return chan->backend.global_buf;
}
void lib_ring_buffer_lost_event_too_big(struct lttng_kernel_ring_buffer_channel *chan)
diff --git a/src/lib/ringbuffer/ring_buffer_iterator.c b/src/lib/ringbuffer/ring_buffer_iterator.c
index 88d79412..1a1db5e2 100644
--- a/src/lib/ringbuffer/ring_buffer_iterator.c
+++ b/src/lib/ringbuffer/ring_buffer_iterator.c
@@ -361,7 +361,7 @@ int lttng_cpuhp_rb_iter_online(unsigned int cpu,
{
struct lttng_kernel_ring_buffer_channel *chan = container_of(node, struct lttng_kernel_ring_buffer_channel,
cpuhp_iter_online);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
CHAN_WARN_ON(chan, config->alloc == RING_BUFFER_ALLOC_PER_CHANNEL);
@@ -382,7 +382,7 @@ int channel_iterator_cpu_hotplug(struct notifier_block *nb,
unsigned int cpu = (unsigned long)hcpu;
struct lttng_kernel_ring_buffer_channel *chan = container_of(nb, struct lttng_kernel_ring_buffer_channel,
hp_iter_notifier);
- struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.buf, cpu);
+ struct lttng_kernel_ring_buffer *buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
if (!chan->hp_iter_enable)
@@ -443,14 +443,14 @@ int channel_iterator_init(struct lttng_kernel_ring_buffer_channel *chan)
lttng_cpus_read_lock();
for_each_online_cpu(cpu) {
- buf = per_cpu_ptr(chan->backend.buf, cpu);
+ buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
lib_ring_buffer_iterator_init(chan, buf);
}
chan->hp_iter_enable = 1;
lttng_cpus_read_unlock();
#else
for_each_possible_cpu(cpu) {
- buf = per_cpu_ptr(chan->backend.buf, cpu);
+ buf = per_cpu_ptr(chan->backend.percpu_buf, cpu);
lib_ring_buffer_iterator_init(chan, buf);
}
#endif
diff --git a/src/lttng-context-callstack.c b/src/lttng-context-callstack.c
index 4385472e..c5910718 100644
--- a/src/lttng-context-callstack.c
+++ b/src/lttng-context-callstack.c
@@ -69,7 +69,7 @@ void field_data_free(struct field_data *fdata)
}
static
-struct field_data __percpu *field_data_create(enum lttng_cs_ctx_modes mode)
+struct field_data *field_data_create(enum lttng_cs_ctx_modes mode)
{
struct lttng_cs __percpu *cs_set;
struct field_data *fdata;
diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h
index 95deab46..b4145914 100644
--- a/src/lttng-ring-buffer-event-notifier-client.h
+++ b/src/lttng-ring-buffer-event-notifier-client.h
@@ -363,7 +363,7 @@ size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
unsigned long o_begin;
struct lttng_kernel_ring_buffer *buf;
- buf = chan->backend.buf; /* Only for global buffer ! */
+ buf = chan->backend.global_buf; /* Only for global buffer ! */
o_begin = v_read(&client_config, &buf->offset);
if (subbuf_offset(o_begin, chan) != 0) {
return chan->backend.subbuf_size - subbuf_offset(o_begin, chan);
diff --git a/src/lttng-ring-buffer-metadata-client.h b/src/lttng-ring-buffer-metadata-client.h
index 99158451..9ef73266 100644
--- a/src/lttng-ring-buffer-metadata-client.h
+++ b/src/lttng-ring-buffer-metadata-client.h
@@ -368,7 +368,7 @@ size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
unsigned long o_begin;
struct lttng_kernel_ring_buffer *buf;
- buf = chan->backend.buf; /* Only for global buffer ! */
+ buf = chan->backend.global_buf; /* Only for global buffer ! */
o_begin = v_read(&client_config, &buf->offset);
if (subbuf_offset(o_begin, chan) != 0) {
return chan->backend.subbuf_size - subbuf_offset(o_begin, chan);
--
2.39.2

8
meta/recipes-kernel/lttng/lttng-modules_2.13.19.bb → meta/recipes-kernel/lttng/lttng-modules_2.14.0.bb
View File

@@ -3,21 +3,21 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
HOMEPAGE = "https://lttng.org/"
LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8d0d9f08888046474772a5d745d89d6a"
LIC_FILES_CHKSUM = "file://LICENSE;md5=018e002dbdda3306682e394ddd65fa32"
inherit module
include lttng-platforms.inc
SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch \
file://0001-writeback-instrumentation-Add-missing-provider-name-.patch \
file://0002-fix-percpu-repurpose-__percpu-tag-as-a-named-address.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] = "06d704633749039f8fa72a954bec6486058386e2a0c3557b22c484698f9b34d5"
SRC_URI[sha256sum] = "f2261e738b1dd1027640e5ba3040dee292241b847d5745766b3ba640e168c94a"
export INSTALL_MOD_DIR = "kernel/lttng-modules"