Cleanup: update stale file paths in LICENSE stable-2.13
authorMichael Jeanson <mjeanson@efficios.com>
Mon, 21 Nov 2022 22:26:59 +0000 (17:26 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 18 Jun 2024 18:39:32 +0000 (14:39 -0400)
Change-Id: I4849b19daa235b93a6435e57bd764128e43d691e
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
ChangeLog
LICENSE
include/instrumentation/events/btrfs.h
include/instrumentation/events/mm_vmscan.h
include/instrumentation/events/udp.h
include/lttng/tracer.h
include/lttng/utils.h
include/wrapper/fdtable.h
src/lttng-ring-buffer-event-notifier-client.c
src/lttng-ring-buffer-event-notifier-client.h
src/lttng-statedump-impl.c

index 4ceeba83428a2b3123e00f0c5cbfda592327ab61..6f457dc7215e0f8d46d8eedd09fd471fe1fb3004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2024-05-13 (National Leprechaun Day) LTTng modules 2.13.13
+       * splice wrapper: Fix missing declaration
+       * page alloc wrapper: Fix get_pfnblock_flags_mask prototype
+       * lttng probe: include events-internal.h
+       * syscalls: Remove unused duplicated code
+       * statedump: Add missing events-internal.h include
+       * lttng-events: Add missing static
+       * event notifier: Add missing static
+       * context callstack: Add missing static
+       * lttng-clock: Add missing lttng/events-internal.h include
+       * lttng-calibrate: Add missing static and include
+       * lttng-bytecode: Remove dead code
+       * lttng-abi: Add missing static to function definitions
+       * ring buffer: Add missing static to function definitions
+       * blkdev wrapper: Fix constness warning
+       * Fix: timer_expire_entry changed in 4.19.312
+       * Fix: dev_base_lock removed in linux 6.9-rc1
+       * Fix: mm_compaction_migratepages changed in linux 6.9-rc1
+       * Fix: ASoC add component to set_bias_level events in linux 6.9-rc1
+       * Fix: ASoC snd_doc_dapm on linux 6.9-rc1
+       * Fix: build kvm probe on EL 8.4+
+       * Fix: support ext4_journal_start on EL 8.4+
+       * Fix: correct RHEL range for kmem_cache_free define
+
 2024-03-21 (National Common Courtesy Day) LTTng modules 2.13.12
        * docs: Add supported versions and fix-backport policy
        * docs: Add links to project resources
diff --git a/LICENSE b/LICENSE
index 04013e663acf021b86ae6a5b691f35286bea716e..59a5edb21bf0f1be8b4f8ae8eed222256c439699 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -13,10 +13,10 @@ details), except for files identified by the following sections.
 These files are licensed exclusively under the GPL-2.0 license. See
 LICENSES/GPL-2.0 for details.
 
-lib/ringbuffer/ring_buffer_splice.c
-lib/ringbuffer/ring_buffer_mmap.c
-instrumentation/events/lttng-module/*.h
-wrapper/list.h
+src/lib/ringbuffer/ring_buffer_splice.c
+src/lib/ringbuffer/ring_buffer_mmap.c
+include/instrumentation/events/*.h
+include/wrapper/list.h
 
 * MIT-style license
 
@@ -25,10 +25,10 @@ for details.
 
 include/lttng/prio_heap.h
 include/lttng/bitfield.h
-include/lttng/filter-bytecode.h
-include/filter.h
-lib/prio_heap/lttng_prio_heap.c
-lttng-filter-interpreter.c
-lttng-filter-specialize.c
-lttng-filter-validator.c
-lttng-filter.c
+include/lttng/bytecode.h
+include/lttng/lttng-bytecode.h
+src/lib/prio_heap/lttng_prio_heap.c
+src/lttng-bytecode-interpreter.c
+src/lttng-bytecode-specialize.c
+src/lttng-bytecode-validator.c
+src/lttng-bytecode.c
index ffb1b646e1a23aa5a19caef904f2dc36c7cea82a..c0c746e2ee42d8489a92ac8c9a65cc51d9c07e15 100644 (file)
@@ -899,7 +899,51 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref),
+
+       TP_FIELDS(
+               ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+               ctf_integer(u64, bytenr, ref->bytenr)
+               ctf_integer(u64, num_bytes, ref->num_bytes)
+               ctf_integer(int, action, ref->action)
+               ctf_integer(u64, parent, ref->parent)
+               ctf_integer(u64, ref_root, ref->ref_root)
+               ctf_integer(int, level, ref->tree_ref.level)
+               ctf_integer(int, type, ref->type)
+               ctf_integer(u64, seq, ref->seq)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
+
+       add_delayed_tree_ref,
+
+       btrfs_add_delayed_tree_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
+
+       run_delayed_tree_ref,
+
+       btrfs_run_delayed_tree_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref)
+)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@ -1139,7 +1183,53 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref),
+
+       TP_FIELDS(
+               ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+               ctf_integer(u64, bytenr, ref->bytenr)
+               ctf_integer(u64, num_bytes, ref->num_bytes)
+               ctf_integer(int, action, ref->action)
+               ctf_integer(u64, parent, ref->parent)
+               ctf_integer(u64, ref_root, ref->ref_root)
+               ctf_integer(u64, owner, ref->data_ref.objectid)
+               ctf_integer(u64, offset, ref->data_ref.offset)
+               ctf_integer(int, type, ref->type)
+               ctf_integer(u64, seq, ref->seq)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
+
+       add_delayed_data_ref,
+
+       btrfs_add_delayed_data_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
+
+       run_delayed_data_ref,
+
+       btrfs_run_delayed_data_ref,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info,
+                const struct btrfs_delayed_ref_node *ref),
+
+       TP_ARGS(fs_info, ref)
+)
+
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
index ea6f4b78263ba517cf2d1ff9ee8c3354ecc620c3..f8ef31ec91f8a128666388fea6135e9a1fea9941 100644 (file)
@@ -369,7 +369,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) || \
+     LTTNG_RHEL_KERNEL_RANGE(5,14,0,427,16,1, 5,15,0,0,0,0))
+
 LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
 
        TP_PROTO(int classzone_idx,
index b63a1bb5dcb3a0f0f4d25415e0a6ccc5f96af50a..0a94b46631292cbd7b3ba91d0a33fa9b0c47e516 100644 (file)
@@ -7,7 +7,36 @@
 
 #include <lttng/tracepoint-event.h>
 #include <linux/udp.h>
+#include <lttng/kernel-version.h>
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+LTTNG_TRACEPOINT_ENUM(lttng_sk_family,
+       TP_ENUM_VALUES(
+               ctf_enum_value("AF_INET", AF_INET)
+               ctf_enum_value("AF_INET6", AF_INET6)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
+
+       TP_PROTO(int rc, struct sock *sk, struct sk_buff *skb),
+
+       TP_ARGS(rc, sk, skb),
+
+       TP_FIELDS(
+               ctf_integer(int, rc, rc)
+               ctf_integer(__u16, sport, ntohs(udp_hdr(skb)->source))
+               ctf_integer(__u16, dport, ntohs(udp_hdr(skb)->dest))
+               ctf_enum(lttng_sk_family, __u16, family, sk->sk_family)
+               /*
+                * The 'saddr' and 'daddr' fields from the upstream tracepoint
+                * are currently not extracted. It is recommended to use a
+                * tracepoint from the 'net' probe instead which includes all
+                * fields from the IP header.
+                */
+       )
+)
+#else
 LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
 
        TP_PROTO(int rc, struct sock *sk),
@@ -19,6 +48,7 @@ LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
                ctf_integer(__u16, lport, inet_sk(sk)->inet_num)
        )
 )
+#endif
 
 #endif /* LTTNG_TRACE_UDP_H */
 
index 54577c4d3985813cd67d3aa62941682153cdd67f..fdb68c27f8bd66c143c2b8816af5d499f76d4517 100644 (file)
@@ -28,7 +28,7 @@
 
 #define LTTNG_MODULES_MAJOR_VERSION 2
 #define LTTNG_MODULES_MINOR_VERSION 13
-#define LTTNG_MODULES_PATCHLEVEL_VERSION 12
+#define LTTNG_MODULES_PATCHLEVEL_VERSION 13
 #define LTTNG_MODULES_EXTRAVERSION ""
 
 #define LTTNG_VERSION_NAME             "Nordicité"
index c01b6488eb0b3ef964dfbcf812732e80c9e089ae..b93ad7b5f8520f61d6b04d5123a3ae304e0a48db 100644 (file)
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) */
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */
 #ifndef _LTTNG_UTILS_H
 #define _LTTNG_UTILS_H
 
index 8b32c030cbb5b36eb42262a7b4228242756237be..5e89d66f497e45cbe49c5085a67fbaae70f7b2f9 100644 (file)
@@ -69,18 +69,27 @@ int lttng_iterate_fd(struct files_struct *files,
 
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
+static inline
+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
+{
+       return close_on_exec(fd, files);
+}
 
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
+
+static inline
+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
 {
-       return close_on_exec(fd, fdt);
+       return close_on_exec(fd, files_fdtable(files));
 }
 
 #else
 
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+static inline
+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
 {
-       return FD_ISSET(fd, fdt->close_on_exec);
+       return FD_ISSET(fd, files_fdtable(files)->close_on_exec);
 }
 
 #endif
index c8dcc1d2606ca2fd38d35b43f3bc46d240357578..6963d56282690196c901e8508a383be25e913fff 100644 (file)
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * lttng-ring-buffer-event-notifier-client.c
  *
index 8526e05e413fcb1e2b58a75682013ff242b8f1cb..5a881e663c7bad3de947cd838482f36f45a3cd68 100644 (file)
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * lttng-ring-buffer-event-notifier-client.h
  *
index 6ca1bf2e25c932ee8c8d776023a796dd2082fe86..9d197ce9f9ae55e90c2a353e234ef6de5220a81d 100644 (file)
@@ -442,17 +442,22 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
         */
        flags &= ~FMODE_NONOTIFY;
        fdt = files_fdtable(ctx->files);
+
        /*
-        * We need to check here again whether fd is within the fdt
-        * max_fds range, because we might be seeing a different
-        * files_fdtable() than iterate_fd(), assuming only RCU is
-        * protecting the read. In reality, iterate_fd() holds
-        * file_lock, which should ensure the fdt does not change while
-        * the lock is taken, but we are not aware whether this is
-        * guaranteed or not, so play safe.
+        * The fdt should only grow and iterate_fd() holds file_lock, which
+        * should ensure the fdt does not change while the lock is taken but be
+        * cautious and check anyway.
         */
-       if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
+       if (WARN_ON_ONCE(fd >= fdt->max_fds))
+               return 0;
+
+       if (lttng_close_on_exec(fd, ctx->files))
                flags |= O_CLOEXEC;
+
+       /*
+        * If d_path() failed to get a full path for the file, use the dentry
+        * name instead to at least get a filename.
+        */
        if (IS_ERR(s)) {
                struct dentry *dentry = file->f_path.dentry;
 
This page took 0.03371 seconds and 4 git commands to generate.