From f9ebdfbf7013f54e9b996b02e3d11c2853414fba Mon Sep 17 00:00:00 2001 From: Park Bumgyu Date: Thu, 7 Jan 2021 11:10:36 +0900 Subject: [PATCH] ANDROID: add flags to android_rvh_enqueue_task/dequeue_task parameter "flags" is added to the vendor hook parameter so that the module can know the event type of task enqueue/dequeue. Bug: 176917922 Signed-off-by: Park Bumgyu Change-Id: I7cc60908e301d75393bdf84861878a94de80d683 --- include/trace/hooks/sched.h | 12 ++++++------ kernel/sched/core.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 0c26d86081e7..7af9dd08d230 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -30,12 +30,12 @@ DECLARE_HOOK(android_vh_scheduler_tick, TP_ARGS(rq)); DECLARE_RESTRICTED_HOOK(android_rvh_enqueue_task, - TP_PROTO(struct rq *rq, struct task_struct *p), - TP_ARGS(rq, p), 1); + TP_PROTO(struct rq *rq, struct task_struct *p, int flags), + TP_ARGS(rq, p, flags), 1); DECLARE_RESTRICTED_HOOK(android_rvh_dequeue_task, - TP_PROTO(struct rq *rq, struct task_struct *p), - TP_ARGS(rq, p), 1); + TP_PROTO(struct rq *rq, struct task_struct *p, int flags), + TP_ARGS(rq, p, flags), 1); DECLARE_RESTRICTED_HOOK(android_rvh_can_migrate_task, TP_PROTO(struct task_struct *p, int dst_cpu, int *can_migrate), @@ -223,8 +223,8 @@ DECLARE_RESTRICTED_HOOK(android_rvh_sched_exec, #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_vh_scheduler_tick(rq) -#define trace_android_rvh_enqueue_task(rq, p) -#define trace_android_rvh_dequeue_task(rq, p) +#define trace_android_rvh_enqueue_task(rq, p, flags) +#define trace_android_rvh_dequeue_task(rq, p, flags) #define trace_android_rvh_can_migrate_task(p, dst_cpu, can_migrate) #define trace_android_rvh_find_lowest_rq(p, local_cpu_mask, ret, lowest_cpu) #define trace_android_rvh_prepare_prio_fork(p) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d42854ff1995..4269c217bf33 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1584,7 +1584,7 @@ static inline void enqueue_task(struct rq *rq, struct task_struct *p, int flags) uclamp_rq_inc(rq, p); p->sched_class->enqueue_task(rq, p, flags); - trace_android_rvh_enqueue_task(rq, p); + trace_android_rvh_enqueue_task(rq, p, flags); } static inline void dequeue_task(struct rq *rq, struct task_struct *p, int flags) @@ -1600,7 +1600,7 @@ static inline void dequeue_task(struct rq *rq, struct task_struct *p, int flags) uclamp_rq_dec(rq, p); p->sched_class->dequeue_task(rq, p, flags); - trace_android_rvh_dequeue_task(rq, p); + trace_android_rvh_dequeue_task(rq, p, flags); } void activate_task(struct rq *rq, struct task_struct *p, int flags)