pool/lttng-modules
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1146908 from home:jones_tony:branches:devel:tools:lttng

Browse Source 
- Update to version 2.13.11 to allow package inclusion into SLE-Micro 6.0:
  Changes (2.13.11):
    Fix: Include linux/sched/rt.h for kernels v3.9 to v3.14
    Fix: Disable IBT around indirect function calls
    Inline implementation of task_prio()
    Fix: prio context NULL pointer exception
    Fix: MODULE_IMPORT_NS is introduced in kernel 5.4
    Android: Import VFS namespace for android common kernel
    Fix: get_file_rcu is missing in kernels < 4.1
    Fix: lookup_fd_rcu replaced by lookup_fdget_rcu in linux 6.7.0-rc1
    Fix: mm, vmscan signatures changed in linux 6.7.0-rc1
    Fix: phys_proc_id and cpu_core_id moved in linux 6.7.0-rc1
    Fix build for RHEL 8.8 with linux 4.18.0-477.10.1+
    Fix: bytecode validator: oops during validation of immediate string
    Fix: lttng-probe-kvm-x86-mmu build with linux 6.6
    Fix: built-in lttng with kernel >= v6.1
    Fix: ubuntu kinetic kernel range for jdb2
  Changes (2.13.10):
    Fix: sessiond: incorrect use of exclusions array leads to crash
    Tests fix: test_callstack: output of addr2line incorrectly parsed
    Fix: sessiond: silent kernel notifier registration error
    Fix: sessiond: size-based notification occasionally not triggered
    Fix: adding a user space probe fails on thumb functions
    Fix: Tests that assume CPU 0 is present
    Fix: Wrong assumption about possible CPUs
    Tests: fix: parse-callback reports missing addr2line
    Fix: lttng remove-trigger -h fails
    Tests: snapshot tests complain that nothing is output
    Tests: Test snapshot maximum size correctly
    Tests: Add get_possible_cpus_count utility
    Fix: ini parser: truncation of value name
    Fix: truncated len in lttng_event_rule_user_tracepoint_serialize()
    Tests: remove leftover debug printing in test_add_trigger_cli
- Drop patch lttng-modules-2.13.9-linux-6.3.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/1146908
OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-modules?expand=0&rev=71
This commit is contained in:
Tony Jones
2024-02-15 16:35:03 +00:00
committed by Git OBS Bridge
parent 28a223bf2a
commit d110a38a69
7 changed files with 57 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lttng-modules-2.13.11.tar.bz2 (Stored with Git LFS) Normal file
View File

Binary file not shown.

11
lttng-modules-2.13.11.tar.bz2.asc Normal file
View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmWe/8QACgkQFygKl4EY
as+PvQgAoMCVFa3yTd7QP7/cjnOlHfvRXC4LeFcZiqGOWwRHREJOFqM5TD7qgqLV
irUT1cH+/6SyJYOYQYZdr4EP4LEYQ7InLXLjz8Vf6Kqm+rcumcRzaKJtUnd2gJJ2
PUsDlsrLiGssP+BLFZavvUb5QQiYMMfDQFAc02RBnruhF5NxLCMmR2Rg2Bcfff+P
ezlGj9jcWldiERdEClRk6uwRbUaHgzt1Bm6C/0Iiel0aDrGud+8tpi47c1zzgcM5
za76AJzH35GFjU34Run85kxpUQzPPCtNIxX1yS3Yng+xeSgPWqZCMkxF77Z9axHo
aldRCyQnYp2Yz3BIU12E0Di3D2vuIg==
=6dIW
-----END PGP SIGNATURE-----

188
lttng-modules-2.13.9-linux-6.3.patch
View File

@@ -1,188 +0,0 @@
--- a/include/instrumentation/events/btrfs.h
+++ b/include/instrumentation/events/btrfs.h
@@ -13,6 +13,10 @@
#include <../fs/btrfs/accessors.h>
#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+#include <../fs/btrfs/extent-tree.h>
+#endif
+
#ifndef _TRACE_BTRFS_DEF_
#define _TRACE_BTRFS_DEF_
struct btrfs_root;
@@ -1963,7 +1967,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
+
+ btrfs_find_free_extent,
+
+ TP_PROTO(const struct btrfs_root *root,
+ const struct find_free_extent_ctl *ffe_ctl),
+
+ TP_ARGS(root, ffe_ctl),
+
+ TP_FIELDS(
+ ctf_array(u8, fsid, root->lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+ ctf_integer(u64, root_objectid, root->root_key.objectid)
+ ctf_integer(u64, num_bytes, ffe_ctl->num_bytes)
+ ctf_integer(u64, empty_size, ffe_ctl->empty_size)
+ ctf_integer(u64, flags, ffe_ctl->flags)
+ )
+)
+
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
LTTNG_KERNEL_RANGE(5,9,5, 5,10,0) || \
LTTNG_KERNEL_RANGE(5,4,78, 5,5,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(5,8,18,44, 5,9,0,0))
@@ -2102,7 +2125,40 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_ext
)
#endif
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,5,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
+
+ TP_PROTO(const struct btrfs_block_group *block_group,
+ const struct find_free_extent_ctl *ffe_ctl),
+
+ TP_ARGS(block_group, ffe_ctl),
+
+ TP_FIELDS(
+ ctf_array(u8, fsid, block_group->lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+ ctf_integer(u64, bg_objectid, block_group->start)
+ ctf_integer(u64, flags, block_group->flags)
+ ctf_integer(u64, start, ffe_ctl->search_start)
+ ctf_integer(u64, len, ffe_ctl->num_bytes)
+ )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent,
+
+ TP_PROTO(const struct btrfs_block_group *block_group,
+ const struct find_free_extent_ctl *ffe_ctl),
+
+ TP_ARGS(block_group, ffe_ctl)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
+
+ TP_PROTO(const struct btrfs_block_group *block_group,
+ const struct find_free_extent_ctl *ffe_ctl),
+
+ TP_ARGS(block_group, ffe_ctl)
+)
+
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
--- a/include/instrumentation/events/skb.h
+++ b/include/instrumentation/events/skb.h
@@ -61,6 +61,21 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
)
#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
+
+ skb_consume,
+
+ TP_PROTO(struct sk_buff *skb, void *location),
+
+ TP_ARGS(skb, location),
+
+ TP_FIELDS(
+ ctf_integer_hex(void *, skbaddr, skb)
+ ctf_integer_hex(void *, location, location)
+ )
+)
+#else
LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
skb_consume,
@@ -73,6 +88,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
ctf_integer_hex(void *, skbaddr, skb)
)
)
+#endif
LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -9,6 +9,7 @@
#define _LTTNG_EVENTS_INTERNAL_H
#include <wrapper/compiler_attributes.h>
+#include <wrapper/uuid.h>
#include <lttng/events.h>
@@ -289,7 +290,7 @@ struct lttng_metadata_cache {
atomic_t producing; /* Metadata being produced (incomplete) */
struct kref refcount; /* Metadata cache usage */
struct list_head metadata_stream; /* Metadata stream list */
- uuid_le uuid; /* Trace session unique ID (copy) */
+ guid_t uuid; /* Trace session unique ID (copy) */
struct mutex lock; /* Produce/consume lock */
uint64_t version; /* Current version of the metadata */
};
@@ -463,7 +464,7 @@ struct lttng_kernel_session_private {
struct list_head events; /* Event list head */
struct list_head list; /* Session list */
unsigned int free_chan_id; /* Next chan ID to allocate */
- uuid_le uuid; /* Trace session unique ID */
+ guid_t uuid; /* Trace session unique ID */
struct lttng_metadata_cache *metadata_cache;
unsigned int metadata_dumped:1,
tstate:1; /* Transient enable state */
--- a/include/wrapper/mm.h
+++ b/include/wrapper/mm.h
@@ -13,6 +13,22 @@
#include <lttng/kernel-version.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,3,0))
+static inline
+void wrapper_vm_flags_set(struct vm_area_struct *vma,
+ vm_flags_t flags)
+{
+ vm_flags_set(vma, flags);
+}
+#else
+static inline
+void wrapper_vm_flags_set(struct vm_area_struct *vma,
+ vm_flags_t flags)
+{
+ vma->vm_flags |= flags;
+}
+#endif
+
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0))
--- a/src/lib/ringbuffer/ring_buffer_mmap.c
+++ b/src/lib/ringbuffer/ring_buffer_mmap.c
@@ -17,6 +17,8 @@
#include <ringbuffer/frontend.h>
#include <ringbuffer/vfs.h>
+#include <wrapper/mm.h>
+
/*
* fault() vm_op implementation for ring buffer file mapping.
*/
@@ -113,7 +115,7 @@ static int lib_ring_buffer_mmap_buf(stru
return -EINVAL;
vma->vm_ops = &lib_ring_buffer_mmap_ops;
- vma->vm_flags |= VM_DONTEXPAND;
+ wrapper_vm_flags_set(vma, VM_DONTEXPAND);
vma->vm_private_data = buf;
return 0;

3
lttng-modules-2.13.9.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581
size 349690

11
lttng-modules-2.13.9.tar.bz2.asc
View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmQCSzsACgkQFygKl4EY
as8lbAf/fBfL+9qF1mQjFmQ9TFq0hFLIrkYggvHGmSph/iUzOeoWR2pOyhft2zIY
28F6QAyPzp8pSmGoa64pJ0vYC1w769HiWThHKzxLc5lW7I4HJF4RhvO70SJnGLiE
Z83Tg9m9KP/92ESfjgbE/gmeuNIDFsLJ0cjsPfw6pbvkP+/p88AnOLxXyXzULhqa
dnuD84LT5pPsWKwShmygki/wffOt89PobHE4ziUmiYinVyixz87paD7A5Hiac0cs
Y4SNeh6LoZhw8uzkdAJJzq6S/6nGVCWeFQj3HLZcHFdCfN8Q1PVcSrkqxTdUK0iW
VWppw/wqRe4enkeGCU9LcgpQ0kcNEw==
=idnh
-----END PGP SIGNATURE-----

41
lttng-modules.changes
View File

@@ -1,3 +1,44 @@
-------------------------------------------------------------------
Thu Feb 15 16:20:28 UTC 2024 - Tony Jones <tonyj@suse.com>
- Update to version 2.13.11 to allow package inclusion into SLE-Micro 6.0:
Changes (2.13.11):
Fix: Include linux/sched/rt.h for kernels v3.9 to v3.14
Fix: Disable IBT around indirect function calls
Inline implementation of task_prio()
Fix: prio context NULL pointer exception
Fix: MODULE_IMPORT_NS is introduced in kernel 5.4
Android: Import VFS namespace for android common kernel
Fix: get_file_rcu is missing in kernels < 4.1
Fix: lookup_fd_rcu replaced by lookup_fdget_rcu in linux 6.7.0-rc1
Fix: mm, vmscan signatures changed in linux 6.7.0-rc1
Fix: phys_proc_id and cpu_core_id moved in linux 6.7.0-rc1
Fix build for RHEL 8.8 with linux 4.18.0-477.10.1+
Fix: bytecode validator: oops during validation of immediate string
Fix: lttng-probe-kvm-x86-mmu build with linux 6.6
Fix: built-in lttng with kernel >= v6.1
Fix: ubuntu kinetic kernel range for jdb2
Changes (2.13.10):
Fix: sessiond: incorrect use of exclusions array leads to crash
Tests fix: test_callstack: output of addr2line incorrectly parsed
Fix: sessiond: silent kernel notifier registration error
Fix: sessiond: size-based notification occasionally not triggered
Fix: adding a user space probe fails on thumb functions
Fix: Tests that assume CPU 0 is present
Fix: Wrong assumption about possible CPUs
Tests: fix: parse-callback reports missing addr2line
Fix: lttng remove-trigger -h fails
Tests: snapshot tests complain that nothing is output
Tests: Test snapshot maximum size correctly
Tests: Add get_possible_cpus_count utility
Fix: ini parser: truncation of value name
Fix: truncated len in lttng_event_rule_user_tracepoint_serialize()
Tests: remove leftover debug printing in test_add_trigger_cli
- Drop patch lttng-modules-2.13.9-linux-6.3.patch (upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 26 19:23:13 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru> Fri May 26 19:23:13 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>

6
lttng-modules.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package lttng-modules # spec file for package lttng-modules
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: lttng-modules Name: lttng-modules
Version: 2.13.9 Version: 2.13.11
Release: 0 Release: 0
Summary: Licensing information for package lttng-modules Summary: Licensing information for package lttng-modules
License: GPL-2.0-only AND LGPL-2.1-only AND MIT License: GPL-2.0-only AND LGPL-2.1-only AND MIT
@@ -28,8 +28,6 @@ Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2
Source2: %{name}.keyring Source2: %{name}.keyring
Source3: %{name}-preamble Source3: %{name}-preamble
Source4: Module.supported Source4: Module.supported
# PATCH-FIX-UPSTREAM lttng-modules-2.13.9-linux-6.3.patch -- Linux 6.3 compatibility.
Patch0: lttng-modules-2.13.9-linux-6.3.patch
BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: %{kernel_module_package_buildreqs}
ExclusiveArch: %ix86 x86_64 armv7l aarch64 riscv64 ppc64 ppc64le ExclusiveArch: %ix86 x86_64 armv7l aarch64 riscv64 ppc64 ppc64le