Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2018-08-24 17:11:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Fri Aug 24 17:11:10 2018 rev:7 rq:631141 version:2.10.7 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2018-06-20 15:33:50.012684710 +0200 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new/lttng-modules.changes 2018-08-24 17:11:11.362576739 +0200 @@ -1,0 +2,17 @@ +Thu Aug 23 12:21:27 UTC 2018 - [email protected] + +- Update to version 2.10.7: + * Fix: adjust SLE version ranges to build with SP2 and SP3. + * Fix: Allow alphanumeric characters in the SLE version. + * Fix: Adjust range for SUSE 4.4.103-92 kernels. + * Add extra version information framework. + * Fix: btrfs: Remove the unnecessary fs_info parameter. + * Fix: asoc: Remove snd_soc_cache_sync() implementation. + * Fix: asoc: Fix printing jack name. + * Fix: asoc: Consolidate path trace events. + * Fix: ASoC level IO tracing removed upstream. + * Fix: dyntick field added to trace_rcu_dyntick in v4.16. + * Fix: BUILD_BUG_ON with compile time constant on < v2.6.38. + * Fix: pid tracker should track "pgid" for noargs probes. + +------------------------------------------------------------------- Old: ---- lttng-modules-2.10.6.tar.bz2 lttng-modules-2.10.6.tar.bz2.asc New: ---- lttng-modules-2.10.7.tar.bz2 lttng-modules-2.10.7.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.UzICde/_old 2018-08-24 17:11:11.874577349 +0200 +++ /var/tmp/diff_new_pack.UzICde/_new 2018-08-24 17:11:11.874577349 +0200 @@ -16,14 +16,14 @@ # -#%if (0%%{?suse_version} < 1320 || 0%%{?suse_version} > 1320) && !0%%{?is_opensuse} +#%if (0%%{?suse_version} < 1320 || 0%%{?suse_version} >= 1500) && !0%%{?is_opensuse} %if 0 %ifarch x86_64 %define buildrt 1 %endif %endif Name: lttng-modules -Version: 2.10.6 +Version: 2.10.7 Release: 0 Summary: Licensing information for package lttng-modules License: GPL-2.0-only AND LGPL-2.1-only AND MIT ++++++ lttng-modules-2.10.6.tar.bz2 -> lttng-modules-2.10.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/.gitignore new/lttng-modules-2.10.7/.gitignore --- old/lttng-modules-2.10.6/.gitignore 2018-03-20 16:51:26.000000000 +0100 +++ new/lttng-modules-2.10.7/.gitignore 2018-07-05 20:23:18.000000000 +0200 @@ -79,3 +79,5 @@ *.orig *~ \#*# + +/extra_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/ChangeLog new/lttng-modules-2.10.7/ChangeLog --- old/lttng-modules-2.10.6/ChangeLog 2018-05-09 20:07:59.000000000 +0200 +++ new/lttng-modules-2.10.7/ChangeLog 2018-08-09 21:18:38.000000000 +0200 @@ -1,3 +1,17 @@ +2018-08-09 (National Book Lovers Day) LTTng modules 2.10.7 + * Fix: adjust SLE version ranges to build with SP2 and SP3 + * Fix: Allow alphanumeric characters in SLE version + * Fix: Adjust range for SuSE 4.4.103-92 kernels + * Add extra version information framework + * Fix: btrfs: Remove unnecessary fs_info parameter + * Fix: asoc: Remove snd_soc_cache_sync() implementation + * Fix: asoc: fix printing jack name + * Fix: asoc: Consolidate path trace events + * Fix: ASoC level IO tracing removed upstream + * Fix: dyntick field added to trace_rcu_dyntick in v4.16 + * Fix: BUILD_BUG_ON with compile time constant on < v2.6.38 + * Fix: pid tracker should track "pgid" for noargs probes + 2018-05-09 (Lost Sock Memorial Day) LTTng modules 2.10.6 * Fix: update RCU instrumentation for 4.17 * Fix: sunrpc instrumentation for 4.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/Makefile.ABI.workarounds new/lttng-modules-2.10.7/Makefile.ABI.workarounds --- old/lttng-modules-2.10.6/Makefile.ABI.workarounds 2018-05-09 20:00:20.000000000 +0200 +++ new/lttng-modules-2.10.7/Makefile.ABI.workarounds 2018-08-09 21:16:36.000000000 +0200 @@ -34,6 +34,20 @@ ccflags-y += -DRT_PATCH_VERSION=$(RT_PATCH_VERSION) endif +EXTRA_VERSION_NAME:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-name.sh $(TOP_LTTNG_MODULES_DIR)) + +ifneq ($(EXTRA_VERSION_NAME), 0) + ccflags-y += -DLTTNG_EXTRA_VERSION_NAME='"$(EXTRA_VERSION_NAME)"' +endif + +EXTRA_VERSION_GIT:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-git.sh $(TOP_LTTNG_MODULES_DIR)) + +ifneq ($(EXTRA_VERSION_GIT), 0) + ccflags-y += -DLTTNG_EXTRA_VERSION_GIT='"$(EXTRA_VERSION_GIT)"' +endif + +EXTRA_VERSION_PATCHES:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-patches.sh $(TOP_LTTNG_MODULES_DIR)) + # Starting with kernel 4.12, the ftrace header was moved to private headers # and as such is not available when building against distro headers instead # of the full kernel sources. In the situation, define LTTNG_FTRACE_MISSING_HEADER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/abi-sle-version.sh new/lttng-modules-2.10.7/abi-sle-version.sh --- old/lttng-modules-2.10.6/abi-sle-version.sh 2018-03-20 16:51:26.000000000 +0100 +++ new/lttng-modules-2.10.7/abi-sle-version.sh 2018-08-09 21:16:36.000000000 +0200 @@ -22,7 +22,7 @@ exit 0 fi -SLE_RELEASE="$(sed -rn 's/^#define UTS_RELEASE "(.*)-([0-9\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")" +SLE_RELEASE="$(sed -rn 's/^#define UTS_RELEASE "(.*)-([0-9a-zA-Z\.]+)-(.*)"/\2/p' "${KPATH}/include/generated/utsrelease.h")" SLE_RELEASE_MAJOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)(.*)$/\1/p')" SLE_RELEASE_MINOR="$(echo "${SLE_RELEASE}" | sed -rn 's/^([0-9]+)\.([0-9]+)(.*)$/\2/p')" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/extra-version-git.sh new/lttng-modules-2.10.7/extra-version-git.sh --- old/lttng-modules-2.10.6/extra-version-git.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/lttng-modules-2.10.7/extra-version-git.sh 2018-08-09 21:16:36.000000000 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1) + +# First argument is the path to the lttng modules sources. +TOP_LTTNG_MODULES_DIR="$1" + +GIT_VERSION="0" + +if test -x "$(which git 2>&1;true)" && test -r "${TOP_LTTNG_MODULES_DIR}/.git"; then + GIT_VERSION_STR="$(cd "${TOP_LTTNG_MODULES_DIR}" && git describe --tags --dirty)" + GIT_CURRENT_TAG="$(cd "${TOP_LTTNG_MODULES_DIR}" && git describe --tags --exact-match --match="v[0-9]*" HEAD 2> /dev/null)" + + GIT_VERSION="${GIT_VERSION_STR}" + + if ! echo "${GIT_VERSION_STR}" | grep -- "-dirty" >/dev/null && test "x$GIT_CURRENT_TAG" != "x"; then + GIT_VERSION="0" + fi +fi + +echo "${GIT_VERSION}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/extra-version-name.sh new/lttng-modules-2.10.7/extra-version-name.sh --- old/lttng-modules-2.10.6/extra-version-name.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/lttng-modules-2.10.7/extra-version-name.sh 2018-08-09 21:16:36.000000000 +0200 @@ -0,0 +1,13 @@ +#!/bin/sh +# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1) + +# First argument is the path to the lttng modules sources. +TOP_LTTNG_MODULES_DIR="$1" + +EXTRA_VERSION_NAME="$(sed -n '1p' "${TOP_LTTNG_MODULES_DIR}/extra_version/name" 2> /dev/null)" + +if [ "x${EXTRA_VERSION_NAME}" != "x" ]; then + echo "${EXTRA_VERSION_NAME}" +else + echo "0" +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/extra-version-patches.sh new/lttng-modules-2.10.7/extra-version-patches.sh --- old/lttng-modules-2.10.6/extra-version-patches.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/lttng-modules-2.10.7/extra-version-patches.sh 2018-08-09 21:16:36.000000000 +0200 @@ -0,0 +1,21 @@ +#!/bin/sh +# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1) + +# First argument is the path to the lttng modules sources. +TOP_LTTNG_MODULES_DIR="$1" + +if ! test -d "${TOP_LTTNG_MODULES_DIR}"; then + exit 1 +fi + +TMPFILE="$(mktemp)" + +find "${TOP_LTTNG_MODULES_DIR}/extra_version/patches/" -maxdepth 1 ! -name 'README' -type f -printf '%f\n' | sort -r \ + | sed -E 's/[^a-zA-Z0-9 \.]/-/g ; s/(.*)/MODULE_INFO(extra_version_patch, "\1");/g' >"${TMPFILE}" 2>/dev/null + +if test ! -f "${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i" || \ + test x"$(cat "${TMPFILE}")" != x"$(cat "${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i")"; then + mv "${TMPFILE}" "${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i" +fi + +rm -f "${TMPFILE}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/extra_version/README new/lttng-modules-2.10.7/extra_version/README --- old/lttng-modules-2.10.6/extra_version/README 1970-01-01 01:00:00.000000000 +0100 +++ new/lttng-modules-2.10.7/extra_version/README 2018-07-05 20:23:18.000000000 +0200 @@ -0,0 +1,2 @@ +The first line of the "name" file is used to populate the "extra_version_name" +modinfo key of each built module. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/instrumentation/events/lttng-module/asoc.h new/lttng-modules-2.10.7/instrumentation/events/lttng-module/asoc.h --- old/lttng-modules-2.10.6/instrumentation/events/lttng-module/asoc.h 2018-03-20 16:51:26.000000000 +0100 +++ new/lttng-modules-2.10.7/instrumentation/events/lttng-module/asoc.h 2018-08-09 21:16:36.000000000 +0200 @@ -13,12 +13,18 @@ #ifndef _TRACE_ASOC_DEF #define _TRACE_ASOC_DEF struct snd_soc_jack; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)) struct snd_soc_codec; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) struct snd_soc_platform; #endif struct snd_soc_card; struct snd_soc_dapm_widget; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) +struct snd_soc_dapm_path; +#endif #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) \ @@ -30,6 +36,7 @@ #define CODEC_ID_FIELD id #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) /* * Log register events */ @@ -69,8 +76,10 @@ TP_ARGS(codec, reg, val) ) +#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg, TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, @@ -232,7 +241,27 @@ ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) +LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_path, + + asoc_snd_soc_dapm_path, + + TP_PROTO(struct snd_soc_dapm_widget *widget, + enum snd_soc_dapm_direction dir, + struct snd_soc_dapm_path *path), + + TP_ARGS(widget, dir, path), + + TP_FIELDS( + ctf_string(wname, widget->name) + ctf_string(pname, path->name ? path->name : DAPM_DIRECT) + ctf_string(pnname, path->node[dir]->name) + ctf_integer(int, path_node, (long) path->node[dir]) + ctf_integer(int, path_connect, path->connect) + ctf_integer(int, path_dir, dir) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_output_path, asoc_snd_soc_dapm_output_path, @@ -268,7 +297,9 @@ ctf_integer(int, path_connect, path->connect) ) ) +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_connected, asoc_snd_soc_dapm_connected, @@ -297,6 +328,36 @@ ) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) +LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report, + + asoc_snd_soc_jack_report, + + TP_PROTO(struct snd_soc_jack *jack, int mask, int val), + + TP_ARGS(jack, mask, val), + + TP_FIELDS( + ctf_string(name, jack->jack->id) + ctf_integer(int, mask, mask) + ctf_integer(int, val, val) + ) +) + +LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify, + + asoc_snd_soc_jack_notify, + + TP_PROTO(struct snd_soc_jack *jack, int val), + + TP_ARGS(jack, val), + + TP_FIELDS( + ctf_string(name, jack->jack->id) + ctf_integer(int, val, val) + ) +) +#else LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report, asoc_snd_soc_jack_report, @@ -325,7 +386,9 @@ ctf_integer(int, val, val) ) ) +#endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)) LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync, asoc_snd_soc_cache_sync, @@ -342,6 +405,7 @@ ctf_integer(int, id, codec->CODEC_ID_FIELD) ) ) +#endif #endif /* LTTNG_TRACE_ASOC_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/instrumentation/events/lttng-module/block.h new/lttng-modules-2.10.7/instrumentation/events/lttng-module/block.h --- old/lttng-modules-2.10.6/instrumentation/events/lttng-module/block.h 2018-03-20 16:51:26.000000000 +0100 +++ new/lttng-modules-2.10.7/instrumentation/events/lttng-module/block.h 2018-08-09 21:16:36.000000000 +0200 @@ -34,7 +34,13 @@ #endif /* _TRACE_BLOCK_DEF_ */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,114,92,0,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) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0)) #define lttng_req_op(rq) req_op(rq) #define lttng_req_rw(rq) ((rq)->cmd_flags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/instrumentation/events/lttng-module/btrfs.h new/lttng-modules-2.10.7/instrumentation/events/lttng-module/btrfs.h --- old/lttng-modules-2.10.6/instrumentation/events/lttng-module/btrfs.h 2018-03-22 22:35:09.000000000 +0100 +++ new/lttng-modules-2.10.7/instrumentation/events/lttng-module/btrfs.h 2018-08-09 21:16:36.000000000 +0200 @@ -33,6 +33,9 @@ #define BTRFS_UUID_SIZE 16 #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, @@ -229,7 +232,10 @@ ) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) +#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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, @@ -316,7 +322,10 @@ BTRFS_I(inode)->root->root_key.objectid) ) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) +#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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, TP_PROTO(const struct inode *inode, const struct btrfs_ordered_extent *ordered), @@ -361,6 +370,9 @@ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add, @@ -563,7 +575,13 @@ #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,114,92,0,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) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0)) LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, TP_PROTO(const struct btrfs_fs_info *fs_info, int wait), @@ -599,6 +617,9 @@ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group, @@ -770,7 +791,14 @@ ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,114,92,0,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) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head, TP_PROTO(const struct btrfs_fs_info *fs_info, @@ -862,7 +890,7 @@ TP_ARGS(fs_info, ref, head_ref, action) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,114,92,0,0, 4,5,0,0,0,0)) +#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,92,0,0, 4,5,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head, TP_PROTO(const struct btrfs_delayed_ref_node *ref, @@ -1036,7 +1064,10 @@ TP_ARGS(info, map, offset, size) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) +#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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, @@ -1109,6 +1140,9 @@ #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, @@ -1146,6 +1180,9 @@ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation, @@ -1236,7 +1273,10 @@ TP_ARGS(info, start, len) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) +#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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent, @@ -1296,8 +1336,57 @@ #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0)) +LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + + btrfs_find_free_extent, + + TP_PROTO(const struct btrfs_fs_info *info, u64 num_bytes, u64 empty_size, + u64 data), + + TP_ARGS(info, num_bytes, empty_size, data), + + TP_FIELDS( + ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, num_bytes, num_bytes) + ctf_integer(u64, empty_size, empty_size) + ctf_integer(u64, data, data) + ) +) + +LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, + + TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, + u64 len), + + TP_ARGS(block_group, start, len), + TP_FIELDS( + ctf_array(u8, fsid, block_group->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) + ctf_integer(u64, len, len) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent, + + TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, + u64 len), + + TP_ARGS(block_group, start, len) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster, + + TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, + u64 len), + + TP_ARGS(block_group, start, len) +) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, btrfs_find_free_extent, @@ -1308,6 +1397,7 @@ TP_ARGS(info, num_bytes, empty_size, data), TP_FIELDS( + ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) ctf_integer(u64, num_bytes, num_bytes) ctf_integer(u64, empty_size, empty_size) ctf_integer(u64, data, data) @@ -1323,6 +1413,7 @@ TP_ARGS(info, block_group, start, len), TP_FIELDS( + ctf_array(u8, fsid, 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) @@ -1360,6 +1451,7 @@ TP_ARGS(info, num_bytes, empty_size, data), TP_FIELDS( + ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) ctf_integer(u64, num_bytes, num_bytes) ctf_integer(u64, empty_size, empty_size) ctf_integer(u64, data, data) @@ -1399,7 +1491,10 @@ TP_ARGS(info, block_group, start, len) ) -#elif (LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) +#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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, @@ -1510,6 +1605,9 @@ #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster, @@ -1603,6 +1701,9 @@ #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) || \ + 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)) LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/instrumentation/events/lttng-module/kvm.h new/lttng-modules-2.10.7/instrumentation/events/lttng-module/kvm.h --- old/lttng-modules-2.10.6/instrumentation/events/lttng-module/kvm.h 2018-03-25 17:07:15.000000000 +0200 +++ new/lttng-modules-2.10.7/instrumentation/events/lttng-module/kvm.h 2018-08-09 21:16:36.000000000 +0200 @@ -84,7 +84,22 @@ { KVM_TRACE_MMIO_READ, "read" }, \ { KVM_TRACE_MMIO_WRITE, "write" } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ + +#if (LTTNG_SLE_KERNEL_RANGE(4,4,131,94,0,0, 4,5,0,0,0,0)) + +LTTNG_TRACEPOINT_EVENT(kvm_mmio, + TP_PROTO(int type, int len, u64 gpa, u64 val), + TP_ARGS(type, len, gpa, val), + + TP_FIELDS( + ctf_integer(u32, type, type) + ctf_integer(u32, len, len) + ctf_integer(u64, gpa, gpa) + ctf_integer(u64, val, val) + ) +) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ || LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \ || LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \ || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/instrumentation/events/lttng-module/rcu.h new/lttng-modules-2.10.7/instrumentation/events/lttng-module/rcu.h --- old/lttng-modules-2.10.6/instrumentation/events/lttng-module/rcu.h 2018-05-01 22:43:50.000000000 +0200 +++ new/lttng-modules-2.10.7/instrumentation/events/lttng-module/rcu.h 2018-08-09 21:16:36.000000000 +0200 @@ -612,7 +612,7 @@ grplo, grphi, gp_tasks) do { } \ while (0) #define trace_rcu_fqs(rcuname, gpnum, cpu, qsevent) do { } while (0) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,16,0)) #define trace_rcu_dyntick(polarity, oldnesting, newnesting, dyntick) do { } while (0) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) #define trace_rcu_dyntick(polarity, oldnesting, newnesting) do { } while (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/lib/bug.h new/lttng-modules-2.10.7/lib/bug.h --- old/lttng-modules-2.10.6/lib/bug.h 2016-03-15 16:36:40.000000000 +0100 +++ new/lttng-modules-2.10.7/lib/bug.h 2018-08-09 21:16:36.000000000 +0200 @@ -21,6 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <linux/version.h> + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) +#define LTTNG_BUILD_BUG_ON(cond) BUILD_BUG_ON(cond) +#else +#define LTTNG_BUILD_BUG_ON(cond) MAYBE_BUILD_BUG_ON(cond) +#endif + /** * BUILD_RUNTIME_BUG_ON - check condition at build (if constant) or runtime * @condition: the condition which should be false. @@ -33,7 +41,7 @@ #define BUILD_RUNTIME_BUG_ON(condition) \ do { \ if (__builtin_constant_p(condition)) \ - BUILD_BUG_ON(condition); \ + LTTNG_BUILD_BUG_ON(condition); \ else \ BUG_ON(condition); \ } while (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/lttng-events.c new/lttng-modules-2.10.7/lttng-events.c --- old/lttng-modules-2.10.6/lttng-events.c 2018-05-09 20:00:20.000000000 +0200 +++ new/lttng-modules-2.10.7/lttng-events.c 2018-08-09 21:16:36.000000000 +0200 @@ -2809,12 +2809,22 @@ ret = lttng_init_cpu_hotplug(); if (ret) goto error_hotplug; - printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)\n", + printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)%s%s\n", __stringify(LTTNG_MODULES_MAJOR_VERSION), __stringify(LTTNG_MODULES_MINOR_VERSION), __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION), LTTNG_MODULES_EXTRAVERSION, - LTTNG_VERSION_NAME); + LTTNG_VERSION_NAME, +#ifdef LTTNG_EXTRA_VERSION_GIT + LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT, +#else + "", +#endif +#ifdef LTTNG_EXTRA_VERSION_NAME + LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME); +#else + ""); +#endif return 0; error_hotplug: @@ -2827,12 +2837,22 @@ lttng_tracepoint_exit(); error_tp: lttng_context_exit(); - printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)\n", + printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)%s%s\n", __stringify(LTTNG_MODULES_MAJOR_VERSION), __stringify(LTTNG_MODULES_MINOR_VERSION), __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION), LTTNG_MODULES_EXTRAVERSION, - LTTNG_VERSION_NAME); + LTTNG_VERSION_NAME, +#ifdef LTTNG_EXTRA_VERSION_GIT + LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT, +#else + "", +#endif +#ifdef LTTNG_EXTRA_VERSION_NAME + LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME); +#else + ""); +#endif return ret; } @@ -2850,16 +2870,33 @@ kmem_cache_destroy(event_cache); lttng_tracepoint_exit(); lttng_context_exit(); - printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)\n", + printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)%s%s\n", __stringify(LTTNG_MODULES_MAJOR_VERSION), __stringify(LTTNG_MODULES_MINOR_VERSION), __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION), LTTNG_MODULES_EXTRAVERSION, - LTTNG_VERSION_NAME); + LTTNG_VERSION_NAME, +#ifdef LTTNG_EXTRA_VERSION_GIT + LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT, +#else + "", +#endif +#ifdef LTTNG_EXTRA_VERSION_NAME + LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME); +#else + ""); +#endif } module_exit(lttng_events_exit); +#include "extra_version/patches.i" +#ifdef LTTNG_EXTRA_VERSION_GIT +MODULE_INFO(extra_version_git, LTTNG_EXTRA_VERSION_GIT); +#endif +#ifdef LTTNG_EXTRA_VERSION_NAME +MODULE_INFO(extra_version_name, LTTNG_EXTRA_VERSION_NAME); +#endif MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers <[email protected]>"); MODULE_DESCRIPTION("LTTng Events"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/lttng-tracer.h new/lttng-modules-2.10.7/lttng-tracer.h --- old/lttng-modules-2.10.6/lttng-tracer.h 2018-05-09 20:05:40.000000000 +0200 +++ new/lttng-modules-2.10.7/lttng-tracer.h 2018-08-09 21:18:48.000000000 +0200 @@ -42,7 +42,7 @@ #define LTTNG_MODULES_MAJOR_VERSION 2 #define LTTNG_MODULES_MINOR_VERSION 10 -#define LTTNG_MODULES_PATCHLEVEL_VERSION 6 +#define LTTNG_MODULES_PATCHLEVEL_VERSION 7 #define LTTNG_MODULES_EXTRAVERSION "" #define LTTNG_VERSION_NAME "KeKriek" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.10.6/probes/lttng-tracepoint-event-impl.h new/lttng-modules-2.10.7/probes/lttng-tracepoint-event-impl.h --- old/lttng-modules-2.10.6/probes/lttng-tracepoint-event-impl.h 2018-03-20 16:51:26.000000000 +0100 +++ new/lttng-modules-2.10.7/probes/lttng-tracepoint-event-impl.h 2018-08-09 21:16:36.000000000 +0200 @@ -1225,7 +1225,7 @@ if (unlikely(!READ_ONCE(__event->enabled))) \ return; \ __lpf = lttng_rcu_dereference(__session->pid_tracker); \ - if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid))) \ + if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->tgid))) \ return; \ __orig_dynamic_len_offset = this_cpu_ptr(<tng_dynamic_len_stack)->offset; \ __dynamic_len_idx = __orig_dynamic_len_offset; \
