From ee1bf45667f43528baf26c18d66cca6a22ad6f0e Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Mon, 27 Jul 2026 21:11:59 +0000 Subject: [PATCH] Revert "ANDROID: sched: Add vendor hook for util_est_update" This reverts commit e1061a93713b0363a786881151dda7fbab8951d6. Upstream refactored util_est_update() in commit 6d2051403d6c ("sched/fair: Update util_est after updating util_avg during dequeue") and this vendor hook needs to be refactored accordingly. Remove it now but it can reland after the updates if really needed. Bug: 170508405 Cc: Rick Yiu Change-Id: Ic49b4f8cd3a7de9c411b86e38e6a09fdde9c39b7 Signed-off-by: Carlos Llamas --- include/trace/hooks/sched.h | 4 ---- kernel/sched/fair.c | 5 ----- kernel/sched/vendor_hooks.c | 1 - 3 files changed, 10 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index cb240829f472..8607f7df55fc 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -275,10 +275,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_dequeue_task_fair, TP_PROTO(struct rq *rq, struct task_struct *p, int flags), TP_ARGS(rq, p, flags), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_util_est_update, - TP_PROTO(struct cfs_rq *cfs_rq, struct task_struct *p, bool task_sleep, int *ret), - TP_ARGS(cfs_rq, p, task_sleep, ret), 1); - DECLARE_HOOK(android_vh_setscheduler_uclamp, TP_PROTO(struct task_struct *tsk, int clamp_id, unsigned int value), TP_ARGS(tsk, clamp_id, value)); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index df5bd9113755..ae85d4a91b77 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5153,11 +5153,6 @@ static inline void util_est_update(struct cfs_rq *cfs_rq, bool task_sleep) { unsigned int ewma, dequeued, last_ewma_diff; - int ret = 0; - - trace_android_rvh_util_est_update(cfs_rq, p, task_sleep, &ret); - if (ret) - return; if (!sched_feat(UTIL_EST)) return; diff --git a/kernel/sched/vendor_hooks.c b/kernel/sched/vendor_hooks.c index 25079dbef38d..c46db5d159a5 100644 --- a/kernel/sched/vendor_hooks.c +++ b/kernel/sched/vendor_hooks.c @@ -78,7 +78,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_misfit_status); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_rq_clock_pelt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_rt_rq_load_avg_internal); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_thermal_stats); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_util_est_update); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_wake_up_new_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_build_sched_domains); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_wake_up_sync);