Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2018-04-11 14:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Wed Apr 11 14:00:07 2018 rev:5 rq:594912 version:2.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2018-02-06 16:49:09.240068797 +0100 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new/lttng-modules.changes 2018-04-11 14:02:27.497790556 +0200 @@ -1,0 +2,8 @@ +Sun Apr 8 15:47:49 UTC 2018 - sor.ale...@meowr.ru + +- Rebase btrfs-constify-tracepoint-arguments.patch. +- Add + lttng-modules-2.10.5-update-instrumentation-for-linux-4.16.patch: + Update instrumentation on Linux 4.16 (commits 562860a, 9cf057f). + +------------------------------------------------------------------- New: ---- lttng-modules-2.10.5-update-instrumentation-for-linux-4.16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.DRhVY9/_old 2018-04-11 14:02:30.757672733 +0200 +++ /var/tmp/diff_new_pack.DRhVY9/_new 2018-04-11 14:02:30.761672589 +0200 @@ -26,7 +26,7 @@ Version: 2.10.5 Release: 0 Summary: Licensing information for package lttng-modules -License: GPL-2.0 AND LGPL-2.1 AND MIT +License: GPL-2.0-only AND LGPL-2.1-only AND MIT Group: System/Kernel Url: https://lttng.org/ Source: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2 @@ -36,6 +36,8 @@ Source4: Module.supported # PATCH-FIX-SLE btrfs-constify-tracepoint-arguments.patch bsc#1044912 to...@suse.de Patch0: btrfs-constify-tracepoint-arguments.patch +# PATCH-FIX-UPSTREAM lttng-modules-2.10.5-update-instrumentation-for-linux-4.16.patch -- Update instrumentation on Linux 4.16 (commits 562860a, 9cf057f). +Patch1: lttng-modules-2.10.5-update-instrumentation-for-linux-4.16.patch BuildRequires: kernel-devel BuildRequires: kernel-source BuildRequires: kernel-syms @@ -60,9 +62,10 @@ %prep %setup -q -%if (0%{?suse_version} < 1320 || 0%{?suse_version} > 1320) && !0%{?is_opensuse} +%if (0%{?suse_version} < 1320 || 0%{?suse_version} >= 1500) && !0%{?is_opensuse} %patch0 -p1 %endif +%patch1 -p1 set -- * mkdir source ++++++ btrfs-constify-tracepoint-arguments.patch ++++++ --- /var/tmp/diff_new_pack.DRhVY9/_old 2018-04-11 14:02:30.805670998 +0200 +++ /var/tmp/diff_new_pack.DRhVY9/_new 2018-04-11 14:02:30.809670854 +0200 @@ -11,7 +11,7 @@ --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h -@@ -86,7 +86,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i +@@ -87,7 +87,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i #else LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, @@ -20,7 +20,7 @@ TP_ARGS(root), -@@ -98,7 +98,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_transaction +@@ -99,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_transaction LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode, @@ -29,7 +29,7 @@ TP_ARGS(inode), -@@ -116,21 +116,21 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inod +@@ -117,21 +117,21 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inod LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_new, @@ -54,7 +54,7 @@ TP_ARGS(inode) ) -@@ -163,8 +163,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, +@@ -164,8 +164,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, @@ -65,7 +65,7 @@ TP_ARGS(root, inode, map), -@@ -276,7 +276,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde +@@ -298,7 +298,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, @@ -74,7 +74,7 @@ TP_ARGS(inode, ordered), -@@ -420,36 +420,36 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, +@@ -464,36 +464,36 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, #else LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, @@ -117,7 +117,7 @@ TP_ARGS(page, inode, wbc), -@@ -479,15 +479,15 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf +@@ -523,15 +523,15 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf btrfs__extent_writepage, @@ -136,7 +136,7 @@ TP_ARGS(page, start, end, uptodate), -@@ -504,7 +504,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_writepage_e +@@ -548,7 +548,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_writepage_e LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, @@ -145,7 +145,7 @@ TP_ARGS(file, datasync), -@@ -532,7 +532,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, +@@ -577,7 +577,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, @@ -154,7 +154,7 @@ TP_ARGS(fs_info, wait), -@@ -574,8 +574,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_g +@@ -620,8 +620,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_g #else LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group, @@ -165,7 +165,7 @@ TP_ARGS(fs_info, block_group, create), -@@ -615,9 +615,9 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre +@@ -661,9 +661,9 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, @@ -178,7 +178,7 @@ int action), TP_ARGS(fs_info, ref, full_ref, action), -@@ -659,8 +659,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre +@@ -705,8 +705,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref, @@ -189,9 +189,9 @@ int action), TP_ARGS(ref, full_ref, action), -@@ -683,9 +683,9 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_dat - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) - LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head, +@@ -803,9 +803,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs_de + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head, - TP_PROTO(struct btrfs_fs_info *fs_info, - struct btrfs_delayed_ref_node *ref, @@ -202,7 +202,7 @@ int action), TP_ARGS(fs_info, ref, head_ref, action), -@@ -755,7 +755,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c +@@ -930,7 +930,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, @@ -211,7 +211,7 @@ u64 offset, u64 size), TP_ARGS(fs_info, map, offset, size), -@@ -772,7 +772,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chun +@@ -947,7 +947,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chun LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_alloc, @@ -220,7 +220,7 @@ u64 offset, u64 size), TP_ARGS(info, map, offset, size) -@@ -780,7 +780,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c +@@ -955,7 +955,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free, @@ -229,7 +229,7 @@ u64 offset, u64 size), TP_ARGS(info, map, offset, size) -@@ -843,8 +843,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, +@@ -1054,8 +1054,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, #else LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, @@ -240,7 +240,7 @@ TP_ARGS(root, buf, cow), -@@ -878,7 +878,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser +@@ -1090,7 +1090,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation, @@ -249,7 +249,7 @@ u64 bytes, int reserve), TP_ARGS(fs_info, type, val, bytes, reserve), -@@ -925,7 +925,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r +@@ -1137,7 +1137,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent, @@ -258,7 +258,7 @@ TP_ARGS(info, start, len), -@@ -937,14 +937,14 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__rese +@@ -1149,14 +1149,14 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__rese LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_alloc, @@ -275,7 +275,7 @@ TP_ARGS(info, start, len) ) -@@ -1038,7 +1038,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_ext +@@ -1279,7 +1279,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_ext btrfs_find_free_extent, @@ -284,7 +284,7 @@ u64 data), TP_ARGS(info, num_bytes, empty_size, data), -@@ -1052,8 +1052,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_ext +@@ -1293,8 +1293,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_ext LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, @@ -295,7 +295,7 @@ u64 len), TP_ARGS(info, block_group, start, len), -@@ -1068,8 +1068,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__rese +@@ -1309,8 +1309,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__rese LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent, @@ -306,7 +306,7 @@ u64 len), TP_ARGS(info, block_group, start, len) -@@ -1077,8 +1077,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r +@@ -1318,8 +1318,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster, @@ -317,7 +317,7 @@ u64 len), TP_ARGS(info, block_group, start, len) -@@ -1188,7 +1188,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust +@@ -1483,7 +1483,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster, @@ -326,7 +326,7 @@ u64 bytes, u64 empty_size, u64 min_bytes), TP_ARGS(block_group, start, bytes, empty_size, min_bytes), -@@ -1205,7 +1205,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_find_cluste +@@ -1500,7 +1500,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_find_cluste LTTNG_TRACEPOINT_EVENT(btrfs_failed_cluster_setup, @@ -335,7 +335,7 @@ TP_ARGS(block_group), -@@ -1216,8 +1216,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_failed_clus +@@ -1511,8 +1511,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_failed_clus LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster, @@ -346,7 +346,7 @@ TP_ARGS(block_group, cluster, size, bitmap), -@@ -1266,12 +1266,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_ +@@ -1562,12 +1562,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_ btrfs_alloc_extent_state, @@ -361,7 +361,7 @@ ctf_integer(gfp_t, mask, mask) ctf_integer(unsigned long, ip, IP) ) -@@ -1281,12 +1281,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_s +@@ -1577,12 +1577,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_s btrfs_free_extent_state, ++++++ lttng-modules-2.10.5-update-instrumentation-for-linux-4.16.patch ++++++ --- a/instrumentation/events/lttng-module/mm_vmscan.h +++ b/instrumentation/events/lttng-module/mm_vmscan.h @@ -204,7 +204,32 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan TP_ARGS(nr_reclaimed) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,16,0)) +LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, + + mm_vmscan_shrink_slab_start, + + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, + long nr_objects_to_shrink, unsigned long cache_items, + unsigned long long delta, unsigned long total_scan, + int priority), + + TP_ARGS(shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, + priority), + + TP_FIELDS( + ctf_integer_hex(struct shrinker *, shr, shr) + ctf_integer_hex(void *, shrink, shr->scan_objects) + ctf_integer(int, nid, sc->nid) + ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink) + ctf_integer(gfp_t, gfp_flags, sc->gfp_mask) + ctf_integer(unsigned long, cache_items, cache_items) + ctf_integer(unsigned long long, delta, delta) + ctf_integer(unsigned long, total_scan, total_scan) + ctf_integer(int, priority, priority) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, mm_vmscan_shrink_slab_start, @@ -233,6 +258,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, ctf_integer(unsigned long, total_scan, total_scan) ) ) +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, @@ -255,7 +281,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, ctf_integer(long, total_scan, total_scan) ) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, mm_vmscan_shrink_slab_end, @@ -278,7 +304,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, ctf_integer(long, total_scan, new_scan_cnt - unused_scan_cnt) ) ) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) --- a/instrumentation/events/lttng-module/timer.h +++ b/instrumentation/events/lttng-module/timer.h @@ -160,6 +160,27 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init, * hrtimer_start - called when the hrtimer is started * @timer: pointer to struct hrtimer */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,16,0) || \ + LTTNG_RT_KERNEL_RANGE(4,14,0,0, 4,15,0,0)) +LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, + + timer_hrtimer_start, + + TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode), + + TP_ARGS(hrtimer, mode), + + TP_FIELDS( + ctf_integer_hex(void *, hrtimer, hrtimer) + ctf_integer_hex(void *, function, hrtimer->function) + ctf_integer(s64, expires, + lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer))) + ctf_integer(s64, softexpires, + lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer))) + ctf_integer(enum hrtimer_mode, mode, mode) + ) +) +#else LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, timer_hrtimer_start, @@ -177,6 +198,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer))) ) ) +#endif /** * htimmer_expire_entry - called immediately before the hrtimer callback
