Hello community,
here is the log from the commit of package lttng-modules for openSUSE:Factory
checked in at 2019-04-22 12:27:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old)
and /work/SRC/openSUSE:Factory/.lttng-modules.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules"
Mon Apr 22 12:27:01 2019 rev:10 rq:696506 version:2.10.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes
2019-01-26 22:22:26.890854094 +0100
+++ /work/SRC/openSUSE:Factory/.lttng-modules.new.5536/lttng-modules.changes
2019-04-22 12:27:03.500946202 +0200
@@ -1,0 +2,22 @@
+Sun Apr 21 19:49:13 UTC 2019 - Markus Beth <markus.b...@web.de>
+
+- Update to version 2.10.9:
+ * Blacklist: kprobe for arm
+ * Cleanup: tp mempool: Remove logically dead code.
+ * Fix: btrfs: Remove fsid/metadata_fsid fields from btrfs_info.
+ * Fix: SUNRPC: Simplify defining common RPC trace events (v5.0).
+ * Fix: Replace pointer values with task->tk_pid and
+ rpc_clnt->cl_clid.
+ * Fix: Remove 'type' argument from access_ok() function (v5.0).
+ * Fix: Timer instrumentation for RHEL 7.6.
+ * Fix: ext4: Adjust reserved cluster count when removing extents
+ (v4.20).
+ * Fix: signal: Remove SEND_SIG_FORCED (v4.20).
+ * Fix: signal: Distinguish between kernel_siginfo and siginfo
+ (v4.20).
+- Remove
+ lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch:
+ fixed upstream.
+- Rebase lttng-modules-fix-leap-15.0.patch.
+
+-------------------------------------------------------------------
Old:
----
lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch
lttng-modules-2.10.8.tar.bz2
lttng-modules-2.10.8.tar.bz2.asc
New:
----
lttng-modules-2.10.9.tar.bz2
lttng-modules-2.10.9.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lttng-modules.spec ++++++
--- /var/tmp/diff_new_pack.Nuy7dd/_old 2019-04-22 12:27:04.048945988 +0200
+++ /var/tmp/diff_new_pack.Nuy7dd/_new 2019-04-22 12:27:04.048945988 +0200
@@ -22,7 +22,7 @@
%endif
%endif
Name: lttng-modules
-Version: 2.10.8
+Version: 2.10.9
Release: 0
Summary: Licensing information for package lttng-modules
License: GPL-2.0-only AND LGPL-2.1-only AND MIT
@@ -35,8 +35,6 @@
Source4: Module.supported
# PATCH-FIX-OPENSUSE lttng-modules-fix-leap-15.0.patch -- Fix building on
openSUSE Leap 15.0.
Patch0: lttng-modules-fix-leap-15.0.patch
-# PATCH-FIX-UPSTREAM
lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch -- Update
instrumentation on Linux 4.20 (commits 6c484ba2, cef5d79e, 307021a1).
-Patch1:
lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch
BuildRequires: kernel-devel
BuildRequires: kernel-source
BuildRequires: kernel-syms
@@ -62,7 +60,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
set -- *
mkdir source
++++++ lttng-modules-2.10.8.tar.bz2 -> lttng-modules-2.10.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/ChangeLog
new/lttng-modules-2.10.9/ChangeLog
--- old/lttng-modules-2.10.8/ChangeLog 2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/ChangeLog 2019-03-12 17:19:50.000000000 +0100
@@ -1,3 +1,15 @@
+2019-03-12 (Homer Simpson Birthday) LTTng modules 2.10.9
+ * Blacklist: kprobe for arm
+ * Cleanup: tp mempool: Remove logically dead code
+ * Fix: btrfs: Remove fsid/metadata_fsid fields from btrfs_info
+ * Fix: SUNRPC: Simplify defining common RPC trace events (v5.0)
+ * Fix: Replace pointer values with task->tk_pid and rpc_clnt->cl_clid
+ * Fix: Remove 'type' argument from access_ok() function (v5.0)
+ * Fix: timer instrumentation for RHEL 7.6
+ * Fix: ext4: adjust reserved cluster count when removing extents (v4.20)
+ * Fix: signal: Remove SEND_SIG_FORCED (v4.20)
+ * Fix: signal: Distinguish between kernel_siginfo and siginfo (v4.20)
+
2018-11-01 (National Men Make Dinner Day) LTTng modules 2.10.8
* Fix: update kvm instrumentation for SLES12 SP2 LTSS >= 4.4.121-92.92
* Fix: Add missing const to lttng_tracepoint_ptr_deref prototype
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/blacklist/kprobes.h
new/lttng-modules-2.10.9/blacklist/kprobes.h
--- old/lttng-modules-2.10.8/blacklist/kprobes.h 1970-01-01
01:00:00.000000000 +0100
+++ new/lttng-modules-2.10.9/blacklist/kprobes.h 2019-03-07
21:16:33.000000000 +0100
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
+ * blacklist/kprobes.h
+ *
+ * Blacklist of kernel for buggy kprobes implementation.
+ *
+ * Copyright (C) 2019 Jonathan Rajotte-Julien
<jonathan.rajotte-jul...@efficios.com>
+ */
+
+#ifndef _LTTNG_BLACKLIST_KPROBES_H
+#define _LTTNG_BLACKLIST_KPROBES_H
+
+#include <lttng-kernel-version.h>
+
+#if LTTNG_KERNEL_RANGE(4,20,0, 4,20,13) \
+ || LTTNG_KERNEL_RANGE(4,19,9, 4,19,26) \
+ || LTTNG_KERNEL_RANGE(4,14,87, 4,14,104)
+# if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES)
+# error "Your kernel is known to have buggy optimized kprobes implementation.
Fixed by commit 0ac569bf6a7983c0c5747d6df8db9dc05bc92b6c \"ARM: 8834/1: Fix:
kprobes: optimized kprobes illegal instruction\" in Linux. Disable
CONFIG_OPTPROBES or upgrade your kernel."
+# endif /* #if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES) */
+#endif
+
+#endif /* _LTTNG_BLACKLIST_KPROBES_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/instrumentation/events/lttng-module/btrfs.h
new/lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
--- old/lttng-modules-2.10.8/instrumentation/events/lttng-module/btrfs.h
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
2019-03-12 17:12:57.000000000 +0100
@@ -32,6 +32,12 @@
#define BTRFS_UUID_SIZE 16
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+#define lttng_fs_info_fsid fs_info->fs_devices->fsid
+#else
+#define lttng_fs_info_fsid fs_info->fsid
+#endif
+
#if (LINUX_VERSION_CODE >= 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) || \
@@ -629,7 +635,7 @@
TP_ARGS(fs_info, block_group, create),
TP_FIELDS(
- ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, offset, block_group->key.objectid)
ctf_integer(u64, size, block_group->key.offset)
ctf_integer(u64, flags, block_group->flags)
@@ -647,7 +653,7 @@
TP_ARGS(fs_info, block_group, create),
TP_FIELDS(
- ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, offset, block_group->key.objectid)
ctf_integer(u64, size, block_group->key.offset)
ctf_integer(u64, flags, block_group->flags)
@@ -1015,18 +1021,18 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_alloc,
- TP_PROTO(const struct btrfs_fs_info *info, const struct map_lookup *map,
+ TP_PROTO(const struct btrfs_fs_info *fs_info, const struct map_lookup
*map,
u64 offset, u64 size),
- TP_ARGS(info, map, offset, size)
+ TP_ARGS(fs_info, map, offset, size)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
- TP_PROTO(const struct btrfs_fs_info *info, const struct map_lookup *map,
+ TP_PROTO(const struct btrfs_fs_info *fs_info, const struct map_lookup
*map,
u64 offset, u64 size),
- TP_ARGS(info, map, offset, size)
+ TP_ARGS(fs_info, map, offset, size)
)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
@@ -1050,18 +1056,18 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_alloc,
- TP_PROTO(struct btrfs_fs_info *info, struct map_lookup *map,
+ TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map,
u64 offset, u64 size),
- TP_ARGS(info, map, offset, size)
+ TP_ARGS(fs_info, map, offset, size)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
- TP_PROTO(struct btrfs_fs_info *info, struct map_lookup *map,
+ TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map,
u64 offset, u64 size),
- TP_ARGS(info, map, offset, size)
+ TP_ARGS(fs_info, map, offset, size)
)
#elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
@@ -1192,7 +1198,7 @@
TP_ARGS(fs_info, type, val, bytes, reserve),
TP_FIELDS(
- ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_string(type, type)
ctf_integer(u64, val, val)
ctf_integer(u64, bytes, bytes)
@@ -1208,7 +1214,7 @@
TP_ARGS(fs_info, type, val, bytes, reserve),
TP_FIELDS(
- ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_string(type, type)
ctf_integer(u64, val, val)
ctf_integer(u64, bytes, bytes)
@@ -1221,9 +1227,9 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
- TP_PROTO(const struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len),
+ TP_ARGS(fs_info, start, len),
TP_FIELDS(
ctf_integer(u64, start, start)
@@ -1233,25 +1239,25 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,
btrfs_reserved_extent_alloc,
- TP_PROTO(const struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len)
+ TP_ARGS(fs_info, start, len)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,
btrfs_reserved_extent_free,
- TP_PROTO(const struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len)
+ TP_ARGS(fs_info, start, len)
)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
- TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len),
+ TP_ARGS(fs_info, start, len),
TP_FIELDS(
ctf_integer(u64, start, start)
@@ -1261,16 +1267,16 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,
btrfs_reserved_extent_alloc,
- TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len)
+ TP_ARGS(fs_info, start, len)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,
btrfs_reserved_extent_free,
- TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+ TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len),
- TP_ARGS(info, start, len)
+ TP_ARGS(fs_info, start, len)
)
#elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
@@ -1341,13 +1347,13 @@
btrfs_find_free_extent,
- TP_PROTO(const struct btrfs_fs_info *info, u64 num_bytes, u64
empty_size,
+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64
empty_size,
u64 data),
- TP_ARGS(info, num_bytes, empty_size, data),
+ TP_ARGS(fs_info, num_bytes, empty_size, data),
TP_FIELDS(
- ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, num_bytes, num_bytes)
ctf_integer(u64, empty_size, empty_size)
ctf_integer(u64, data, data)
@@ -1362,7 +1368,7 @@
TP_ARGS(block_group, start, len),
TP_FIELDS(
- ctf_array(u8, fsid, block_group->fs_info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, block_group->lttng_fs_info_fsid,
BTRFS_UUID_SIZE)
ctf_integer(u64, bg_objectid, block_group->key.objectid)
ctf_integer(u64, flags, block_group->flags)
ctf_integer(u64, start, start)
@@ -1391,13 +1397,13 @@
btrfs_find_free_extent,
- TP_PROTO(const struct btrfs_fs_info *info, u64 num_bytes, u64
empty_size,
+ TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64
empty_size,
u64 data),
- TP_ARGS(info, num_bytes, empty_size, data),
+ TP_ARGS(fs_info, num_bytes, empty_size, data),
TP_FIELDS(
- ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, num_bytes, num_bytes)
ctf_integer(u64, empty_size, empty_size)
ctf_integer(u64, data, data)
@@ -1406,14 +1412,14 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
- TP_PROTO(const struct btrfs_fs_info *info,
+ TP_PROTO(const struct btrfs_fs_info *fs_info,
const struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len),
+ TP_ARGS(fs_info, block_group, start, len),
TP_FIELDS(
- ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, bg_objectid, block_group->key.objectid)
ctf_integer(u64, flags, block_group->flags)
ctf_integer(u64, start, start)
@@ -1423,20 +1429,20 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent,
- TP_PROTO(const struct btrfs_fs_info *info,
+ TP_PROTO(const struct btrfs_fs_info *fs_info,
const struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len)
+ TP_ARGS(fs_info, block_group, start, len)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent,
btrfs_reserve_extent_cluster,
- TP_PROTO(const struct btrfs_fs_info *info,
+ TP_PROTO(const struct btrfs_fs_info *fs_info,
const struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len)
+ TP_ARGS(fs_info, block_group, start, len)
)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
@@ -1445,13 +1451,13 @@
btrfs_find_free_extent,
- TP_PROTO(struct btrfs_fs_info *info, u64 num_bytes, u64 empty_size,
+ TP_PROTO(struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size,
u64 data),
- TP_ARGS(info, num_bytes, empty_size, data),
+ TP_ARGS(fs_info, num_bytes, empty_size, data),
TP_FIELDS(
- ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE)
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
ctf_integer(u64, num_bytes, num_bytes)
ctf_integer(u64, empty_size, empty_size)
ctf_integer(u64, data, data)
@@ -1460,11 +1466,11 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
- TP_PROTO(struct btrfs_fs_info *info,
+ TP_PROTO(struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len),
+ TP_ARGS(fs_info, block_group, start, len),
TP_FIELDS(
ctf_integer(u64, bg_objectid, block_group->key.objectid)
@@ -1476,20 +1482,20 @@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent,
- TP_PROTO(struct btrfs_fs_info *info,
+ TP_PROTO(struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len)
+ TP_ARGS(fs_info, block_group, start, len)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent,
btrfs_reserve_extent_cluster,
- TP_PROTO(struct btrfs_fs_info *info,
+ TP_PROTO(struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start,
u64 len),
- TP_ARGS(info, block_group, start, len)
+ TP_ARGS(fs_info, block_group, start, len)
)
#elif (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) || \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/instrumentation/events/lttng-module/ext4.h
new/lttng-modules-2.10.9/instrumentation/events/lttng-module/ext4.h
--- old/lttng-modules-2.10.8/instrumentation/events/lttng-module/ext4.h
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/instrumentation/events/lttng-module/ext4.h
2019-03-12 17:12:57.000000000 +0100
@@ -1602,7 +1602,30 @@
)
)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
+ TP_PROTO(struct inode *inode, struct ext4_extent *ex,
+ ext4_lblk_t from, ext4_fsblk_t to,
+ struct partial_cluster *pc),
+
+ TP_ARGS(inode, ex, from, to, pc),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+ ctf_integer(ino_t, ino, inode->i_ino)
+ ctf_integer(ext4_lblk_t, from, from)
+ ctf_integer(ext4_lblk_t, to, to)
+ ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+ ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+ ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex))
+ ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+ ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+ ctf_integer(int, pc_state, pc->state)
+ )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
TP_PROTO(struct inode *inode, struct ext4_extent *ex,
@@ -1646,7 +1669,29 @@
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
+ TP_PROTO(struct inode *inode, ext4_lblk_t start,
+ struct ext4_extent *ex,
+ struct partial_cluster *pc),
+
+ TP_ARGS(inode, start, ex, pc),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+ ctf_integer(ino_t, ino, inode->i_ino)
+ ctf_integer(ext4_lblk_t, start, start)
+ ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+ ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+ ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex))
+ ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+ ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+ ctf_integer(int, pc_state, pc->state)
+ )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
TP_PROTO(struct inode *inode, ext4_lblk_t start,
@@ -1733,7 +1778,28 @@
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
+ TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
+ int depth, struct partial_cluster *pc, __le16 eh_entries),
+
+ TP_ARGS(inode, start, end, depth, pc, eh_entries),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+ ctf_integer(ino_t, ino, inode->i_ino)
+ ctf_integer(ext4_lblk_t, start, start)
+ ctf_integer(ext4_lblk_t, end, end)
+ ctf_integer(int, depth, depth)
+ ctf_integer(unsigned short, eh_entries, le16_to_cpu(eh_entries))
+ ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+ ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+ ctf_integer(int, pc_state, pc->state)
+ )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/instrumentation/events/lttng-module/rpc.h
new/lttng-modules-2.10.9/instrumentation/events/lttng-module/rpc.h
--- old/lttng-modules-2.10.8/instrumentation/events/lttng-module/rpc.h
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/instrumentation/events/lttng-module/rpc.h
2019-03-12 17:12:57.000000000 +0100
@@ -8,6 +8,57 @@
#include <linux/sunrpc/sched.h>
#include <linux/sunrpc/clnt.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
+
+ TP_PROTO(const struct rpc_task *task),
+
+ TP_ARGS(task),
+
+ TP_FIELDS(
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, status, task->tk_status)
+ )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
+ TP_PROTO(const struct rpc_task *task),
+
+ TP_ARGS(task)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
+ TP_PROTO(const struct rpc_task *task),
+
+ TP_ARGS(task)
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
+
+ TP_PROTO(struct rpc_task *task),
+
+ TP_ARGS(task),
+
+ TP_FIELDS(
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, status, task->tk_status)
+ )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
+ TP_PROTO(struct rpc_task *task),
+
+ TP_ARGS(task)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
+ TP_PROTO(struct rpc_task *task),
+
+ TP_ARGS(task)
+)
+#else
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(struct rpc_task *task),
@@ -32,20 +83,53 @@
TP_ARGS(task)
)
+#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status,
+ TP_PROTO(const struct rpc_task *task),
+
+ TP_ARGS(task)
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
TP_ARGS(task),
TP_FIELDS(
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, status, task->tk_status)
+ )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
+ TP_PROTO(struct rpc_task *task, int status),
+
+ TP_ARGS(task, status),
+
+ TP_FIELDS(
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, status, status)
+ )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
+ TP_PROTO(struct rpc_task *task, int status),
+
+ TP_ARGS(task, status),
+
+ TP_FIELDS(
ctf_integer_hex(const struct rpc_task *, task, task)
ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
- ctf_integer(int, status, task->tk_status)
+ ctf_integer(int, status, status)
)
)
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_task *task, const void *action),
@@ -53,8 +137,8 @@
TP_ARGS(task, action),
TP_FIELDS(
- ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
- ctf_integer_hex(const struct rpc_task *, task, task)
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
ctf_integer_hex(const void *, action, action)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)
@@ -90,8 +174,8 @@
TP_ARGS(task, q),
TP_FIELDS(
- ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
- ctf_integer_hex(const struct rpc_task *, task, task)
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
ctf_integer(unsigned long, timeout, task->tk_timeout)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)
@@ -114,19 +198,76 @@
TP_ARGS(task, q)
)
-#else
-LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
- TP_PROTO(struct rpc_task *task, int status),
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
- TP_ARGS(task, status),
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const void *action),
+
+ TP_ARGS(clnt, task, action),
TP_FIELDS(
- ctf_integer_hex(const struct rpc_task *, task, task)
- ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
- ctf_integer(int, status, status)
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer_hex(const void *, action, action)
+ ctf_integer(unsigned long, runstate, task->tk_runstate)
+ ctf_integer(int, status, task->tk_status)
+ ctf_integer(unsigned short, flags, task->tk_flags)
+ )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_begin,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const void *action),
+
+ TP_ARGS(clnt, task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_run_action,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const void *action),
+
+ TP_ARGS(clnt, task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_complete,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const void *action),
+
+ TP_ARGS(clnt, task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const struct rpc_wait_queue *q),
+
+ TP_ARGS(clnt, task, q),
+
+ TP_FIELDS(
+ ctf_integer(unsigned int, task_id, task->tk_pid)
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(unsigned long, timeout, task->tk_timeout)
+ ctf_integer(unsigned long, runstate, task->tk_runstate)
+ ctf_integer(int, status, task->tk_status)
+ ctf_integer(unsigned short, flags, task->tk_flags)
+ ctf_string(q_name, rpc_qname(q))
)
)
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_sleep,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const struct rpc_wait_queue *q),
+
+ TP_ARGS(clnt, task, q)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
+
+ TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const struct rpc_wait_queue *q),
+
+ TP_ARGS(clnt, task, q)
+)
+
+#else
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task,
const void *action),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/instrumentation/events/lttng-module/signal.h
new/lttng-modules-2.10.9/instrumentation/events/lttng-module/signal.h
--- old/lttng-modules-2.10.8/instrumentation/events/lttng-module/signal.h
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/instrumentation/events/lttng-module/signal.h
2019-03-12 17:12:57.000000000 +0100
@@ -12,6 +12,17 @@
#include <linux/signal.h>
#include <linux/sched.h>
#undef LTTNG_FIELDS_SIGINFO
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+#define LTTNG_FIELDS_SIGINFO(info) \
+ ctf_integer(int, errno, \
+ (info == SEND_SIG_NOINFO || info == SEND_SIG_PRIV) ? \
+ 0 : \
+ info->si_errno) \
+ ctf_integer(int, code, \
+ (info == SEND_SIG_NOINFO) ? \
+ SI_USER : \
+ ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */
#define LTTNG_FIELDS_SIGINFO(info) \
ctf_integer(int, errno, \
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED ||
info == SEND_SIG_PRIV) ? \
@@ -21,6 +32,7 @@
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \
SI_USER : \
((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */
#endif /* _TRACE_SIGNAL_DEF */
/**
@@ -35,21 +47,24 @@
* SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
* means that si_code is SI_KERNEL.
*/
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
LTTNG_TRACEPOINT_EVENT(signal_generate,
- TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
+ TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task,
+ int group, int result),
- TP_ARGS(sig, info, task),
+ TP_ARGS(sig, info, task, group, result),
TP_FIELDS(
ctf_integer(int, sig, sig)
LTTNG_FIELDS_SIGINFO(info)
ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
ctf_integer(pid_t, pid, task->pid)
+ ctf_integer(int, group, group)
+ ctf_integer(int, result, result)
)
)
-#else
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(signal_generate,
TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
@@ -66,6 +81,20 @@
ctf_integer(int, result, result)
)
)
+#else
+LTTNG_TRACEPOINT_EVENT(signal_generate,
+
+ TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
+
+ TP_ARGS(sig, info, task),
+
+ TP_FIELDS(
+ ctf_integer(int, sig, sig)
+ LTTNG_FIELDS_SIGINFO(info)
+ ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
+ ctf_integer(pid_t, pid, task->pid)
+ )
+)
#endif
/**
@@ -82,6 +111,21 @@
* This means, this can show which signals are actually delivered, but
* matching generated signals and delivered signals may not be correct.
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+LTTNG_TRACEPOINT_EVENT(signal_deliver,
+
+ TP_PROTO(int sig, struct kernel_siginfo *info, struct k_sigaction *ka),
+
+ TP_ARGS(sig, info, ka),
+
+ TP_FIELDS(
+ ctf_integer(int, sig, sig)
+ LTTNG_FIELDS_SIGINFO(info)
+ ctf_integer(unsigned long, sa_handler, (unsigned long)
ka->sa.sa_handler)
+ ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
+ )
+)
+#else
LTTNG_TRACEPOINT_EVENT(signal_deliver,
TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka),
@@ -95,6 +139,7 @@
ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
)
)
+#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/instrumentation/events/lttng-module/timer.h
new/lttng-modules-2.10.9/instrumentation/events/lttng-module/timer.h
--- old/lttng-modules-2.10.8/instrumentation/events/lttng-module/timer.h
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/instrumentation/events/lttng-module/timer.h
2019-03-12 17:12:57.000000000 +0100
@@ -44,7 +44,8 @@
TP_ARGS(timer)
)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
/**
* timer_start - called when the timer is started
* @timer: pointer to struct timer_list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/lib/ringbuffer/backend.h
new/lttng-modules-2.10.9/lib/ringbuffer/backend.h
--- old/lttng-modules-2.10.8/lib/ringbuffer/backend.h 2018-11-01
23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/lib/ringbuffer/backend.h 2019-03-12
17:12:57.000000000 +0100
@@ -34,7 +34,7 @@
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
-#include <linux/uaccess.h>
+#include <wrapper/uaccess.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
@@ -302,7 +302,7 @@
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
@@ -372,7 +372,7 @@
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
@@ -462,7 +462,7 @@
unsigned long ret;
mm_segment_t old_fs;
- if (!access_ok(VERIFY_READ, src, len))
+ if (!lttng_access_ok(VERIFY_READ, src, len))
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lttng-modules-2.10.8/lib/ringbuffer/ring_buffer_iterator.c
new/lttng-modules-2.10.9/lib/ringbuffer/ring_buffer_iterator.c
--- old/lttng-modules-2.10.8/lib/ringbuffer/ring_buffer_iterator.c
2018-11-01 23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/lib/ringbuffer/ring_buffer_iterator.c
2019-03-12 17:12:57.000000000 +0100
@@ -27,6 +27,7 @@
#include <wrapper/ringbuffer/iterator.h>
#include <wrapper/file.h>
+#include <wrapper/uaccess.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/module.h>
@@ -621,7 +622,7 @@
ssize_t len;
might_sleep();
- if (!access_ok(VERIFY_WRITE, user_buf, count))
+ if (!lttng_access_ok(VERIFY_WRITE, user_buf, count))
return -EFAULT;
/* Finish copy of previous record */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/lttng-filter-interpreter.c
new/lttng-modules-2.10.9/lttng-filter-interpreter.c
--- old/lttng-modules-2.10.8/lttng-filter-interpreter.c 2018-11-01
23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/lttng-filter-interpreter.c 2019-03-12
17:19:50.000000000 +0100
@@ -24,7 +24,7 @@
* SOFTWARE.
*/
-#include <linux/uaccess.h>
+#include <wrapper/uaccess.h>
#include <wrapper/frame.h>
#include <wrapper/types.h>
@@ -46,7 +46,7 @@
char c;
/* Handle invalid access as end of string. */
- if (unlikely(!access_ok(VERIFY_READ,
+ if (unlikely(!lttng_access_ok(VERIFY_READ,
reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/lttng-tp-mempool.c
new/lttng-modules-2.10.9/lttng-tp-mempool.c
--- old/lttng-modules-2.10.8/lttng-tp-mempool.c 2018-11-01 23:43:34.000000000
+0100
+++ new/lttng-modules-2.10.9/lttng-tp-mempool.c 2019-03-12 17:12:57.000000000
+0100
@@ -151,19 +151,12 @@
struct lttng_tp_buf_entry *entry;
struct per_cpu_buf *cpu_buf;
- if (!ptr) {
+ if (!ptr)
goto end;
- }
-
entry = container_of(ptr, struct lttng_tp_buf_entry, buf);
- if (!entry) {
- goto end;
- }
-
cpu_buf = per_cpu_ptr(pool, entry->cpu);
- if (!cpu_buf) {
+ if (!cpu_buf)
goto end;
- }
/* Add it to the free list. */
list_add_tail(&entry->list, &cpu_buf->free_list);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/lttng-tracer.h
new/lttng-modules-2.10.9/lttng-tracer.h
--- old/lttng-modules-2.10.8/lttng-tracer.h 2018-11-01 23:43:34.000000000
+0100
+++ new/lttng-modules-2.10.9/lttng-tracer.h 2019-03-12 17:19:50.000000000
+0100
@@ -42,7 +42,7 @@
#define LTTNG_MODULES_MAJOR_VERSION 2
#define LTTNG_MODULES_MINOR_VERSION 10
-#define LTTNG_MODULES_PATCHLEVEL_VERSION 8
+#define LTTNG_MODULES_PATCHLEVEL_VERSION 9
#define LTTNG_MODULES_EXTRAVERSION ""
#define LTTNG_VERSION_NAME "KeKriek"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/probes/lttng-kprobes.c
new/lttng-modules-2.10.9/probes/lttng-kprobes.c
--- old/lttng-modules-2.10.8/probes/lttng-kprobes.c 2018-11-01
23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/probes/lttng-kprobes.c 2019-03-12
17:12:57.000000000 +0100
@@ -28,6 +28,7 @@
#include <wrapper/vmalloc.h>
#include <wrapper/irqflags.h>
#include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
static
int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/probes/lttng-kretprobes.c
new/lttng-modules-2.10.9/probes/lttng-kretprobes.c
--- old/lttng-modules-2.10.8/probes/lttng-kretprobes.c 2018-11-01
23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/probes/lttng-kretprobes.c 2019-03-12
17:12:57.000000000 +0100
@@ -29,6 +29,7 @@
#include <wrapper/vmalloc.h>
#include <wrapper/irqflags.h>
#include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
enum lttng_kretprobe_type {
EVENT_ENTRY = 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/probes/lttng-probe-user.c
new/lttng-modules-2.10.9/probes/lttng-probe-user.c
--- old/lttng-modules-2.10.8/probes/lttng-probe-user.c 2018-11-01
23:43:34.000000000 +0100
+++ new/lttng-modules-2.10.9/probes/lttng-probe-user.c 2019-03-12
17:12:57.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
+#include <wrapper/uaccess.h>
#include <probes/lttng-probe-user.h>
/*
@@ -43,7 +44,7 @@
char v;
unsigned long ret;
- if (unlikely(!access_ok(VERIFY_READ,
+ if (unlikely(!lttng_access_ok(VERIFY_READ,
(__force const char __user *) addr,
sizeof(v))))
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lttng-modules-2.10.8/wrapper/uaccess.h
new/lttng-modules-2.10.9/wrapper/uaccess.h
--- old/lttng-modules-2.10.8/wrapper/uaccess.h 1970-01-01 01:00:00.000000000
+0100
+++ new/lttng-modules-2.10.9/wrapper/uaccess.h 2019-02-14 17:43:03.000000000
+0100
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
+ * wrapper/uaccess.h
+ *
+ * wrapper around linux/uaccess.h.
+ *
+ * Copyright (C) 2019 Michael Jeanson <mjean...@efficios.com>
+ */
+
+#ifndef _LTTNG_WRAPPER_UACCESS_H
+#define _LTTNG_WRAPPER_UACCESS_H
+
+#include <linux/uaccess.h>
+#include <lttng-kernel-version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+
+#define VERIFY_READ 0
+#define VERIFY_WRITE 1
+#define lttng_access_ok(type, addr, size) access_ok(addr, size)
+
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) */
+
+#define lttng_access_ok(type, addr, size) access_ok(type, addr, size)
+
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) */
+
+#endif /* _LTTNG_WRAPPER_UACCESS_H */
++++++ lttng-modules-fix-leap-15.0.patch ++++++
--- /var/tmp/diff_new_pack.Nuy7dd/_old 2019-04-22 12:27:04.388945856 +0200
+++ /var/tmp/diff_new_pack.Nuy7dd/_new 2019-04-22 12:27:04.388945856 +0200
@@ -1,5 +1,7 @@
---- a/instrumentation/events/lttng-module/block.h
-+++ b/instrumentation/events/lttng-module/block.h
+Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h
+===================================================================
+--- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/block.h
++++ lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h
@@ -618,7 +618,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
TP_ARGS(q, bio),
@@ -70,10 +72,12 @@
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
---- a/instrumentation/events/lttng-module/btrfs.h
-+++ b/instrumentation/events/lttng-module/btrfs.h
-@@ -33,10 +33,12 @@ struct extent_state;
- #define BTRFS_UUID_SIZE 16
+Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
+===================================================================
+--- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/btrfs.h
++++ lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h
+@@ -39,10 +39,12 @@ struct extent_state;
+ #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \
@@ -85,7 +89,7 @@
LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
TP_PROTO(const struct btrfs_root *root),
-@@ -140,7 +142,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i
+@@ -146,7 +148,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i
)
#endif
@@ -95,7 +99,7 @@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
-@@ -279,7 +282,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
+@@ -285,7 +288,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
@@ -105,7 +109,7 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
-@@ -323,6 +327,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+@@ -329,6 +333,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
)
)
#elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
@@ -113,7 +117,7 @@
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) || \
LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
-@@ -370,6 +375,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
+@@ -376,6 +381,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -121,7 +125,7 @@
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) || \
-@@ -575,6 +581,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
+@@ -581,6 +587,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -129,7 +133,7 @@
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) || \
-@@ -617,6 +624,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
+@@ -623,6 +630,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -137,7 +141,7 @@
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) || \
-@@ -791,6 +799,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf
+@@ -797,6 +805,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf
)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -145,7 +149,7 @@
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) || \
-@@ -994,7 +1003,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref
+@@ -1000,7 +1009,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref
)
#endif
@@ -155,8 +159,8 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
-@@ -1064,7 +1074,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
- TP_ARGS(info, map, offset, size)
+@@ -1070,7 +1080,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
+ TP_ARGS(fs_info, map, offset, size)
)
-#elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
@@ -165,7 +169,7 @@
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) || \
LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
-@@ -1140,6 +1151,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
+@@ -1146,6 +1157,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -173,7 +177,7 @@
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) || \
-@@ -1180,6 +1192,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
+@@ -1186,6 +1198,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -181,7 +185,7 @@
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) || \
-@@ -1217,7 +1230,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser
+@@ -1223,7 +1236,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser
)
#endif
@@ -191,7 +195,7 @@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
-@@ -1386,7 +1400,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
+@@ -1392,7 +1406,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
TP_ARGS(block_group, start, len)
)
@@ -201,7 +205,7 @@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
btrfs_find_free_extent,
-@@ -1605,6 +1620,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
+@@ -1611,6 +1626,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -209,7 +213,7 @@
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) || \
-@@ -1701,6 +1717,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust
+@@ -1707,6 +1723,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
@@ -217,8 +221,10 @@
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) || \
---- a/instrumentation/events/lttng-module/kmem.h
-+++ b/instrumentation/events/lttng-module/kmem.h
+Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h
+===================================================================
+--- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kmem.h
++++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h
@@ -132,7 +132,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_
)
)
@@ -229,8 +235,10 @@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page),
---- a/instrumentation/events/lttng-module/kvm.h
-+++ b/instrumentation/events/lttng-module/kvm.h
+Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h
+===================================================================
+--- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kvm.h
++++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h
@@ -111,6 +111,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
|| LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \
