- Update to version 2.13.4.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-modules?expand=0&rev=61
This commit is contained in:
committed by
Git OBS Bridge
parent
b894285c6f
commit
bbfe4607d2
@@ -1,403 +0,0 @@
|
||||
--- a/include/instrumentation/events/arch/x86/kvm/trace.h
|
||||
+++ b/include/instrumentation/events/arch/x86/kvm/trace.h
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <asm/clocksource.h>
|
||||
#endif
|
||||
#include <lttng/kernel-version.h>
|
||||
+#include <wrapper/kvm-x86.h>
|
||||
#include <../arch/x86/kvm/lapic.h>
|
||||
#include <../arch/x86/kvm/kvm_cache_regs.h>
|
||||
|
||||
@@ -115,7 +116,40 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_apic, kvm
|
||||
/*
|
||||
* Tracepoint for kvm guest exit:
|
||||
*/
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
|
||||
+ TP_PROTO(struct kvm_vcpu *vcpu, u32 isa),
|
||||
+ TP_ARGS(vcpu, isa),
|
||||
+
|
||||
+ TP_locvar(
|
||||
+ u32 exit_reason;
|
||||
+ u64 info1, info2;
|
||||
+ u32 intr_info, error_code;
|
||||
+ ),
|
||||
+
|
||||
+ TP_code_pre(
|
||||
+ lttng_kvm_x86_get_exit_info(vcpu,
|
||||
+ &tp_locvar->exit_reason,
|
||||
+ &tp_locvar->info1,
|
||||
+ &tp_locvar->info2,
|
||||
+ &tp_locvar->intr_info,
|
||||
+ &tp_locvar->error_code);
|
||||
+ ),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer(unsigned int, exit_reason, tp_locvar->exit_reason)
|
||||
+ ctf_integer(unsigned long, guest_rip, kvm_rip_read(vcpu))
|
||||
+ ctf_integer(u32, isa, isa)
|
||||
+ ctf_integer(u64, info1, tp_locvar->info1)
|
||||
+ ctf_integer(u64, info2, tp_locvar->info2)
|
||||
+ ctf_integer(u32, intr_info, tp_locvar->intr_info)
|
||||
+ ctf_integer(u32, error_code, tp_locvar->error_code)
|
||||
+ ctf_integer(unsigned int, vcpu_id, vcpu->vcpu_id)
|
||||
+ ),
|
||||
+
|
||||
+ TP_code_post()
|
||||
+)
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
|
||||
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
|
||||
TP_PROTO(struct kvm_vcpu *vcpu, u32 isa),
|
||||
TP_ARGS(vcpu, isa),
|
||||
@@ -535,7 +569,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_i
|
||||
vcpu->arch.emulate_ctxt.fetch.data)
|
||||
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
|
||||
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
|
||||
-#else
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(5,18,0))
|
||||
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip -
|
||||
(vcpu->arch.emulate_ctxt->fetch.ptr -
|
||||
vcpu->arch.emulate_ctxt->fetch.data))
|
||||
@@ -543,6 +577,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_i
|
||||
ctf_integer(__u8, len, vcpu->arch.emulate_ctxt->fetch.ptr -
|
||||
vcpu->arch.emulate_ctxt->fetch.data)
|
||||
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt->fetch.data, 15)
|
||||
+ ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt->mode))
|
||||
+#else
|
||||
+ ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt->_eip -
|
||||
+ (vcpu->arch.emulate_ctxt->fetch.ptr -
|
||||
+ vcpu->arch.emulate_ctxt->fetch.data))
|
||||
+ ctf_integer(__u32, csbase, lttng_kvm_x86_get_segment_base(vcpu, VCPU_SREG_CS))
|
||||
+ ctf_integer(__u8, len, vcpu->arch.emulate_ctxt->fetch.ptr -
|
||||
+ vcpu->arch.emulate_ctxt->fetch.data)
|
||||
+ ctf_array(__u8, insn, vcpu->arch.emulate_ctxt->fetch.data, 15)
|
||||
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt->mode))
|
||||
#endif
|
||||
ctf_integer(__u8, failed, failed)
|
||||
--- a/include/instrumentation/events/block.h
|
||||
+++ b/include/instrumentation/events/block.h
|
||||
@@ -11,9 +11,9 @@
|
||||
#include <linux/trace_seq.h>
|
||||
#include <lttng/kernel-version.h>
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0))
|
||||
+#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0)
|
||||
#include <scsi/scsi_request.h>
|
||||
-#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */
|
||||
+#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */
|
||||
|
||||
#ifndef _TRACE_BLOCK_DEF_
|
||||
#define _TRACE_BLOCK_DEF_
|
||||
@@ -66,6 +66,37 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
|
||||
#define lttng_bio_op(bio) bio_op(bio)
|
||||
#define lttng_bio_rw(bio) ((bio)->bi_opf)
|
||||
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
|
||||
+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
|
||||
+ ctf_enum(block_rq_type, type, rwbs, \
|
||||
+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \
|
||||
+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \
|
||||
+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \
|
||||
+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \
|
||||
+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \
|
||||
+ ( 0 )))))) \
|
||||
+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \
|
||||
+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \
|
||||
+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
|
||||
+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
|
||||
+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
|
||||
+#else
|
||||
+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
|
||||
+ ctf_integer(type, rwbs, \
|
||||
+ ( (op) == REQ_OP_WRITE ? RWBS_FLAG_WRITE : \
|
||||
+ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \
|
||||
+ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \
|
||||
+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \
|
||||
+ ( (op) == REQ_OP_READ ? RWBS_FLAG_READ : \
|
||||
+ ( 0 )))))) \
|
||||
+ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \
|
||||
+ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \
|
||||
+ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
|
||||
+ | ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
|
||||
+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
|
||||
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
|
||||
+#else
|
||||
#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
|
||||
#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
|
||||
ctf_enum(block_rq_type, type, rwbs, \
|
||||
@@ -95,6 +126,7 @@ LTTNG_TRACEPOINT_ENUM(block_rq_type,
|
||||
| ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
|
||||
| ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
|
||||
#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
|
||||
+#endif
|
||||
|
||||
#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0))
|
||||
|
||||
--- a/include/instrumentation/events/compaction.h
|
||||
+++ b/include/instrumentation/events/compaction.h
|
||||
@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(comp
|
||||
|
||||
#endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
|
||||
+
|
||||
+ compaction_migratepages,
|
||||
+
|
||||
+ TP_PROTO(struct compact_control *cc,
|
||||
+ unsigned int nr_succeeded),
|
||||
+
|
||||
+ TP_ARGS(cc, nr_succeeded),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer(unsigned long, nr_migrated, nr_succeeded)
|
||||
+ ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded)
|
||||
+ )
|
||||
+)
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
|
||||
LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages,
|
||||
|
||||
TP_PROTO(unsigned long nr_all,
|
||||
--- a/include/instrumentation/events/sched.h
|
||||
+++ b/include/instrumentation/events/sched.h
|
||||
@@ -20,7 +20,37 @@
|
||||
#ifndef _TRACE_SCHED_DEF_
|
||||
#define _TRACE_SCHED_DEF_
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+
|
||||
+static inline long __trace_sched_switch_state(bool preempt,
|
||||
+ unsigned int prev_state,
|
||||
+ struct task_struct *p)
|
||||
+{
|
||||
+ unsigned int state;
|
||||
+
|
||||
+#ifdef CONFIG_SCHED_DEBUG
|
||||
+ BUG_ON(p != current);
|
||||
+#endif /* CONFIG_SCHED_DEBUG */
|
||||
+
|
||||
+ /*
|
||||
+ * Preemption ignores task state, therefore preempted tasks are always
|
||||
+ * RUNNING (we will not have dequeued if state != RUNNING).
|
||||
+ */
|
||||
+ if (preempt)
|
||||
+ return TASK_REPORT_MAX;
|
||||
+
|
||||
+ /*
|
||||
+ * task_state_index() uses fls() and returns a value from 0-8 range.
|
||||
+ * Decrement it by 1 (except TASK_RUNNING state i.e 0) before using
|
||||
+ * it for left shift operation to get the correct task->state
|
||||
+ * mapping.
|
||||
+ */
|
||||
+ state = __task_state_index(prev_state, p->exit_state);
|
||||
+
|
||||
+ return state ? (1 << (state - 1)) : state;
|
||||
+}
|
||||
+
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
|
||||
|
||||
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
|
||||
{
|
||||
@@ -321,43 +351,81 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wa
|
||||
/*
|
||||
* Tracepoint for task switches, performed by the scheduler:
|
||||
*/
|
||||
+
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
LTTNG_TRACEPOINT_EVENT(sched_switch,
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0))
|
||||
TP_PROTO(bool preempt,
|
||||
- struct task_struct *prev,
|
||||
- struct task_struct *next),
|
||||
+ struct task_struct *prev,
|
||||
+ struct task_struct *next,
|
||||
+ unsigned int prev_state),
|
||||
|
||||
- TP_ARGS(preempt, prev, next),
|
||||
+ TP_ARGS(preempt, prev, next, prev_state),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
|
||||
+ ctf_integer(pid_t, prev_tid, prev->pid)
|
||||
+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
|
||||
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
|
||||
+ ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
|
||||
#else
|
||||
- TP_PROTO(struct task_struct *prev,
|
||||
+ ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev_state, prev))
|
||||
+#endif
|
||||
+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
|
||||
+ ctf_integer(pid_t, next_tid, next->pid)
|
||||
+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
|
||||
+ )
|
||||
+)
|
||||
+
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0))
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT(sched_switch,
|
||||
+
|
||||
+ TP_PROTO(bool preempt,
|
||||
+ struct task_struct *prev,
|
||||
struct task_struct *next),
|
||||
|
||||
- TP_ARGS(prev, next),
|
||||
-#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) */
|
||||
+ TP_ARGS(preempt, prev, next),
|
||||
|
||||
TP_FIELDS(
|
||||
ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
|
||||
ctf_integer(pid_t, prev_tid, prev->pid)
|
||||
ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0))
|
||||
#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
|
||||
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev))
|
||||
#else
|
||||
ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev))
|
||||
#endif
|
||||
+ ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
|
||||
+ ctf_integer(pid_t, next_tid, next->pid)
|
||||
+ ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
|
||||
+ )
|
||||
+)
|
||||
+
|
||||
#else
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT(sched_switch,
|
||||
+
|
||||
+ TP_PROTO(struct task_struct *prev,
|
||||
+ struct task_struct *next),
|
||||
+
|
||||
+ TP_ARGS(prev, next),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
|
||||
+ ctf_integer(pid_t, prev_tid, prev->pid)
|
||||
+ ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
|
||||
#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
|
||||
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev))
|
||||
#else
|
||||
ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
|
||||
#endif
|
||||
-#endif
|
||||
ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
|
||||
ctf_integer(pid_t, next_tid, next->pid)
|
||||
ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
|
||||
)
|
||||
)
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Tracepoint for a task being migrated:
|
||||
--- a/include/wrapper/genhd.h
|
||||
+++ b/include/wrapper/genhd.h
|
||||
@@ -12,7 +12,11 @@
|
||||
#ifndef _LTTNG_WRAPPER_GENHD_H
|
||||
#define _LTTNG_WRAPPER_GENHD_H
|
||||
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+#include <linux/blkdev.h>
|
||||
+#else
|
||||
#include <linux/genhd.h>
|
||||
+#endif
|
||||
|
||||
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
|
||||
#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN
|
||||
--- a/include/wrapper/kprobes.h
|
||||
+++ b/include/wrapper/kprobes.h
|
||||
@@ -29,4 +29,21 @@ struct kretprobe *lttng_get_kretprobe(st
|
||||
|
||||
#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) */
|
||||
|
||||
+
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+static inline
|
||||
+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri)
|
||||
+{
|
||||
+ return get_kretprobe_retaddr(ri);
|
||||
+}
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+static inline
|
||||
+unsigned long lttng_get_kretprobe_retaddr(struct kretprobe_instance *ri)
|
||||
+{
|
||||
+ return (unsigned long) ri->ret_addr;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif /* _LTTNG_WRAPPER_KPROBES_H */
|
||||
--- a/src/probes/Kbuild
|
||||
+++ b/src/probes/Kbuild
|
||||
@@ -167,7 +167,22 @@ ifneq ($(CONFIG_BTRFS_FS),)
|
||||
endif # $(wildcard $(btrfs_dep))
|
||||
endif # CONFIG_BTRFS_FS
|
||||
|
||||
-obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
|
||||
+# A dependency on internal header 'mm/internal.h' was introduced in v5.18
|
||||
+compaction_dep = $(srctree)/mm/internal.h
|
||||
+compaction_dep_wildcard = $(wildcard $(compaction_dep))
|
||||
+compaction_dep_check = $(shell \
|
||||
+if [ \( $(VERSION) -ge 6 \
|
||||
+ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
|
||||
+ -z "$(compaction_dep_wildcard)" ] ; then \
|
||||
+ echo "warn" ; \
|
||||
+else \
|
||||
+ echo "ok" ; \
|
||||
+fi ;)
|
||||
+ifeq ($(compaction_dep_check),ok)
|
||||
+ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
|
||||
+else
|
||||
+ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.)
|
||||
+endif # $(wildcard $(compaction_dep))
|
||||
|
||||
ifneq ($(CONFIG_EXT4_FS),)
|
||||
ext4_dep = $(srctree)/fs/ext4/*.h
|
||||
@@ -187,13 +202,11 @@ ifneq ($(CONFIG_FRAME_WARN),0)
|
||||
CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200
|
||||
endif
|
||||
|
||||
-obj-$(CONFIG_LTTNG) += $(shell \
|
||||
- if [ $(VERSION) -ge 4 \
|
||||
- -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \
|
||||
- -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \
|
||||
- -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \
|
||||
- -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 0 -a $(SUBLEVEL) -ge 41 \) ] ; then \
|
||||
- echo "lttng-probe-random.o" ; fi;)
|
||||
+# Introduced in v3.6, remove in v5.18
|
||||
+random_dep = $(srctree)/include/trace/events/random.h
|
||||
+ifneq ($(wildcard $(random_dep)),)
|
||||
+ obj-$(CONFIG_LTTNG) += lttng-probe-random.o
|
||||
+endif
|
||||
|
||||
obj-$(CONFIG_LTTNG) += $(shell \
|
||||
if [ $(VERSION) -ge 4 \
|
||||
--- a/src/probes/lttng-kretprobes.c
|
||||
+++ b/src/probes/lttng-kretprobes.c
|
||||
@@ -81,7 +81,7 @@ int _lttng_kretprobes_handler(struct kre
|
||||
int ret;
|
||||
|
||||
payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;
|
||||
- payload.parent_ip = (unsigned long) krpi->ret_addr;
|
||||
+ payload.parent_ip = lttng_get_kretprobe_retaddr(krpi);
|
||||
|
||||
lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(payload),
|
||||
lttng_alignof(payload), <tng_probe_ctx);
|
||||
--- a/src/probes/lttng-probe-compaction.c
|
||||
+++ b/src/probes/lttng-probe-compaction.c
|
||||
@@ -10,6 +10,11 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <lttng/tracer.h>
|
||||
+#include <lttng/kernel-version.h>
|
||||
+
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
|
||||
+#include "../mm/internal.h"
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Create the tracepoint static inlines from the kernel to validate that our
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7cf1acbb50b84116acc9b4281b81dcc2643d6018bbd1e8514ad1270239896c4b
|
||||
size 343593
|
@@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmI+BLgACgkQFygKl4EY
|
||||
as8IEgf9H4Be43BMOnWIaWzVGkJThxoLxqfAIyaGdhpHnWotBf5CWSeffPPGkeur
|
||||
7Y56QipQ3mKeCBfIjLwMs/5v4Y4x+5/QeneTAZYj9KbYzWikZaQ3lRQCsKH44UvC
|
||||
+Lv4GrcfXFi6LcDWovdPhve0YYRqD6HpPluQtQdrjiBoWX8IC2IRYdVyvtInEpLR
|
||||
df3+q0TWkwJUMfNWcnoJscqJw7TRFgp1srYyqPQsOQm45s/X5lLfu+97/7UPL6J+
|
||||
CvIcWAwDsAtMzAj5BmfJDpx1K5r4viA43UO+IAhihWc9iRJKVpMGjIiFq6C3fVC9
|
||||
J/6Ef/3KrYA5e55Ub2HnfoYDJv6w1g==
|
||||
=ITxD
|
||||
-----END PGP SIGNATURE-----
|
3
lttng-modules-2.13.4.tar.bz2
Normal file
3
lttng-modules-2.13.4.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6159d00e4e1d59546eec8d4a67e1aa39c1084ceb5e5afeb666eab4b8a5b5a9ee
|
||||
size 344507
|
11
lttng-modules-2.13.4.tar.bz2.asc
Normal file
11
lttng-modules-2.13.4.tar.bz2.asc
Normal file
@@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmKaW9UACgkQFygKl4EY
|
||||
as+RmwgAvm5oHhVfHoECf9m+GdjMcfpVXbJBJUVM8cjWbpt7T5UnU+7+sAB3WAK1
|
||||
2AdWl2cnikd9172oOvYvmZKEHxQ1DAFRqVpLonS7cCXFs5lED67TSfkw7L4bK8FL
|
||||
esK9w5Wgv7AOrK5fBJibpmi2KjP5+rFbFSTB+s1+IcqGuuiQrD952H/14+QIRvLX
|
||||
2lJr1O/KukVVgp+jeti3uZDH9HstmwHClT1scYh40WW9adbieALBPjw0HsROT7Gg
|
||||
w8lu5Dv1c+Tb4Z0j11cXHOhX8U1pxrlmBOndHfYFjhfQdACqOVnj+MbC/bTyyd8+
|
||||
daJwBYZfqGdYhoExQYduPJGhuARI5g==
|
||||
=O+x+
|
||||
-----END PGP SIGNATURE-----
|
@@ -1,18 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 3 15:26:37 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
Fri Jun 3 20:12:25 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
|
||||
- Add lttng-modules-2.13.3-linux-5.18.patch: back-port commits
|
||||
cbd56a97eef64e838f0f9013029980e0325cf450,
|
||||
0b5481b70c6127b72e88787245a54bcdf2839993,
|
||||
f9e76ad2bef7b04d8c51c2b5ac716b081e856d4f,
|
||||
aaf6547b534309da88219031ceab0c105f5bf1e5,
|
||||
9d73dde32aef0a0693e46c3aa1e6bf69e3888312,
|
||||
9a237aa9f8c17215b688aa73d0c768430e6f6d20,
|
||||
d7916cc4ea066bdcdfeb0d98964f9d6b39dd6c73,
|
||||
4bc54914836f765470e487f832398072a6f1372b,
|
||||
f375408318b54e6966c3e4d060e01cced4dfe273,
|
||||
8d0f85bebd8ab56d8b09a91b58e80cdc5b0822bd
|
||||
for Linux 5.18 compatibility.
|
||||
- Update to version 2.13.4:
|
||||
* Fix: event notifier: racy use of last subbuffer record.
|
||||
* Fix: bytecode interpreter context_get_index() leaves byte
|
||||
order uninitialised.
|
||||
* Fix: "random" tracepoints removed in stable kernels.
|
||||
* Fix: random: remove unused tracepoints (v5.10, v5.15).
|
||||
* Fix: sched/tracing: Append prev_state to tp args instead
|
||||
(v5.18).
|
||||
* Fix: mm: compaction: cleanup the compaction trace events
|
||||
(v5.18).
|
||||
* Fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18).
|
||||
* Fix: kprobes: Use rethook for kretprobe if possible (v5.18).
|
||||
* Fix: random: remove unused tracepoints (v5.18).
|
||||
* Fix: scsi: block: Remove REQ_OP_WRITE_SAME support (v5.18).
|
||||
* Fix: block: remove genhd.h (v5.18).
|
||||
* Fix: sched/tracing: Don't re-read p->state when emitting
|
||||
sched_switch event (v5.18).
|
||||
* Fix: KVM: x86: Unexport kvm_x86_ops (v5.18).
|
||||
* Fix: do not warn on unknown counter ioctl.
|
||||
* Fix: tracepoint event: allow same provider and event name.
|
||||
* Fix: compaction migratepages event name.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 18 20:23:14 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
@@ -547,4 +556,3 @@ Mon Feb 27 22:42:24 UTC 2012 - tonyj@suse.com
|
||||
Wed Jan 4 19:59:26 UTC 2012 - tonyj@suse.com
|
||||
|
||||
- Update to version 2.0-pre11
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: lttng-modules
|
||||
Version: 2.13.3
|
||||
Version: 2.13.4
|
||||
Release: 0
|
||||
Summary: Licensing information for package lttng-modules
|
||||
License: GPL-2.0-only AND LGPL-2.1-only AND MIT
|
||||
@@ -28,8 +28,6 @@ Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2
|
||||
Source2: %{name}.keyring
|
||||
Source3: %{name}-preamble
|
||||
Source4: Module.supported
|
||||
# PATCH-FIX-UPSTREAM lttng-modules-2.13.3-linux-5.18.patch -- Linux 5.18 compatibility.
|
||||
Patch0: lttng-modules-2.13.3-linux-5.18.patch
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
ExclusiveArch: %ix86 x86_64 armv7l aarch64 riscv64 ppc64 ppc64le
|
||||
|
||||
@@ -39,7 +37,7 @@ This package provides licensing documentation for the lttng kmp packages.
|
||||
%kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
|
||||
set -- *
|
||||
mkdir source obj
|
||||
|
Reference in New Issue
Block a user