mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 15:11:31 +00:00
e382608254
"monitonic raw". Also some enhancements to make the ring buffer even
faster. But the biggest and most noticeable change is the renaming of
the ftrace* files, structures and variables that have to deal with
trace events.
Over the years I've had several developers tell me about their confusion
with what ftrace is compared to events. Technically, "ftrace" is the
infrastructure to do the function hooks, which include tracing and also
helps with live kernel patching. But the trace events are a separate
entity altogether, and the files that affect the trace events should
not be named "ftrace". These include:
include/trace/ftrace.h -> include/trace/trace_events.h
include/linux/ftrace_event.h -> include/linux/trace_events.h
Also, functions that are specific for trace events have also been renamed:
ftrace_print_*() -> trace_print_*()
(un)register_ftrace_event() -> (un)register_trace_event()
ftrace_event_name() -> trace_event_name()
ftrace_trigger_soft_disabled()-> trace_trigger_soft_disabled()
ftrace_define_fields_##call() -> trace_define_fields_##call()
ftrace_get_offsets_##call() -> trace_get_offsets_##call()
Structures have been renamed:
ftrace_event_file -> trace_event_file
ftrace_event_{call,class} -> trace_event_{call,class}
ftrace_event_buffer -> trace_event_buffer
ftrace_subsystem_dir -> trace_subsystem_dir
ftrace_event_raw_##call -> trace_event_raw_##call
ftrace_event_data_offset_##call-> trace_event_data_offset_##call
ftrace_event_type_funcs_##call -> trace_event_type_funcs_##call
And a few various variables and flags have also been updated.
This has been sitting in linux-next for some time, and I have not heard
a single complaint about this rename breaking anything. Mostly because
these functions, variables and structures are mostly internal to the
tracing system and are seldom (if ever) used by anything external to that.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJViYhVAAoJEEjnJuOKh9ldcJ0IAI+mytwoMAN/CWDE8pXrTrgs
aHlcr1zorSzZ0Lq6lKsWP+V0VGVhP8KWO16vl35HaM5ZB9U+cDzWiGobI8JTHi/3
eeTAPTjQdgrr/L+ZO1ApzS1jYPhN3Xi5L7xublcYMJjKfzU+bcYXg/x8gRt0QbG3
S9QN/kBt0JIIjT7McN64m5JVk2OiU36LxXxwHgCqJvVCPHUrriAdIX7Z5KRpEv13
zxgCN4d7Jiec/FsMW8dkO0vRlVAvudZWLL7oDmdsvNhnLy8nE79UOeHos2c1qifQ
LV4DeQ+2Hlu7w9wxixHuoOgNXDUEiQPJXzPc/CuCahiTL9N/urQSGQDoOVMltR4=
=hkdz
-----END PGP SIGNATURE-----
Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing updates from Steven Rostedt:
"This patch series contains several clean ups and even a new trace
clock "monitonic raw". Also some enhancements to make the ring buffer
even faster. But the biggest and most noticeable change is the
renaming of the ftrace* files, structures and variables that have to
deal with trace events.
Over the years I've had several developers tell me about their
confusion with what ftrace is compared to events. Technically,
"ftrace" is the infrastructure to do the function hooks, which include
tracing and also helps with live kernel patching. But the trace
events are a separate entity altogether, and the files that affect the
trace events should not be named "ftrace". These include:
include/trace/ftrace.h -> include/trace/trace_events.h
include/linux/ftrace_event.h -> include/linux/trace_events.h
Also, functions that are specific for trace events have also been renamed:
ftrace_print_*() -> trace_print_*()
(un)register_ftrace_event() -> (un)register_trace_event()
ftrace_event_name() -> trace_event_name()
ftrace_trigger_soft_disabled() -> trace_trigger_soft_disabled()
ftrace_define_fields_##call() -> trace_define_fields_##call()
ftrace_get_offsets_##call() -> trace_get_offsets_##call()
Structures have been renamed:
ftrace_event_file -> trace_event_file
ftrace_event_{call,class} -> trace_event_{call,class}
ftrace_event_buffer -> trace_event_buffer
ftrace_subsystem_dir -> trace_subsystem_dir
ftrace_event_raw_##call -> trace_event_raw_##call
ftrace_event_data_offset_##call-> trace_event_data_offset_##call
ftrace_event_type_funcs_##call -> trace_event_type_funcs_##call
And a few various variables and flags have also been updated.
This has been sitting in linux-next for some time, and I have not
heard a single complaint about this rename breaking anything. Mostly
because these functions, variables and structures are mostly internal
to the tracing system and are seldom (if ever) used by anything
external to that"
* tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)
ring_buffer: Allow to exit the ring buffer benchmark immediately
ring-buffer-benchmark: Fix the wrong type
ring-buffer-benchmark: Fix the wrong param in module_param
ring-buffer: Add enum names for the context levels
ring-buffer: Remove useless unused tracing_off_permanent()
ring-buffer: Give NMIs a chance to lock the reader_lock
ring-buffer: Add trace_recursive checks to ring_buffer_write()
ring-buffer: Allways do the trace_recursive checks
ring-buffer: Move recursive check to per_cpu descriptor
ring-buffer: Add unlikelys to make fast path the default
tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()
tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()
tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##call
tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call
tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call
tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*
tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dir
tracing: Rename ftrace_event_name() to trace_event_name()
tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX
...
483 lines
11 KiB
C
483 lines
11 KiB
C
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM power
|
|
|
|
#if !defined(_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_POWER_H
|
|
|
|
#include <linux/ktime.h>
|
|
#include <linux/pm_qos.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/trace_events.h>
|
|
|
|
#define TPS(x) tracepoint_string(x)
|
|
|
|
DECLARE_EVENT_CLASS(cpu,
|
|
|
|
TP_PROTO(unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(state, cpu_id),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u32, state )
|
|
__field( u32, cpu_id )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("state=%lu cpu_id=%lu", (unsigned long)__entry->state,
|
|
(unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(cpu, cpu_idle,
|
|
|
|
TP_PROTO(unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(state, cpu_id)
|
|
);
|
|
|
|
TRACE_EVENT(pstate_sample,
|
|
|
|
TP_PROTO(u32 core_busy,
|
|
u32 scaled_busy,
|
|
u32 from,
|
|
u32 to,
|
|
u64 mperf,
|
|
u64 aperf,
|
|
u64 tsc,
|
|
u32 freq
|
|
),
|
|
|
|
TP_ARGS(core_busy,
|
|
scaled_busy,
|
|
from,
|
|
to,
|
|
mperf,
|
|
aperf,
|
|
tsc,
|
|
freq
|
|
),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u32, core_busy)
|
|
__field(u32, scaled_busy)
|
|
__field(u32, from)
|
|
__field(u32, to)
|
|
__field(u64, mperf)
|
|
__field(u64, aperf)
|
|
__field(u64, tsc)
|
|
__field(u32, freq)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->core_busy = core_busy;
|
|
__entry->scaled_busy = scaled_busy;
|
|
__entry->from = from;
|
|
__entry->to = to;
|
|
__entry->mperf = mperf;
|
|
__entry->aperf = aperf;
|
|
__entry->tsc = tsc;
|
|
__entry->freq = freq;
|
|
),
|
|
|
|
TP_printk("core_busy=%lu scaled=%lu from=%lu to=%lu mperf=%llu aperf=%llu tsc=%llu freq=%lu ",
|
|
(unsigned long)__entry->core_busy,
|
|
(unsigned long)__entry->scaled_busy,
|
|
(unsigned long)__entry->from,
|
|
(unsigned long)__entry->to,
|
|
(unsigned long long)__entry->mperf,
|
|
(unsigned long long)__entry->aperf,
|
|
(unsigned long long)__entry->tsc,
|
|
(unsigned long)__entry->freq
|
|
)
|
|
|
|
);
|
|
|
|
/* This file can get included multiple times, TRACE_HEADER_MULTI_READ at top */
|
|
#ifndef _PWR_EVENT_AVOID_DOUBLE_DEFINING
|
|
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING
|
|
|
|
#define PWR_EVENT_EXIT -1
|
|
#endif
|
|
|
|
#define pm_verb_symbolic(event) \
|
|
__print_symbolic(event, \
|
|
{ PM_EVENT_SUSPEND, "suspend" }, \
|
|
{ PM_EVENT_RESUME, "resume" }, \
|
|
{ PM_EVENT_FREEZE, "freeze" }, \
|
|
{ PM_EVENT_QUIESCE, "quiesce" }, \
|
|
{ PM_EVENT_HIBERNATE, "hibernate" }, \
|
|
{ PM_EVENT_THAW, "thaw" }, \
|
|
{ PM_EVENT_RESTORE, "restore" }, \
|
|
{ PM_EVENT_RECOVER, "recover" })
|
|
|
|
DEFINE_EVENT(cpu, cpu_frequency,
|
|
|
|
TP_PROTO(unsigned int frequency, unsigned int cpu_id),
|
|
|
|
TP_ARGS(frequency, cpu_id)
|
|
);
|
|
|
|
TRACE_EVENT(device_pm_callback_start,
|
|
|
|
TP_PROTO(struct device *dev, const char *pm_ops, int event),
|
|
|
|
TP_ARGS(dev, pm_ops, event),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(dev))
|
|
__string(driver, dev_driver_string(dev))
|
|
__string(parent, dev->parent ? dev_name(dev->parent) : "none")
|
|
__string(pm_ops, pm_ops ? pm_ops : "none ")
|
|
__field(int, event)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device, dev_name(dev));
|
|
__assign_str(driver, dev_driver_string(dev));
|
|
__assign_str(parent,
|
|
dev->parent ? dev_name(dev->parent) : "none");
|
|
__assign_str(pm_ops, pm_ops ? pm_ops : "none ");
|
|
__entry->event = event;
|
|
),
|
|
|
|
TP_printk("%s %s, parent: %s, %s[%s]", __get_str(driver),
|
|
__get_str(device), __get_str(parent), __get_str(pm_ops),
|
|
pm_verb_symbolic(__entry->event))
|
|
);
|
|
|
|
TRACE_EVENT(device_pm_callback_end,
|
|
|
|
TP_PROTO(struct device *dev, int error),
|
|
|
|
TP_ARGS(dev, error),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(device, dev_name(dev))
|
|
__string(driver, dev_driver_string(dev))
|
|
__field(int, error)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(device, dev_name(dev));
|
|
__assign_str(driver, dev_driver_string(dev));
|
|
__entry->error = error;
|
|
),
|
|
|
|
TP_printk("%s %s, err=%d",
|
|
__get_str(driver), __get_str(device), __entry->error)
|
|
);
|
|
|
|
TRACE_EVENT(suspend_resume,
|
|
|
|
TP_PROTO(const char *action, int val, bool start),
|
|
|
|
TP_ARGS(action, val, start),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(const char *, action)
|
|
__field(int, val)
|
|
__field(bool, start)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->action = action;
|
|
__entry->val = val;
|
|
__entry->start = start;
|
|
),
|
|
|
|
TP_printk("%s[%u] %s", __entry->action, (unsigned int)__entry->val,
|
|
(__entry->start)?"begin":"end")
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(wakeup_source,
|
|
|
|
TP_PROTO(const char *name, unsigned int state),
|
|
|
|
TP_ARGS(name, state),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, name )
|
|
__field( u64, state )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->state = state;
|
|
),
|
|
|
|
TP_printk("%s state=0x%lx", __get_str(name),
|
|
(unsigned long)__entry->state)
|
|
);
|
|
|
|
DEFINE_EVENT(wakeup_source, wakeup_source_activate,
|
|
|
|
TP_PROTO(const char *name, unsigned int state),
|
|
|
|
TP_ARGS(name, state)
|
|
);
|
|
|
|
DEFINE_EVENT(wakeup_source, wakeup_source_deactivate,
|
|
|
|
TP_PROTO(const char *name, unsigned int state),
|
|
|
|
TP_ARGS(name, state)
|
|
);
|
|
|
|
/*
|
|
* The clock events are used for clock enable/disable and for
|
|
* clock rate change
|
|
*/
|
|
DECLARE_EVENT_CLASS(clock,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, name )
|
|
__field( u64, state )
|
|
__field( u64, cpu_id )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),
|
|
(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(clock, clock_enable,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(clock, clock_disable,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(clock, clock_set_rate,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
/*
|
|
* The power domain events are used for power domains transitions
|
|
*/
|
|
DECLARE_EVENT_CLASS(power_domain,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, name )
|
|
__field( u64, state )
|
|
__field( u64, cpu_id )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),
|
|
(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(power_domain, power_domain_target,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
/*
|
|
* The pm qos events are used for pm qos update
|
|
*/
|
|
DECLARE_EVENT_CLASS(pm_qos_request,
|
|
|
|
TP_PROTO(int pm_qos_class, s32 value),
|
|
|
|
TP_ARGS(pm_qos_class, value),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, pm_qos_class )
|
|
__field( s32, value )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->pm_qos_class = pm_qos_class;
|
|
__entry->value = value;
|
|
),
|
|
|
|
TP_printk("pm_qos_class=%s value=%d",
|
|
__print_symbolic(__entry->pm_qos_class,
|
|
{ PM_QOS_CPU_DMA_LATENCY, "CPU_DMA_LATENCY" },
|
|
{ PM_QOS_NETWORK_LATENCY, "NETWORK_LATENCY" },
|
|
{ PM_QOS_NETWORK_THROUGHPUT, "NETWORK_THROUGHPUT" }),
|
|
__entry->value)
|
|
);
|
|
|
|
DEFINE_EVENT(pm_qos_request, pm_qos_add_request,
|
|
|
|
TP_PROTO(int pm_qos_class, s32 value),
|
|
|
|
TP_ARGS(pm_qos_class, value)
|
|
);
|
|
|
|
DEFINE_EVENT(pm_qos_request, pm_qos_update_request,
|
|
|
|
TP_PROTO(int pm_qos_class, s32 value),
|
|
|
|
TP_ARGS(pm_qos_class, value)
|
|
);
|
|
|
|
DEFINE_EVENT(pm_qos_request, pm_qos_remove_request,
|
|
|
|
TP_PROTO(int pm_qos_class, s32 value),
|
|
|
|
TP_ARGS(pm_qos_class, value)
|
|
);
|
|
|
|
TRACE_EVENT(pm_qos_update_request_timeout,
|
|
|
|
TP_PROTO(int pm_qos_class, s32 value, unsigned long timeout_us),
|
|
|
|
TP_ARGS(pm_qos_class, value, timeout_us),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, pm_qos_class )
|
|
__field( s32, value )
|
|
__field( unsigned long, timeout_us )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->pm_qos_class = pm_qos_class;
|
|
__entry->value = value;
|
|
__entry->timeout_us = timeout_us;
|
|
),
|
|
|
|
TP_printk("pm_qos_class=%s value=%d, timeout_us=%ld",
|
|
__print_symbolic(__entry->pm_qos_class,
|
|
{ PM_QOS_CPU_DMA_LATENCY, "CPU_DMA_LATENCY" },
|
|
{ PM_QOS_NETWORK_LATENCY, "NETWORK_LATENCY" },
|
|
{ PM_QOS_NETWORK_THROUGHPUT, "NETWORK_THROUGHPUT" }),
|
|
__entry->value, __entry->timeout_us)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(pm_qos_update,
|
|
|
|
TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
|
|
|
|
TP_ARGS(action, prev_value, curr_value),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( enum pm_qos_req_action, action )
|
|
__field( int, prev_value )
|
|
__field( int, curr_value )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->action = action;
|
|
__entry->prev_value = prev_value;
|
|
__entry->curr_value = curr_value;
|
|
),
|
|
|
|
TP_printk("action=%s prev_value=%d curr_value=%d",
|
|
__print_symbolic(__entry->action,
|
|
{ PM_QOS_ADD_REQ, "ADD_REQ" },
|
|
{ PM_QOS_UPDATE_REQ, "UPDATE_REQ" },
|
|
{ PM_QOS_REMOVE_REQ, "REMOVE_REQ" }),
|
|
__entry->prev_value, __entry->curr_value)
|
|
);
|
|
|
|
DEFINE_EVENT(pm_qos_update, pm_qos_update_target,
|
|
|
|
TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
|
|
|
|
TP_ARGS(action, prev_value, curr_value)
|
|
);
|
|
|
|
DEFINE_EVENT_PRINT(pm_qos_update, pm_qos_update_flags,
|
|
|
|
TP_PROTO(enum pm_qos_req_action action, int prev_value, int curr_value),
|
|
|
|
TP_ARGS(action, prev_value, curr_value),
|
|
|
|
TP_printk("action=%s prev_value=0x%x curr_value=0x%x",
|
|
__print_symbolic(__entry->action,
|
|
{ PM_QOS_ADD_REQ, "ADD_REQ" },
|
|
{ PM_QOS_UPDATE_REQ, "UPDATE_REQ" },
|
|
{ PM_QOS_REMOVE_REQ, "REMOVE_REQ" }),
|
|
__entry->prev_value, __entry->curr_value)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(dev_pm_qos_request,
|
|
|
|
TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
|
|
s32 new_value),
|
|
|
|
TP_ARGS(name, type, new_value),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, name )
|
|
__field( enum dev_pm_qos_req_type, type )
|
|
__field( s32, new_value )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name, name);
|
|
__entry->type = type;
|
|
__entry->new_value = new_value;
|
|
),
|
|
|
|
TP_printk("device=%s type=%s new_value=%d",
|
|
__get_str(name),
|
|
__print_symbolic(__entry->type,
|
|
{ DEV_PM_QOS_RESUME_LATENCY, "DEV_PM_QOS_RESUME_LATENCY" },
|
|
{ DEV_PM_QOS_FLAGS, "DEV_PM_QOS_FLAGS" }),
|
|
__entry->new_value)
|
|
);
|
|
|
|
DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_add_request,
|
|
|
|
TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
|
|
s32 new_value),
|
|
|
|
TP_ARGS(name, type, new_value)
|
|
);
|
|
|
|
DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_update_request,
|
|
|
|
TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
|
|
s32 new_value),
|
|
|
|
TP_ARGS(name, type, new_value)
|
|
);
|
|
|
|
DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_remove_request,
|
|
|
|
TP_PROTO(const char *name, enum dev_pm_qos_req_type type,
|
|
s32 new_value),
|
|
|
|
TP_ARGS(name, type, new_value)
|
|
);
|
|
#endif /* _TRACE_POWER_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|