| Message ID | 1435928310-15938-5-git-send-email-javi.merino@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, 3 Jul 2015 13:58:30 +0100 Javi Merino <javi.merino@arm.com> wrote: > @@ -142,6 +144,10 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd > /* Get static power */ > static_power = get_static_power(dfc, freq); > > + load = (100 * status->busy_time) / status->total_time; When tracing is disabled, this division will still be done. Why not just pass in status, and have the load calculated in the tracepoint TP_fast_assign() ? > + trace_thermal_power_devfreq_get_power(cdev, freq, load, dyn_power, > + static_power); > + > *power = dyn_power + static_power; > > return 0; > @@ -195,6 +201,7 @@ static int devfreq_cooling_power2state(struct thermal_cooling_device *cdev, > break; > > *state = i; > + trace_thermal_power_devfreq_limit(cdev, freq, *state, power); > return 0; > } > > diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h > index 8b1f80682b80..ffa870c0d2d2 100644 > --- a/include/trace/events/thermal.h > +++ b/include/trace/events/thermal.h > @@ -135,6 +135,57 @@ TRACE_EVENT(thermal_power_cpu_limit, > __entry->power) > ); > > +TRACE_EVENT(thermal_power_devfreq_get_power, > + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, > + u32 load, u32 dynamic_power, u32 static_power), > + > + TP_ARGS(cdev, freq, load, dynamic_power, static_power), > + > + TP_STRUCT__entry( > + __string(type, cdev->type ) > + __field(unsigned long, freq ) > + __field(u32, load ) > + __field(u32, dynamic_power ) > + __field(u32, static_power ) > + ), > + > + TP_fast_assign( > + __assign_str(type, cdev->type); > + __entry->freq = freq; > + __entry->load = load; __entry->load = (100 * status->busy_time) / status->total_time; -- Steve > + __entry->dynamic_power = dynamic_power; > + __entry->static_power = static_power; > + ), > + > + TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u", > + __get_str(type), __entry->freq, > + __entry->load, __entry->dynamic_power, __entry->static_power) > +); > + > +TRACE_EVENT(thermal_power_devfreq_limit, > + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, > + unsigned long cdev_state, u32 power), > + > + TP_ARGS(cdev, freq, cdev_state, power), > + > + TP_STRUCT__entry( > + __string(type, cdev->type) > + __field(unsigned int, freq ) > + __field(unsigned long, cdev_state) > + __field(u32, power ) > + ), > + > + TP_fast_assign( > + __assign_str(type, cdev->type); > + __entry->freq = freq; > + __entry->cdev_state = cdev_state; > + __entry->power = power; > + ), > + > + TP_printk("type=%s freq=%u cdev_state=%lu power=%u", > + __get_str(type), __entry->freq, __entry->cdev_state, > + __entry->power) > +); > #endif /* _TRACE_THERMAL_H */ > > /* This part must be outside protection */ -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 06, 2015 at 07:58:43PM +0100, Steven Rostedt wrote: > On Fri, 3 Jul 2015 13:58:30 +0100 > Javi Merino <javi.merino@arm.com> wrote: > > > > @@ -142,6 +144,10 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd > > /* Get static power */ > > static_power = get_static_power(dfc, freq); > > > > + load = (100 * status->busy_time) / status->total_time; > > When tracing is disabled, this division will still be done. > > Why not just pass in status, and have the load calculated in the > tracepoint TP_fast_assign() ? Yes, no point doing it here. I'll move it to the tracepoint's code. Thanks for the review, Javi > > + trace_thermal_power_devfreq_get_power(cdev, freq, load, dyn_power, > > + static_power); > > + > > *power = dyn_power + static_power; > > > > return 0; > > @@ -195,6 +201,7 @@ static int devfreq_cooling_power2state(struct thermal_cooling_device *cdev, > > break; > > > > *state = i; > > + trace_thermal_power_devfreq_limit(cdev, freq, *state, power); > > return 0; > > } > > > > diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h > > index 8b1f80682b80..ffa870c0d2d2 100644 > > --- a/include/trace/events/thermal.h > > +++ b/include/trace/events/thermal.h > > @@ -135,6 +135,57 @@ TRACE_EVENT(thermal_power_cpu_limit, > > __entry->power) > > ); > > > > +TRACE_EVENT(thermal_power_devfreq_get_power, > > + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, > > + u32 load, u32 dynamic_power, u32 static_power), > > + > > + TP_ARGS(cdev, freq, load, dynamic_power, static_power), > > + > > + TP_STRUCT__entry( > > + __string(type, cdev->type ) > > + __field(unsigned long, freq ) > > + __field(u32, load ) > > + __field(u32, dynamic_power ) > > + __field(u32, static_power ) > > + ), > > + > > + TP_fast_assign( > > + __assign_str(type, cdev->type); > > + __entry->freq = freq; > > + __entry->load = load; > > __entry->load = (100 * status->busy_time) / status->total_time; > > -- Steve > > > + __entry->dynamic_power = dynamic_power; > > + __entry->static_power = static_power; > > + ), > > + > > + TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u", > > + __get_str(type), __entry->freq, > > + __entry->load, __entry->dynamic_power, __entry->static_power) > > +); > > + > > +TRACE_EVENT(thermal_power_devfreq_limit, > > + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, > > + unsigned long cdev_state, u32 power), > > + > > + TP_ARGS(cdev, freq, cdev_state, power), > > + > > + TP_STRUCT__entry( > > + __string(type, cdev->type) > > + __field(unsigned int, freq ) > > + __field(unsigned long, cdev_state) > > + __field(u32, power ) > > + ), > > + > > + TP_fast_assign( > > + __assign_str(type, cdev->type); > > + __entry->freq = freq; > > + __entry->cdev_state = cdev_state; > > + __entry->power = power; > > + ), > > + > > + TP_printk("type=%s freq=%u cdev_state=%lu power=%u", > > + __get_str(type), __entry->freq, __entry->cdev_state, > > + __entry->power) > > +); > > #endif /* _TRACE_THERMAL_H */ > > > > /* This part must be outside protection */ > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index ee7b84ecd0c0..30b9e7f6556d 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -21,6 +21,8 @@ #include <linux/pm_opp.h> #include <linux/thermal.h> +#include <trace/events/thermal.h> + static int devfreq_cooling_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state) { @@ -127,7 +129,7 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd struct devfreq_dev_status *status = &df->last_status; unsigned long state; unsigned long freq = status->current_frequency; - u32 dyn_power, static_power; + u32 load, dyn_power, static_power; /* Get dynamic power for state */ state = freq_get_state(df, freq); @@ -142,6 +144,10 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd /* Get static power */ static_power = get_static_power(dfc, freq); + load = (100 * status->busy_time) / status->total_time; + trace_thermal_power_devfreq_get_power(cdev, freq, load, dyn_power, + static_power); + *power = dyn_power + static_power; return 0; @@ -195,6 +201,7 @@ static int devfreq_cooling_power2state(struct thermal_cooling_device *cdev, break; *state = i; + trace_thermal_power_devfreq_limit(cdev, freq, *state, power); return 0; } diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h index 8b1f80682b80..ffa870c0d2d2 100644 --- a/include/trace/events/thermal.h +++ b/include/trace/events/thermal.h @@ -135,6 +135,57 @@ TRACE_EVENT(thermal_power_cpu_limit, __entry->power) ); +TRACE_EVENT(thermal_power_devfreq_get_power, + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, + u32 load, u32 dynamic_power, u32 static_power), + + TP_ARGS(cdev, freq, load, dynamic_power, static_power), + + TP_STRUCT__entry( + __string(type, cdev->type ) + __field(unsigned long, freq ) + __field(u32, load ) + __field(u32, dynamic_power ) + __field(u32, static_power ) + ), + + TP_fast_assign( + __assign_str(type, cdev->type); + __entry->freq = freq; + __entry->load = load; + __entry->dynamic_power = dynamic_power; + __entry->static_power = static_power; + ), + + TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u", + __get_str(type), __entry->freq, + __entry->load, __entry->dynamic_power, __entry->static_power) +); + +TRACE_EVENT(thermal_power_devfreq_limit, + TP_PROTO(struct thermal_cooling_device *cdev, unsigned long freq, + unsigned long cdev_state, u32 power), + + TP_ARGS(cdev, freq, cdev_state, power), + + TP_STRUCT__entry( + __string(type, cdev->type) + __field(unsigned int, freq ) + __field(unsigned long, cdev_state) + __field(u32, power ) + ), + + TP_fast_assign( + __assign_str(type, cdev->type); + __entry->freq = freq; + __entry->cdev_state = cdev_state; + __entry->power = power; + ), + + TP_printk("type=%s freq=%u cdev_state=%lu power=%u", + __get_str(type), __entry->freq, __entry->cdev_state, + __entry->power) +); #endif /* _TRACE_THERMAL_H */ /* This part must be outside protection */
Tracing is useful for debugging and performance tuning. Add similar traces to what's present in the cpu cooling device. Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@redhat.com> Signed-off-by: Javi Merino <javi.merino@arm.com> --- drivers/thermal/devfreq_cooling.c | 9 ++++++- include/trace/events/thermal.h | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-)