From 3d244087450aec234443937a2a2d9f0ed8a8aa2f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 May 2021 11:54:49 +0200 Subject: [PATCH] Revert "sched,fair: Alternative sched_slice()" This reverts commit ae7fe4794da202281d75208eac49f09137c5ac53 which showed up in 5.10.36 and broke the abi. It should not be needed in Android systems at this time so it is safe to revert. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I69f1885bb0d25ebbaa52422d6c238f13fbe0a0f3 --- kernel/sched/fair.c | 12 +----------- kernel/sched/features.h | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3fc91d3fb7b3..874c919b9a10 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -705,13 +705,7 @@ static u64 __sched_period(unsigned long nr_running) */ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se) { - unsigned int nr_running = cfs_rq->nr_running; - u64 slice; - - if (sched_feat(ALT_PERIOD)) - nr_running = rq_of(cfs_rq)->cfs.h_nr_running; - - slice = __sched_period(nr_running + !se->on_rq); + u64 slice = __sched_period(cfs_rq->nr_running + !se->on_rq); for_each_sched_entity(se) { struct load_weight *load; @@ -728,10 +722,6 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se) } slice = __calc_delta(slice, se->load.weight, load); } - - if (sched_feat(BASE_SLICE)) - slice = max(slice, (u64)sysctl_sched_min_granularity); - return slice; } diff --git a/kernel/sched/features.h b/kernel/sched/features.h index f1bf5e12d889..68d369cba9e4 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -90,6 +90,3 @@ SCHED_FEAT(WA_BIAS, true) */ SCHED_FEAT(UTIL_EST, true) SCHED_FEAT(UTIL_EST_FASTUP, true) - -SCHED_FEAT(ALT_PERIOD, true) -SCHED_FEAT(BASE_SLICE, true)