diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 343d6accdc59..42ca4a20a9c4 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -51,6 +51,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -158,3 +159,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_uninterrupt_tasks); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_uninterrupt_tasks_done); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_report_bug); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_watchdog_timer_softlockup); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo_unfrozen); diff --git a/include/trace/hooks/power.h b/include/trace/hooks/power.h new file mode 100644 index 000000000000..fad46611a570 --- /dev/null +++ b/include/trace/hooks/power.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM power +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_POWER_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_POWER_H +#include + +struct task_struct; +DECLARE_HOOK(android_vh_try_to_freeze_todo, + TP_PROTO(unsigned int todo, unsigned int elapsed_msecs, bool wq_busy), + TP_ARGS(todo, elapsed_msecs, wq_busy)); + +DECLARE_HOOK(android_vh_try_to_freeze_todo_unfrozen, + TP_PROTO(struct task_struct *p), + TP_ARGS(p)); + +#endif /* _TRACE_HOOK_POWER_H */ +/* This part must be outside protection */ +#include diff --git a/kernel/power/process.c b/kernel/power/process.c index 8d681a65501c..319e4f7e40ad 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -20,6 +20,8 @@ #include #include +#include + /* * Timeout for stopping processes */ @@ -100,11 +102,15 @@ static int try_to_freeze_tasks(bool user_only) if (pm_debug_messages_on) { read_lock(&tasklist_lock); for_each_process_thread(g, p) { - if (p != current && freezing(p) && !frozen(p)) + if (p != current && freezing(p) && !frozen(p)) { sched_show_task(p); + trace_android_vh_try_to_freeze_todo_unfrozen(p); + } } read_unlock(&tasklist_lock); } + + trace_android_vh_try_to_freeze_todo(todo, elapsed_msecs, wq_busy); } else { pr_info("Freezing %s completed (elapsed %d.%03d seconds)\n", what, elapsed_msecs / 1000, elapsed_msecs % 1000);