Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2019-01-26 22:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Sat Jan 26 22:22:25 2019 rev:9 rq:668645 version:2.10.8 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2018-11-15 12:41:57.974146449 +0100 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new.28833/lttng-modules.changes 2019-01-26 22:22:26.890854094 +0100 @@ -2 +2,9 @@ -Wed Nov 14 12:28:56 UTC 2018 - sor.ale...@meowr.ru +Thu Jan 24 16:43:44 UTC 2019 - Alexei Sorokin <sor.ale...@meowr.ru> + +- Add + lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch: + Update instrumentation on Linux 4.20 (commits 6c484ba2, cef5d79e, + 307021a1). + +------------------------------------------------------------------- +Wed Nov 14 12:28:56 UTC 2018 - Alexei Sorokin <sor.ale...@meowr.ru> New: ---- lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.GMt5LC/_old 2019-01-26 22:22:27.318853747 +0100 +++ /var/tmp/diff_new_pack.GMt5LC/_new 2019-01-26 22:22:27.318853747 +0100 @@ -1,7 +1,7 @@ # # spec file for package lttng-modules # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ 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 @@ -60,6 +62,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 set -- * mkdir source @@ -78,7 +81,8 @@ rm -rf obj/$flavor cp -r source obj/$flavor cp %{SOURCE4} obj/$flavor - make %{?_smp_mflags} V=1 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m + make %{?_smp_mflags} V=1 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ + M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m done %install @@ -86,7 +90,8 @@ export INSTALL_MOD_DIR=updates export BRP_PESIGN_FILES="*.ko /lib/firmware" for flavor in %{flavors_to_build}; do - make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m + make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install \ + M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m done %files ++++++ lttng-modules-2.10.8-update-instrumentation-for-linux-4.20.patch ++++++ --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -1602,7 +1602,30 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_show_ext ) ) -#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 @@ LTTNG_TRACEPOINT_EVENT(ext4_remove_block #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 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_s #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, --- a/instrumentation/events/lttng-module/signal.h +++ b/instrumentation/events/lttng-module/signal.h @@ -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 @@ LTTNG_TRACEPOINT_EVENT(signal_generate, 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 @@ LTTNG_TRACEPOINT_EVENT(signal_generate, * 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 @@ LTTNG_TRACEPOINT_EVENT(signal_deliver, 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,