mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
250d0c7754
We get a build error in the irqsoff tracer in some configurations:
kernel/trace/trace_irqsoff.c: In function 'trace_preempt_on':
kernel/trace/trace_irqsoff.c:855:2: error: implicit declaration of function 'trace_preempt_enable_rcuidle'; did you mean 'trace_irq_enable_rcuidle'? [-Werror=implicit-function-declaration]
trace_preempt_enable_rcuidle(a0, a1);
The problem is that trace_preempt_enable_rcuidle() has different
definition based on multiple Kconfig symbols, but not all combinations
have a valid definition.
This changes the conditions so that we always get exactly one
definition of each of the four tracing macros. I have not tried
to verify that these definitions are sensible, but now we
can build all randconfig combinations again.
Link: http://lkml.kernel.org/r/20171019083230.2450779-1-arnd@arndb.de
Fixes: d59158162e ("tracing: Add support for preempt and irq enable/disable events")
Acked-by: Joel Fernandes <joelaf@google.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
73 lines
2 KiB
C
73 lines
2 KiB
C
#ifdef CONFIG_PREEMPTIRQ_EVENTS
|
|
|
|
#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(u32, caller_offs)
|
|
__field(u32, parent_offs)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->caller_offs = (u32)(ip - (unsigned long)_stext);
|
|
__entry->parent_offs = (u32)(parent_ip - (unsigned long)_stext);
|
|
),
|
|
|
|
TP_printk("caller=%pF parent=%pF",
|
|
(void *)((unsigned long)(_stext) + __entry->caller_offs),
|
|
(void *)((unsigned long)(_stext) + __entry->parent_offs))
|
|
);
|
|
|
|
#ifndef CONFIG_PROVE_LOCKING
|
|
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));
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_PREEMPT
|
|
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));
|
|
#endif
|
|
|
|
#endif /* _TRACE_PREEMPTIRQ_H */
|
|
|
|
#include <trace/define_trace.h>
|
|
|
|
#endif /* !CONFIG_PREEMPTIRQ_EVENTS */
|
|
|
|
#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || defined(CONFIG_PROVE_LOCKING)
|
|
#define trace_irq_enable(...)
|
|
#define trace_irq_disable(...)
|
|
#define trace_irq_enable_rcuidle(...)
|
|
#define trace_irq_disable_rcuidle(...)
|
|
#endif
|
|
|
|
#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || !defined(CONFIG_DEBUG_PREEMPT)
|
|
#define trace_preempt_enable(...)
|
|
#define trace_preempt_disable(...)
|
|
#define trace_preempt_enable_rcuidle(...)
|
|
#define trace_preempt_disable_rcuidle(...)
|
|
#endif
|