Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2023-05-27 20:37:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Sat May 27 20:37:47 2023 rev:8 rq:1089257 version:2.13.9 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2023-01-14 00:04:34.958187915 +0100 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new.1533/lttng-modules.changes 2023-05-27 20:38:17.542891710 +0200 @@ -1,0 +2,15 @@ +Fri May 26 19:23:13 UTC 2023 - Alexei Sorokin <[email protected]> + +- 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. + +------------------------------------------------------------------- Old: ---- lttng-modules-2.13.8.tar.bz2 lttng-modules-2.13.8.tar.bz2.asc New: ---- lttng-modules-2.13.9-linux-6.3.patch lttng-modules-2.13.9.tar.bz2 lttng-modules-2.13.9.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.6ulbhz/_old 2023-05-27 20:38:17.914893933 +0200 +++ /var/tmp/diff_new_pack.6ulbhz/_new 2023-05-27 20:38:17.918893956 +0200 @@ -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 @@ 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 @@ %kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um %prep -%setup -q +%autosetup -p1 set -- * mkdir source obj ++++++ lttng-modules-2.13.9-linux-6.3.patch ++++++ --- 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; ++++++ lttng-modules-2.13.8.tar.bz2 -> lttng-modules-2.13.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.8/ChangeLog new/lttng-modules-2.13.9/ChangeLog --- old/lttng-modules-2.13.8/ChangeLog 2023-01-13 22:08:06.000000000 +0100 +++ new/lttng-modules-2.13.9/ChangeLog 2023-03-03 16:39:24.000000000 +0100 @@ -1,3 +1,9 @@ +2023-03-03 (Canadian Bacon Day) LTTng modules 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) + 2023-01-13 (National Sticker Day) LTTng modules 2.13.8 * fix: jbd2: use the correct print format * Fix: in_x32_syscall was introduced in v4.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.8/include/instrumentation/events/btrfs.h new/lttng-modules-2.13.9/include/instrumentation/events/btrfs.h --- old/lttng-modules-2.13.8/include/instrumentation/events/btrfs.h 2023-01-13 22:08:06.000000000 +0100 +++ new/lttng-modules-2.13.9/include/instrumentation/events/btrfs.h 2023-03-03 16:39:24.000000000 +0100 @@ -9,6 +9,10 @@ #include <linux/writeback.h> #include <lttng/kernel-version.h> +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0)) +#include <../fs/btrfs/accessors.h> +#endif + #ifndef _TRACE_BTRFS_DEF_ #define _TRACE_BTRFS_DEF_ struct btrfs_root; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.8/include/instrumentation/events/jbd2.h new/lttng-modules-2.13.9/include/instrumentation/events/jbd2.h --- old/lttng-modules-2.13.8/include/instrumentation/events/jbd2.h 2023-01-13 22:08:06.000000000 +0100 +++ new/lttng-modules-2.13.9/include/instrumentation/events/jbd2.h 2023-03-03 16:39:24.000000000 +0100 @@ -28,6 +28,8 @@ ) #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) @@ -96,6 +98,8 @@ #endif #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) @@ -138,6 +142,8 @@ ) #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.8/include/lttng/tracer.h new/lttng-modules-2.13.9/include/lttng/tracer.h --- old/lttng-modules-2.13.8/include/lttng/tracer.h 2023-01-13 22:08:06.000000000 +0100 +++ new/lttng-modules-2.13.9/include/lttng/tracer.h 2023-03-03 16:39:24.000000000 +0100 @@ -28,7 +28,7 @@ #define LTTNG_MODULES_MAJOR_VERSION 2 #define LTTNG_MODULES_MINOR_VERSION 13 -#define LTTNG_MODULES_PATCHLEVEL_VERSION 8 +#define LTTNG_MODULES_PATCHLEVEL_VERSION 9 #define LTTNG_MODULES_EXTRAVERSION "" #define LTTNG_VERSION_NAME "Nordicité"
