From: Phil Auld Date: Wed, 15 May 2024 13:37:05 +0000 (-0400) Subject: sched: remove HZ_BW feature hedge X-Git-Tag: v6.12-rc1~120^2~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a58501fb8320d6232507f722b4c9dcd4e03362ee;p=thirdparty%2Flinux.git sched: remove HZ_BW feature hedge As a hedge against unexpected user issues commit 88c56cfeaec4 ("sched/fair: Block nohz tick_stop when cfs bandwidth in use") included a scheduler feature to disable the new functionality. It's been a few releases (v6.6) and no screams, so remove it. Signed-off-by: Phil Auld Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Valentin Schneider Link: https://lore.kernel.org/r/20240515133705.3632915-1-pauld@redhat.com --- diff --git a/kernel/sched/core.c b/kernel/sched/core.c index db5823fcc31c6..0a71050f5f0dd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1269,7 +1269,7 @@ bool sched_can_stop_tick(struct rq *rq) * dequeued by migrating while the constrained task continues to run. * E.g. going from 2->1 without going through pick_next_task(). */ - if (sched_feat(HZ_BW) && __need_bw_check(rq, rq->curr)) { + if (__need_bw_check(rq, rq->curr)) { if (cfs_task_bw_constrained(rq->curr)) return false; } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index e8cdfeb898e27..02694fc5fce9c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6555,7 +6555,7 @@ static void sched_fair_update_stop_tick(struct rq *rq, struct task_struct *p) { int cpu = cpu_of(rq); - if (!sched_feat(HZ_BW) || !cfs_bandwidth_used()) + if (!cfs_bandwidth_used()) return; if (!tick_nohz_full_cpu(cpu)) diff --git a/kernel/sched/features.h b/kernel/sched/features.h index 143f55df890b1..929021fd6bc43 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -85,5 +85,3 @@ SCHED_FEAT(WA_BIAS, true) SCHED_FEAT(UTIL_EST, true) SCHED_FEAT(LATENCY_WARN, false) - -SCHED_FEAT(HZ_BW, true)