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

- Update to version 2.13.9.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-modules?expand=0&rev=69
This commit is contained in:
Alexei Sorokin 2023-05-27 01:36:50 +00:00 committed by Git OBS Bridge
parent 9c34c41825
commit 28a223bf2a
7 changed files with 221 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmPByUkACgkQFygKl4EY
as8Ntgf/dvBrgS72WpXWmassltC67qnSvqUTrHIAgs55RJMZ2sf4cveKtsPsjCTT
hyE7SCNFBeCxWPldU2D+rNTzksiIBQ72w4MPfdXfCjfs5IhgSBOnNxIls+EOw2e/
Izcji1qdekN68k06b0qkAI15Mdx4QVYLKEcoL4ri0Psh4iFkjUZTdrYDP0EFbY5A
metMeTuqfnxIES9LUA72s9rwUr4YDW0tzqyGye9WgyEsKw6gWb2ASQV3gvYrdx6q
GKnKveDV6DF6B2GmA/GIilBb83gAQBKHgtJTofsgGB93MFBjrU/d2IUTwMip6ffV
PXwMKvRLNz/yVCw2bqPVBntriMad7Q==
=Z12z
-----END PGP SIGNATURE-----

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

@ -0,0 +1,188 @@
--- 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 Normal file
View File

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

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

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

15
lttng-modules.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri May 26 19:23:13 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
- Update to version 2.13.9:
* Fix: jbd2: use the correct print format (v5.4.229).
* Fix: jbd2 upper bound for v5.10.163.
* Fix: jbd2: use the correct print format (v5.10.163).
* Fix: btrfs: move accessor helpers into accessors.h (v6.2).
- Add lttng-modules-2.13.9-linux-6.3.patch: back-port commits
23d91ab1f33370551feceddd93a1ecac7213e692,
f3559e5b06b24ad0336211950792fa97398c5e9a,
f39b4a3cbff6d286025bd692aaa24ae6f8efb40b,
6bc8ed7d08c616991451183eaffeeeb80ca0cd1a
for Linux 6.3 compatibility.
-------------------------------------------------------------------
Fri Jan 13 21:41:22 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>

6
lttng-modules.spec
View File

@ -17,7 +17,7 @@
Name: lttng-modules
Version: 2.13.8
Version: 2.13.9
Release: 0
Summary: Licensing information for package lttng-modules
License: GPL-2.0-only AND LGPL-2.1-only AND MIT
@ -28,6 +28,8 @@ Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2
Source2: %{name}.keyring
Source3: %{name}-preamble
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}
ExclusiveArch: %ix86 x86_64 armv7l aarch64 riscv64 ppc64 ppc64le
@ -37,7 +39,7 @@ This package provides licensing documentation for the lttng kmp packages.
%kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um
%prep
%setup -q
%autosetup -p1
set -- *
mkdir source obj