diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 2221d9c17544..ae387fd00959 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -33,6 +33,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -141,3 +142,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpu_down); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_balance_rt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index); 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..049c8995932d --- /dev/null +++ b/include/trace/hooks/power.h @@ -0,0 +1,27 @@ +/* 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 +#include +/* + * Following tracepoints are not exported in tracefs and provide a + * mechanism for vendor modules to hook and extend functionality + */ +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)); + +/* macro versions of hooks are no longer required */ + +#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 cc062308092b..0170cf314757 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -23,6 +23,8 @@ #include #include +#include + /* * Timeout for stopping processes */ @@ -103,11 +105,15 @@ static int try_to_freeze_tasks(bool user_only) read_lock(&tasklist_lock); for_each_process_thread(g, p) { if (p != current && !freezer_should_skip(p) - && freezing(p) && !frozen(p)) + && 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_cont("(elapsed %d.%03d seconds) ", elapsed_msecs / 1000, elapsed_msecs % 1000);