From a1290fe02102e2dc56dd312bd65fa2b3bdfb4ebb Mon Sep 17 00:00:00 2001 From: Shaleen Agrawal Date: Thu, 24 Mar 2022 08:42:49 -0700 Subject: [PATCH] ANDROID: sched: Add flags parameter to enq/deq after tracehooks Currently, the enqueue and dequeue tracehooks pass in the flags parameter, however, the after tracehooks that follow do not. These tracehooks were introduced originally as part of commit bc70904edc77 ("ANDROID: sched: Add vendor hooks for sched."). These vendor hooks are needed to implement Qualcomm's load tracking scheme WALT via vendor modules. Bug: 226570047 Fixes: bc70904edc771b92911229428b9a3538fa6af3a3 Change-Id: I51cb50054562893271e5d3efd7c6bd028977622d Signed-off-by: Shaleen Agrawal Signed-off-by: Ashay Jaiswal --- include/trace/hooks/sched.h | 8 ++++---- kernel/sched/core.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 5e5a8256daab..2d945fdd0f37 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -251,12 +251,12 @@ DECLARE_RESTRICTED_HOOK(android_rvh_uclamp_eff_get, TP_ARGS(p, clamp_id, uclamp_max, uclamp_eff, ret), 1); DECLARE_RESTRICTED_HOOK(android_rvh_after_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_after_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); struct cfs_rq; struct sched_entity; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ad8cffc4b08f..ad39dea4b7c2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2096,7 +2096,7 @@ static inline void enqueue_task(struct rq *rq, struct task_struct *p, int flags) uclamp_rq_inc(rq, p); trace_android_rvh_enqueue_task(rq, p, flags); p->sched_class->enqueue_task(rq, p, flags); - trace_android_rvh_after_enqueue_task(rq, p); + trace_android_rvh_after_enqueue_task(rq, p, flags); if (sched_core_enabled(rq)) sched_core_enqueue(rq, p); @@ -2118,7 +2118,7 @@ static inline void dequeue_task(struct rq *rq, struct task_struct *p, int flags) uclamp_rq_dec(rq, p); trace_android_rvh_dequeue_task(rq, p, flags); p->sched_class->dequeue_task(rq, p, flags); - trace_android_rvh_after_dequeue_task(rq, p); + trace_android_rvh_after_dequeue_task(rq, p, flags); } void activate_task(struct rq *rq, struct task_struct *p, int flags)