From 2935d588b1378b98d53e27fab1d79808248a5f1a Mon Sep 17 00:00:00 2001 From: JianMin Liu Date: Thu, 20 Aug 2020 23:33:30 +0800 Subject: [PATCH] ANDROID: sched: Use normal vendor hook in scheduler tick The hooks function of scheduler tick will need to insert multiple instances, so that use vendor hook instead of restricted vendor hook. Bug: 165787557 Signed-off-by: JianMin Liu Change-Id: I750da26452c657d83d5f8c520bf7008693c43a6b --- drivers/android/vendor_hooks.c | 2 +- include/trace/hooks/sched.h | 6 +++--- kernel/sched/core.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index daa9c2bf6043..a6f2f519bbeb 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -23,7 +23,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_select_task_rq_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_select_task_rq_rt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_select_fallback_rq); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_scheduler_tick); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_scheduler_tick); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_enqueue_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_dequeue_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_can_migrate_task); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 101b6098d24e..6ac7dd6f97b7 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -25,9 +25,9 @@ DECLARE_RESTRICTED_HOOK(android_rvh_select_fallback_rq, TP_ARGS(cpu, p, new_cpu), 1); struct rq; -DECLARE_RESTRICTED_HOOK(android_rvh_scheduler_tick, +DECLARE_HOOK(android_vh_scheduler_tick, TP_PROTO(struct rq *rq), - TP_ARGS(rq), 1); + TP_ARGS(rq)); DECLARE_RESTRICTED_HOOK(android_rvh_enqueue_task, TP_PROTO(struct rq *rq, struct task_struct *p), @@ -69,7 +69,7 @@ DECLARE_RESTRICTED_HOOK(android_rvh_setscheduler, #define trace_android_rvh_select_task_rq_fair(p, prev_cpu, sd_flag, wake_flags, new_cpu) #define trace_android_rvh_select_task_rq_rt(p, prev_cpu, sd_flag, wake_flags, new_cpu) #define trace_android_rvh_select_fallback_rq(cpu, p, dest_cpu) -#define trace_android_rvh_scheduler_tick(rq) +#define trace_android_vh_scheduler_tick(rq) #define trace_android_rvh_enqueue_task(rq, p) #define trace_android_rvh_dequeue_task(rq, p) #define trace_android_rvh_can_migrate_task(p, dst_cpu, can_migrate) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8af33eec5384..beefebf04e0c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4027,7 +4027,7 @@ void scheduler_tick(void) trigger_load_balance(rq); #endif - trace_android_rvh_scheduler_tick(rq); + trace_android_vh_scheduler_tick(rq); } #ifdef CONFIG_NO_HZ_FULL