Add trace events for the power allocator governor and the power actor interface of the cpu cooling device.
Cc: Zhang Rui <rui.zh...@intel.com> Cc: Eduardo Valentin <edubez...@gmail.com> Cc: Steven Rostedt <rost...@goodmis.org> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Ingo Molnar <mi...@redhat.com> Signed-off-by: Javi Merino <javi.mer...@arm.com> --- trace-cmd needs the patched attached in http://article.gmane.org/gmane.linux.kernel/1704423 for this to work. drivers/thermal/power_actor/cpu_actor.c | 5 ++++ drivers/thermal/power_allocator.c | 12 +++++++++- include/trace/events/thermal.h | 38 +++++++++++++++++++++++++++++++ include/trace/events/thermal_governor.h | 35 ++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 include/trace/events/thermal.h create mode 100644 include/trace/events/thermal_governor.h diff --git a/drivers/thermal/power_actor/cpu_actor.c b/drivers/thermal/power_actor/cpu_actor.c index 0d76d52609fa..61f1edc13ec2 100644 --- a/drivers/thermal/power_actor/cpu_actor.c +++ b/drivers/thermal/power_actor/cpu_actor.c @@ -27,6 +27,9 @@ #include <linux/printk.h> #include <linux/slab.h> +#define CREATE_TRACE_POINTS +#include <trace/events/thermal.h> + #include "power_actor.h" /** @@ -188,6 +191,8 @@ static int cpu_set_power(struct power_actor *actor, u32 power) return -EINVAL; } + trace_thermal_power_limit(&cpu_actor->cpumask, freq, cdev_state, power); + return cdev->ops->set_cur_state(cdev, cdev_state); } diff --git a/drivers/thermal/power_allocator.c b/drivers/thermal/power_allocator.c index 836c834a898c..b1ebcecb1c15 100644 --- a/drivers/thermal/power_allocator.c +++ b/drivers/thermal/power_allocator.c @@ -19,6 +19,9 @@ #include <linux/slab.h> #include <linux/thermal.h> +#define CREATE_TRACE_POINTS +#include <trace/events/thermal_governor.h> + #include "power_actor/power_actor.h" #include "thermal_core.h" @@ -117,7 +120,14 @@ static u32 pi_controller(struct thermal_zone_device *tz, power_range = tz->tzp->max_dissipatable_power + frac_to_int(power_range); - return clamp(power_range, (s64)0, (s64)max_allocatable_power); + power_range = clamp(power_range, (s64)0, (s64)max_allocatable_power); + + trace_thermal_power_allocator_pi(frac_to_int(err), + frac_to_int(params->err_integral), + frac_to_int(p), frac_to_int(i), + power_range); + + return power_range; } /** diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h new file mode 100644 index 000000000000..6496da62276d --- /dev/null +++ b/include/trace/events/thermal.h @@ -0,0 +1,38 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM thermal + +#if !defined(_TRACE_THERMAL_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_THERMAL_H + +#include <linux/tracepoint.h> + +TRACE_EVENT(thermal_power_limit, + TP_PROTO(const struct cpumask *cpus, unsigned int freq, + unsigned long cdev_state, unsigned long power), + + TP_ARGS(cpus, freq, cdev_state, power), + + TP_STRUCT__entry( + __bitmask(cpumask, num_possible_cpus()) + __field(unsigned int, freq ) + __field(unsigned long, cdev_state) + __field(unsigned long, power ) + ), + + TP_fast_assign( + __assign_bitmask(cpumask, cpumask_bits(cpus), + num_possible_cpus()); + __entry->freq = freq; + __entry->cdev_state = cdev_state; + __entry->power = power; + ), + + TP_printk("cpus=%s freq=%u cdev_state=%lu power=%lu", + __get_bitmask(cpumask), __entry->freq, __entry->cdev_state, + __entry->power) +); + +#endif /* _TRACE_THERMAL_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> diff --git a/include/trace/events/thermal_governor.h b/include/trace/events/thermal_governor.h new file mode 100644 index 000000000000..1fbf5c91f659 --- /dev/null +++ b/include/trace/events/thermal_governor.h @@ -0,0 +1,35 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM thermal_governor + +#if !defined(_TRACE_THERMAL_GOVERNOR_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_THERMAL_GOVERNOR_H + +#include <linux/tracepoint.h> + +TRACE_EVENT(thermal_power_allocator_pi, + TP_PROTO(s32 err, s32 err_integral, s64 p, s64 i, s32 output), + TP_ARGS(err, err_integral, p, i, output), + TP_STRUCT__entry( + __field(s32, err ) + __field(s32, err_integral) + __field(s64, p ) + __field(s64, i ) + __field(s32, output ) + ), + TP_fast_assign( + __entry->err = err; + __entry->err_integral = err_integral; + __entry->p = p; + __entry->i = i; + __entry->output = output; + ), + + TP_printk("err=%d err_integral=%d p=%lld i=%lld output=%d", + __entry->err, __entry->err_integral, + __entry->p, __entry->i, __entry->output) +); + +#endif /* _TRACE_THERMAL_GOVERNOR_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
