mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
bf44f488e1
Discussion in the below link reported that symbols in modules can appear
to be before _stext on ARM architecture, causing wrapping with the
offsets of this tracepoint. Change the offset type to s32 to fix this.
Link: http://lore.kernel.org/r/20191127154428.191095-1-antonio.borneo@st.com
Link: http://lkml.kernel.org/r/20200102194625.226436-1-joel@joelfernandes.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Antonio Borneo <antonio.borneo@st.com>
Cc: stable@vger.kernel.org
Fixes: d59158162e ("tracing: Add support for preempt and irq enable/disable events")
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
#ifdef CONFIG_PREEMPTIRQ_TRACEPOINTS
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM preemptirq
|
|
|
|
#if !defined(_TRACE_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_PREEMPTIRQ_H
|
|
|
|
#include <linux/ktime.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/string.h>
|
|
#include <asm/sections.h>
|
|
|
|
DECLARE_EVENT_CLASS(preemptirq_template,
|
|
|
|
TP_PROTO(unsigned long ip, unsigned long parent_ip),
|
|
|
|
TP_ARGS(ip, parent_ip),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(s32, caller_offs)
|
|
__field(s32, parent_offs)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->caller_offs = (s32)(ip - (unsigned long)_stext);
|
|
__entry->parent_offs = (s32)(parent_ip - (unsigned long)_stext);
|
|
),
|
|
|
|
TP_printk("caller=%pS parent=%pS",
|
|
(void *)((unsigned long)(_stext) + __entry->caller_offs),
|
|
(void *)((unsigned long)(_stext) + __entry->parent_offs))
|
|
);
|
|
|
|
#ifdef CONFIG_TRACE_IRQFLAGS
|
|
DEFINE_EVENT(preemptirq_template, irq_disable,
|
|
TP_PROTO(unsigned long ip, unsigned long parent_ip),
|
|
TP_ARGS(ip, parent_ip));
|
|
|
|
DEFINE_EVENT(preemptirq_template, irq_enable,
|
|
TP_PROTO(unsigned long ip, unsigned long parent_ip),
|
|
TP_ARGS(ip, parent_ip));
|
|
#else
|
|
#define trace_irq_enable(...)
|
|
#define trace_irq_disable(...)
|
|
#define trace_irq_enable_rcuidle(...)
|
|
#define trace_irq_disable_rcuidle(...)
|
|
#endif
|
|
|
|
#ifdef CONFIG_TRACE_PREEMPT_TOGGLE
|
|
DEFINE_EVENT(preemptirq_template, preempt_disable,
|
|
TP_PROTO(unsigned long ip, unsigned long parent_ip),
|
|
TP_ARGS(ip, parent_ip));
|
|
|
|
DEFINE_EVENT(preemptirq_template, preempt_enable,
|
|
TP_PROTO(unsigned long ip, unsigned long parent_ip),
|
|
TP_ARGS(ip, parent_ip));
|
|
#else
|
|
#define trace_preempt_enable(...)
|
|
#define trace_preempt_disable(...)
|
|
#define trace_preempt_enable_rcuidle(...)
|
|
#define trace_preempt_disable_rcuidle(...)
|
|
#endif
|
|
|
|
#endif /* _TRACE_PREEMPTIRQ_H */
|
|
|
|
#include <trace/define_trace.h>
|
|
|
|
#else /* !CONFIG_PREEMPTIRQ_TRACEPOINTS */
|
|
#define trace_irq_enable(...)
|
|
#define trace_irq_disable(...)
|
|
#define trace_irq_enable_rcuidle(...)
|
|
#define trace_irq_disable_rcuidle(...)
|
|
#define trace_preempt_enable(...)
|
|
#define trace_preempt_disable(...)
|
|
#define trace_preempt_enable_rcuidle(...)
|
|
#define trace_preempt_disable_rcuidle(...)
|
|
#endif
|