From c44fcf911c9f3fdfb1ddf2cc050763d29bf778cd Mon Sep 17 00:00:00 2001 From: Satya Durga Srinivasu Prabhala Date: Sun, 13 Dec 2020 06:18:54 -0800 Subject: [PATCH] ANDROID: sched/fair: fix place_entity() vendor hook place_entity() vendor hook is meant to tweak vruntime by vendor modules as needed, but with current form of the hook that is not possible as vruntime is passed by it's value. Fix it by switching to pass by reference. Bug: 175448877 Change-Id: Ibb51592f94da31019fa98a6767d080ec61daafe6 Signed-off-by: Satya Durga Srinivasu Prabhala --- include/trace/hooks/sched.h | 2 +- kernel/sched/fair.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 8870aac234b9..76666aec79bc 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -178,7 +178,7 @@ DECLARE_RESTRICTED_HOOK(android_rvh_account_irq, struct sched_entity; DECLARE_RESTRICTED_HOOK(android_rvh_place_entity, - TP_PROTO(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial, u64 vruntime), + TP_PROTO(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial, u64 *vruntime), TP_ARGS(cfs_rq, se, initial, vruntime), 1); DECLARE_RESTRICTED_HOOK(android_rvh_build_perf_domains, diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index e9a2ea1e845b..037f8a83c02a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4229,7 +4229,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) /* ensure we never gain time by being placed backwards. */ se->vruntime = max_vruntime(se->vruntime, vruntime); - trace_android_rvh_place_entity(cfs_rq, se, initial, vruntime); + trace_android_rvh_place_entity(cfs_rq, se, initial, &vruntime); } static void check_enqueue_throttle(struct cfs_rq *cfs_rq);