From nobody Sun Feb 8 23:32:15 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4F9715535A for ; Thu, 28 Nov 2024 09:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786081; cv=none; b=uLff8Zo/ESna/nCCsrn2J1e/bpE2kqJP8+mPggIbdolKolqMsHEADDeeGmmPct7teZqHdCnAfDhlSACwD2NWoR8UPfGFDHLjKi0YQty1UcaTe9mKNUQGfd6bQs/0O9kYT3wwal5Y/eDO+M/9wSUtGOYK/+jhflhcC7HsINdh1cw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786081; c=relaxed/simple; bh=b7pegR+W7wBHel25kvXKP/+Mzu/95qzWe7S2v+cGanw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nbvNf+KAxV2hW6Dkea1bBx6tsx3hxH2uVRGOawnBkUAzIxDj0bC4UsUTznPu2cQwfIqpQAkN1F7wZnOoNxjRYdAv9pi2Ha2cXvTDFVqArvOHMbaOgKH3AdS8eUhpNkGHi0nD1YQgMsDwl5ufwaIxx7GoQ/SX98aqMwKVkz+WTR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=VngvD6cz; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VngvD6cz" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53dd8b7796dso574620e87.1 for ; Thu, 28 Nov 2024 01:27:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786077; x=1733390877; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4pxVubRqiLH6oVT6XwSU6Uo24OhTj4MMNwS8+GikA+c=; b=VngvD6czr2pCpg4sfbFoPwupzFt9Qh2FWl+Z6bBn5C+jQHchmShUoXi4xWcGqr/MYa AzPehM6aYfFXeAw/xUPQXWkij2skp0RszXj5qMdl20HkFLepz931oxtHjeWJwMbZLiL+ iMxaYvX0fNHb8NTRe9BtUCYJrq0i0y+OUjp4Szm2PMriLu0U1W/lfLgONhreeR4bMCFR ijIKXnjlWB7foCVaCLCI9BnYg/QfCDYKyJrfeIDthXHmo0XST1WZv8aAcz74eq+xj/s/ n/jWoGUEogVeo8uNmhL6mmOnV2LwvAUL/LwD4/WDTo/6vrEh5OOznEmATGaIUp66Vu3J 2XCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786077; x=1733390877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4pxVubRqiLH6oVT6XwSU6Uo24OhTj4MMNwS8+GikA+c=; b=niP7L1I2GQfo1Meu9LGeHJ1FyiX2BPv9lwyp5000DJaZZSDEIlnsdEdIx2hlHKHzMP h7+m91GE2Q/mFPXIIV3LCyn+nkDdzIh/1JMg3esDZtAangFWFijLw1YnLX01aHKwVTw4 Ex7lEncG1yIbsdFQwMTO8hiiyBdA6MI8vCEhD0gD52LrsYSdTa7Ecy8MjQPUUjJC3Ykw 0mRVmEt6TcRpVtL24AZso59cZawhv8y7+/iu48ribkcrS3PDM0dPMAEmRc2jF+7EC7jH uSQATEmo5utVZVzuMP/eOFARdDamn8B37iaWKbPQNDIiKkPLSOUYSZ26L9HSW0jHq8tP 10Ew== X-Forwarded-Encrypted: i=1; AJvYcCWXzXfNoepPSLpelG4fPKUraMES7ZMaufSldXwGZ/Id471bFr8Cbk4psxRDxNJw7LGBAAuOJwKB1XlVOgk=@vger.kernel.org X-Gm-Message-State: AOJu0YzcnqB1U8kAlXg+tZV/EHUKA/RRVYx//XIdKjV7pglJseQEUziK DI5tE+9mtjWOKM8HPiqlQFEIuQwDRM98xE+h2pggqrB2EfbubR8G+sX59z4asNwV13A1JOtgCJP vkzw= X-Gm-Gg: ASbGncvpCjUPRsDAWSTl76qA6Oqg0GJLIpM9M6iRb+4PO48Cfkay9I9peqWy3KCYABV Dmm5R4REs6RAw4XFO5Sxdg8LEuh5fh+FFJxiSQ2Pd4ocbUPZ00XJFcU+gz5d8poK7tRdZKhD7j8 QhM6X/JgoaFXqj1HPheVH2wHNHUzr49rB62pvQ/+cWxZV0RrHmnehqS4dizIVPxH27vNNKLhUXU YhLXwHlRaqKQXxnYziKP8uL9h6SsF08DIrts8JFaC5dvNIyWHwhWtsJ9RU= X-Google-Smtp-Source: AGHT+IEHnNStloUYsOkwOgpbr/1nA0Jzn913RuDbD0AgTLk21dMDqRVYUpGfSy52J8F/uiiz0Dp7eA== X-Received: by 2002:a05:6512:3e1f:b0:53d:ed5a:2de4 with SMTP id 2adb3069b0e04-53df00d939emr3721656e87.28.1732786076588; Thu, 28 Nov 2024 01:27:56 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:27:55 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 1/9] sched/eevdf: More PELT vs DELAYED_DEQUEUE Date: Thu, 28 Nov 2024 10:27:42 +0100 Message-ID: <20241128092750.2541735-2-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Peter Zijlstra Vincent and Dietmar noted that while commit fc1892becd56 ("sched/eevdf: Fixup PELT vs DELAYED_DEQUEUE") fixes the entity runnable stats, it does not adjust the cfs_rq runnable stats, which are based off of h_nr_running. Track h_nr_delayed such that we can discount those and adjust the signal. Fixes: fc1892becd56 ("sched/eevdf: Fixup PELT vs DELAYED_DEQUEUE") Reported-by: Dietmar Eggemann Closes: https://lore.kernel.org/lkml/a9a45193-d0c6-4ba2-a822-464ad30b550e@a= rm.com/ Reported-by: Vincent Guittot Closes: https://lore.kernel.org/lkml/CAKfTPtCNUvWE_GX5LyvTF-WdxUT=3DZgvZZv-= 4t=3DeWntg5uOFqiQ@mail.gmail.com/ Signed-off-by: Peter Zijlstra (Intel) [ Fixes checkpatch warnings ] Signed-off-by: Vincent Guittot Link: https://lkml.kernel.org/r/20240906104525.GG4928@noisy.programming.kic= ks-ass.net Tested-by: K Prateek Nayak --- kernel/sched/debug.c | 1 + kernel/sched/fair.c | 51 +++++++++++++++++++++++++++++++++++++++----- kernel/sched/pelt.c | 2 +- kernel/sched/sched.h | 8 +++++-- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index a48b2a701ec2..a1be00a988bf 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -845,6 +845,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "spread", SPLIT_NS(spread)); SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running); + SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running", cfs_rq->idle_nr_running); SEQ_printf(m, " .%-30s: %d\n", "idle_h_nr_running", diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index fbdca89c677f..dc43a8daea35 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5465,9 +5465,33 @@ static void clear_buddies(struct cfs_rq *cfs_rq, str= uct sched_entity *se) =20 static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq); =20 -static inline void finish_delayed_dequeue_entity(struct sched_entity *se) +static void set_delayed(struct sched_entity *se) +{ + se->sched_delayed =3D 1; + for_each_sched_entity(se) { + struct cfs_rq *cfs_rq =3D cfs_rq_of(se); + + cfs_rq->h_nr_delayed++; + if (cfs_rq_throttled(cfs_rq)) + break; + } +} + +static void clear_delayed(struct sched_entity *se) { se->sched_delayed =3D 0; + for_each_sched_entity(se) { + struct cfs_rq *cfs_rq =3D cfs_rq_of(se); + + cfs_rq->h_nr_delayed--; + if (cfs_rq_throttled(cfs_rq)) + break; + } +} + +static inline void finish_delayed_dequeue_entity(struct sched_entity *se) +{ + clear_delayed(se); if (sched_feat(DELAY_ZERO) && se->vlag > 0) se->vlag =3D 0; } @@ -5497,7 +5521,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_en= tity *se, int flags) if (cfs_rq->next =3D=3D se) cfs_rq->next =3D NULL; update_load_avg(cfs_rq, se, 0); - se->sched_delayed =3D 1; + set_delayed(se); return false; } } @@ -5911,7 +5935,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long task_delta, idle_task_delta, dequeue =3D 1; + long task_delta, idle_task_delta, delayed_delta, dequeue =3D 1; long rq_h_nr_running =3D rq->cfs.h_nr_running; =20 raw_spin_lock(&cfs_b->lock); @@ -5944,6 +5968,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) =20 task_delta =3D cfs_rq->h_nr_running; idle_task_delta =3D cfs_rq->idle_h_nr_running; + delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); int flags; @@ -5967,6 +5992,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) =20 qcfs_rq->h_nr_running -=3D task_delta; qcfs_rq->idle_h_nr_running -=3D idle_task_delta; + qcfs_rq->h_nr_delayed -=3D delayed_delta; =20 if (qcfs_rq->load.weight) { /* Avoid re-evaluating load for this entity: */ @@ -5989,6 +6015,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) =20 qcfs_rq->h_nr_running -=3D task_delta; qcfs_rq->idle_h_nr_running -=3D idle_task_delta; + qcfs_rq->h_nr_delayed -=3D delayed_delta; } =20 /* At this point se is NULL and we are at root level*/ @@ -6014,7 +6041,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long task_delta, idle_task_delta; + long task_delta, idle_task_delta, delayed_delta; long rq_h_nr_running =3D rq->cfs.h_nr_running; =20 se =3D cfs_rq->tg->se[cpu_of(rq)]; @@ -6050,6 +6077,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) =20 task_delta =3D cfs_rq->h_nr_running; idle_task_delta =3D cfs_rq->idle_h_nr_running; + delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); =20 @@ -6067,6 +6095,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) =20 qcfs_rq->h_nr_running +=3D task_delta; qcfs_rq->idle_h_nr_running +=3D idle_task_delta; + qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(qcfs_rq)) @@ -6084,6 +6113,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) =20 qcfs_rq->h_nr_running +=3D task_delta; qcfs_rq->idle_h_nr_running +=3D idle_task_delta; + qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(qcfs_rq)) @@ -6937,7 +6967,7 @@ requeue_delayed_entity(struct sched_entity *se) } =20 update_load_avg(cfs_rq, se, 0); - se->sched_delayed =3D 0; + clear_delayed(se); } =20 /* @@ -6951,6 +6981,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) struct cfs_rq *cfs_rq; struct sched_entity *se =3D &p->se; int idle_h_nr_running =3D task_has_idle_policy(p); + int h_nr_delayed =3D 0; int task_new =3D !(flags & ENQUEUE_WAKEUP); int rq_h_nr_running =3D rq->cfs.h_nr_running; u64 slice =3D 0; @@ -6977,6 +7008,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) if (p->in_iowait) cpufreq_update_util(rq, SCHED_CPUFREQ_IOWAIT); =20 + if (task_new) + h_nr_delayed =3D !!se->sched_delayed; + for_each_sched_entity(se) { if (se->on_rq) { if (se->sched_delayed) @@ -6999,6 +7033,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) =20 cfs_rq->h_nr_running++; cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; + cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running =3D 1; @@ -7022,6 +7057,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) =20 cfs_rq->h_nr_running++; cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; + cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running =3D 1; @@ -7084,6 +7120,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) struct task_struct *p =3D NULL; int idle_h_nr_running =3D 0; int h_nr_running =3D 0; + int h_nr_delayed =3D 0; struct cfs_rq *cfs_rq; u64 slice =3D 0; =20 @@ -7091,6 +7128,8 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) p =3D task_of(se); h_nr_running =3D 1; idle_h_nr_running =3D task_has_idle_policy(p); + if (!task_sleep && !task_delayed) + h_nr_delayed =3D !!se->sched_delayed; } else { cfs_rq =3D group_cfs_rq(se); slice =3D cfs_rq_min_slice(cfs_rq); @@ -7108,6 +7147,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) =20 cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; + cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running =3D h_nr_running; @@ -7146,6 +7186,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) =20 cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; + cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running =3D h_nr_running; diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c index fc07382361a8..fee75cc2c47b 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -321,7 +321,7 @@ int __update_load_avg_cfs_rq(u64 now, struct cfs_rq *cf= s_rq) { if (___update_load_sum(now, &cfs_rq->avg, scale_load_down(cfs_rq->load.weight), - cfs_rq->h_nr_running, + cfs_rq->h_nr_running - cfs_rq->h_nr_delayed, cfs_rq->curr !=3D NULL)) { =20 ___update_load_avg(&cfs_rq->avg, 1); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 76f5f53a645f..1e494af2cd23 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -649,6 +649,7 @@ struct cfs_rq { unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ unsigned int idle_nr_running; /* SCHED_IDLE */ unsigned int idle_h_nr_running; /* SCHED_IDLE */ + unsigned int h_nr_delayed; =20 s64 avg_vruntime; u64 avg_load; @@ -898,8 +899,11 @@ struct dl_rq { =20 static inline void se_update_runnable(struct sched_entity *se) { - if (!entity_is_task(se)) - se->runnable_weight =3D se->my_q->h_nr_running; + if (!entity_is_task(se)) { + struct cfs_rq *cfs_rq =3D se->my_q; + + se->runnable_weight =3D cfs_rq->h_nr_running - cfs_rq->h_nr_delayed; + } } =20 static inline long se_runnable(struct sched_entity *se) --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A340156641 for ; Thu, 28 Nov 2024 09:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786081; cv=none; b=JissIiWVMSiMpTyO2+N/WIM5RUefKb7lN92H+qhzuQmVeMCtu4gropU2hwl/BTZ1gftzALYz26JHVf6mvBWwfZA8R02opl4I3GVHkhCMX73i4gPjMAensRQgOqkGQiVgM5JIwUDr6TeEV5rDVQGT1S344AhFkTzqNWhNYX9zv5Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786081; c=relaxed/simple; bh=47/XhuXPiMuE3PlFlrzpWKyxXSSVVJimF/5e4ZBwoyI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fAxe2pqNHtQpkPQ4daSwkBooxi+tsUx2quVrxLaUW4uuSgHQVdB34VYPJJQO5w/ltGJycMtbzBz2aT5NyJUms++a8ooMf8Mtaqpnh8Q7TbzmxEiuw9T4t/kqnVF3onUGA4Nms4TnJJlcGl20CwpdL54ePfEwYz7QEODm3lGYaFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=R/34xi1n; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="R/34xi1n" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-434a95095efso10066395e9.0 for ; Thu, 28 Nov 2024 01:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786078; x=1733390878; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dd6iAgfGMbvPVpB2MIxIP2xrJbn95ItnIFtFFWxsmMA=; b=R/34xi1nUBEN7XkcpyiPO4+vxDukCcdJHZ0bNkdy+mmQoyhyYHbZZ7jLHEYvd0iH7I 8EmZUpnw4JPWMDXbFG9HJfAU/BV5pPwGx3P8W4XdVNSmHd8jJ6rW77rjyYkSKkxS+bAI dYWj9HkFe9jww217OgseD7h/DhQt+j++bJM5qkpNECH491sMW6W2FRhK59S6lis4oHMN 9V9P4pvCFX7DhEFDRbcqig7XTr0llDqNWgvv5N8oLVkJKxKmSG5z8z5WjJjmtkYp0m1K KvOz9m2bsSxB/oDvEIR2AcycI25AFUrng4TersaylmgZZeDFw8Lst+pJ1Rc43m8Rfbh2 Y7+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786078; x=1733390878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dd6iAgfGMbvPVpB2MIxIP2xrJbn95ItnIFtFFWxsmMA=; b=W0b4C6duDx/xcOFKIcmDPenRqViKpgVPhXZnVX1PWZTj0u8eeWJlO+IVaPDsTHjqxQ APdIcxmGTzlUXDkwc1D/frgFAJtZnqiEqgrA/tS6BD5wWk/7G2QP0udMOKc94x3R7EdM U44ICCC2WeTp/QejLTw1xWbWyjwPh1fYWHWwCTGKJgLBuO7UE1cl1Z3jTTHqVrlANXI9 3vvy2bFddOQNdJ2VYvpbgA2KMAScEcsTV1jQ5MNqS3dQs5ybZGWqQ/X5bxmbwS3KyXiO +UBpMmsn4NTMu+uaUphqR7Swp1lbZahHH1vPmLOrzWmOOIZH2h4yvGgwzNsB6I5uTh3c CtrQ== X-Forwarded-Encrypted: i=1; AJvYcCXFGUagxyGTsynm8AcaMvhqA96AZZ1qW1TaZrJ99OUPIzGri+dDjmhQ88PiA7WRtFql6i3JwHoK3PoxwzY=@vger.kernel.org X-Gm-Message-State: AOJu0YyeLWT4NqjZDwJ6rgbIoblUhldE6rqNlY1Nz176zI6eKkmPyKRM cbFsl7inTob8+7X05+Q4xIzsuTdyCm+62FHqtCBb+T8/kUlwuqlploSJaHPjXck= X-Gm-Gg: ASbGncvtkLlvD+xbzgE2LTkFja11pcROFteqnH6CMMQjYFD4DSkrEt1YqaeWR3JUvlz P4h68pARuQRg215ZpXJvgoKwfbA1kdrJr5T/Dn5dfUiQrePBtFx+JOFU4oaISVb2UW5XkwIPG40 K4MqwvVU6ERtHdVgtU2nSmx9DC68L75il9l7uXyAqs3NnutOBmJi4cZWJnBBtiC483KtJ4GFiOn yzUvA6dYvP5B/32vcQmc9zhrm/R4Od+EZlT1Fphfyxse1fQ4cfAgvXagOg= X-Google-Smtp-Source: AGHT+IF4P1LqWGlTXUG5JBsNWPxcshOaGTcZYT2yAT/bwAD2jR0/ZL1U4BNgNczRKPfLMUAr/6/L7Q== X-Received: by 2002:a05:600c:1c01:b0:434:9d55:620 with SMTP id 5b1f17b1804b1-434afbd337amr20050475e9.11.1732786077712; Thu, 28 Nov 2024 01:27:57 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:27:57 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 2/9] sched/fair: Add new cfs_rq.h_nr_enqueued Date: Thu, 28 Nov 2024 10:27:43 +0100 Message-ID: <20241128092750.2541735-3-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With delayed dequeued feature, a sleeping sched_entity remains enqueued in the rq until its lag has elapsed. As a result, it stays also visible in the statistics that are used to balance the system and in particular the field h_nr_running when the sched_entity is associated to a task. Create a new h_nr_enqueued that tracks all enqueued tasks and restore the behavior of h_nr_running i.e. tracking the number of fair tasks that want to run. h_nr_running is used in several places to make decision on load balance: - PELT runnable_avg - deciding if a group is overloaded or has spare capacity - numa stats - reduced capacity management - load balance - nohz kick It should be noticed that the rq->nr_running still counts the delayed dequeued tasks as delayed dequeue is a fair feature that is meaningless at core level. Signed-off-by: Vincent Guittot --- kernel/sched/core.c | 2 +- kernel/sched/debug.c | 5 +-- kernel/sched/fair.c | 81 +++++++++++++++++++++++++++----------------- kernel/sched/pelt.c | 2 +- kernel/sched/sched.h | 8 ++--- 5 files changed, 57 insertions(+), 41 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 95e40895a519..425739bbdc63 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6018,7 +6018,7 @@ __pick_next_task(struct rq *rq, struct task_struct *p= rev, struct rq_flags *rf) * opportunity to pull in more work from other CPUs. */ if (likely(!sched_class_above(prev->sched_class, &fair_sched_class) && - rq->nr_running =3D=3D rq->cfs.h_nr_running)) { + rq->nr_running =3D=3D rq->cfs.h_nr_enqueued)) { =20 p =3D pick_next_task_fair(rq, prev, rf); if (unlikely(p =3D=3D RETRY_TASK)) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index a1be00a988bf..6b8cd869a2f4 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -379,7 +379,7 @@ static ssize_t sched_fair_server_write(struct file *fil= p, const char __user *ubu return -EINVAL; } =20 - if (rq->cfs.h_nr_running) { + if (rq->cfs.h_nr_enqueued) { update_rq_clock(rq); dl_server_stop(&rq->fair_server); } @@ -392,7 +392,7 @@ static ssize_t sched_fair_server_write(struct file *fil= p, const char __user *ubu printk_deferred("Fair server disabled in CPU %d, system may crash due t= o starvation.\n", cpu_of(rq)); =20 - if (rq->cfs.h_nr_running) + if (rq->cfs.h_nr_enqueued) dl_server_start(&rq->fair_server); } =20 @@ -845,6 +845,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "spread", SPLIT_NS(spread)); SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running); + SEQ_printf(m, " .%-30s: %d\n", "h_nr_enqueued", cfs_rq->h_nr_enqueued); SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running", cfs_rq->idle_nr_running); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index dc43a8daea35..6b7afb69d8ff 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5471,18 +5471,21 @@ static void set_delayed(struct sched_entity *se) for_each_sched_entity(se) { struct cfs_rq *cfs_rq =3D cfs_rq_of(se); =20 + cfs_rq->h_nr_running--; cfs_rq->h_nr_delayed++; if (cfs_rq_throttled(cfs_rq)) break; } } =20 -static void clear_delayed(struct sched_entity *se) +static void clear_delayed(struct sched_entity *se, bool running) { se->sched_delayed =3D 0; for_each_sched_entity(se) { struct cfs_rq *cfs_rq =3D cfs_rq_of(se); =20 + if (running) + cfs_rq->h_nr_running++; cfs_rq->h_nr_delayed--; if (cfs_rq_throttled(cfs_rq)) break; @@ -5491,7 +5494,7 @@ static void clear_delayed(struct sched_entity *se) =20 static inline void finish_delayed_dequeue_entity(struct sched_entity *se) { - clear_delayed(se); + clear_delayed(se, false); if (sched_feat(DELAY_ZERO) && se->vlag > 0) se->vlag =3D 0; } @@ -5935,8 +5938,8 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long task_delta, idle_task_delta, delayed_delta, dequeue =3D 1; - long rq_h_nr_running =3D rq->cfs.h_nr_running; + long running_delta, enqueued_delta, idle_task_delta, delayed_delta, deque= ue =3D 1; + long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 raw_spin_lock(&cfs_b->lock); /* This will start the period timer if necessary */ @@ -5966,7 +5969,8 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) walk_tg_tree_from(cfs_rq->tg, tg_throttle_down, tg_nop, (void *)rq); rcu_read_unlock(); =20 - task_delta =3D cfs_rq->h_nr_running; + running_delta =3D cfs_rq->h_nr_running; + enqueued_delta =3D cfs_rq->h_nr_enqueued; idle_task_delta =3D cfs_rq->idle_h_nr_running; delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { @@ -5988,9 +5992,10 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) dequeue_entity(qcfs_rq, se, flags); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_running; + idle_task_delta =3D cfs_rq->h_nr_enqueued; =20 - qcfs_rq->h_nr_running -=3D task_delta; + qcfs_rq->h_nr_running -=3D running_delta; + qcfs_rq->h_nr_enqueued -=3D enqueued_delta; qcfs_rq->idle_h_nr_running -=3D idle_task_delta; qcfs_rq->h_nr_delayed -=3D delayed_delta; =20 @@ -6011,18 +6016,19 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) se_update_runnable(se); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_running; + idle_task_delta =3D cfs_rq->h_nr_enqueued; =20 - qcfs_rq->h_nr_running -=3D task_delta; + qcfs_rq->h_nr_running -=3D running_delta; + qcfs_rq->h_nr_enqueued -=3D enqueued_delta; qcfs_rq->idle_h_nr_running -=3D idle_task_delta; qcfs_rq->h_nr_delayed -=3D delayed_delta; } =20 /* At this point se is NULL and we are at root level*/ - sub_nr_running(rq, task_delta); + sub_nr_running(rq, enqueued_delta); =20 /* Stop the fair server if throttling resulted in no runnable tasks */ - if (rq_h_nr_running && !rq->cfs.h_nr_running) + if (rq_h_nr_enqueued && !rq->cfs.h_nr_enqueued) dl_server_stop(&rq->fair_server); done: /* @@ -6041,8 +6047,8 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long task_delta, idle_task_delta, delayed_delta; - long rq_h_nr_running =3D rq->cfs.h_nr_running; + long running_delta, enqueued_delta, idle_task_delta, delayed_delta; + long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 se =3D cfs_rq->tg->se[cpu_of(rq)]; =20 @@ -6075,7 +6081,8 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) goto unthrottle_throttle; } =20 - task_delta =3D cfs_rq->h_nr_running; + running_delta =3D cfs_rq->h_nr_running; + enqueued_delta =3D cfs_rq->h_nr_enqueued; idle_task_delta =3D cfs_rq->idle_h_nr_running; delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { @@ -6091,9 +6098,10 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) enqueue_entity(qcfs_rq, se, ENQUEUE_WAKEUP); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_running; + idle_task_delta =3D cfs_rq->h_nr_enqueued; =20 - qcfs_rq->h_nr_running +=3D task_delta; + qcfs_rq->h_nr_running +=3D running_delta; + qcfs_rq->h_nr_enqueued +=3D enqueued_delta; qcfs_rq->idle_h_nr_running +=3D idle_task_delta; qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 @@ -6109,9 +6117,10 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) se_update_runnable(se); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_running; + idle_task_delta =3D cfs_rq->h_nr_enqueued; =20 - qcfs_rq->h_nr_running +=3D task_delta; + qcfs_rq->h_nr_running +=3D running_delta; + qcfs_rq->h_nr_enqueued +=3D enqueued_delta; qcfs_rq->idle_h_nr_running +=3D idle_task_delta; qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 @@ -6121,11 +6130,11 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) } =20 /* Start the fair server if un-throttling resulted in new runnable tasks = */ - if (!rq_h_nr_running && rq->cfs.h_nr_running) + if (!rq_h_nr_enqueued && rq->cfs.h_nr_enqueued) dl_server_start(&rq->fair_server); =20 /* At this point se is NULL and we are at root level*/ - add_nr_running(rq, task_delta); + add_nr_running(rq, enqueued_delta); =20 unthrottle_throttle: assert_list_leaf_cfs_rq(rq); @@ -6840,7 +6849,7 @@ static void hrtick_start_fair(struct rq *rq, struct t= ask_struct *p) =20 SCHED_WARN_ON(task_rq(p) !=3D rq); =20 - if (rq->cfs.h_nr_running > 1) { + if (rq->cfs.h_nr_enqueued > 1) { u64 ran =3D se->sum_exec_runtime - se->prev_sum_exec_runtime; u64 slice =3D se->slice; s64 delta =3D slice - ran; @@ -6967,7 +6976,7 @@ requeue_delayed_entity(struct sched_entity *se) } =20 update_load_avg(cfs_rq, se, 0); - clear_delayed(se); + clear_delayed(se, true); } =20 /* @@ -6983,7 +6992,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) int idle_h_nr_running =3D task_has_idle_policy(p); int h_nr_delayed =3D 0; int task_new =3D !(flags & ENQUEUE_WAKEUP); - int rq_h_nr_running =3D rq->cfs.h_nr_running; + int rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; u64 slice =3D 0; =20 /* @@ -7031,7 +7040,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) enqueue_entity(cfs_rq, se, flags); slice =3D cfs_rq_min_slice(cfs_rq); =20 - cfs_rq->h_nr_running++; + if (!h_nr_delayed) + cfs_rq->h_nr_running++; + cfs_rq->h_nr_enqueued++; cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 @@ -7055,7 +7066,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) se->slice =3D slice; slice =3D cfs_rq_min_slice(cfs_rq); =20 - cfs_rq->h_nr_running++; + if (!h_nr_delayed) + cfs_rq->h_nr_running++; + cfs_rq->h_nr_enqueued++; cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 @@ -7067,7 +7080,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) goto enqueue_throttle; } =20 - if (!rq_h_nr_running && rq->cfs.h_nr_running) { + if (!rq_h_nr_enqueued && rq->cfs.h_nr_enqueued) { /* Account for idle runtime */ if (!rq->nr_running) dl_server_update_idle_time(rq, rq->curr); @@ -7114,7 +7127,7 @@ static void set_next_buddy(struct sched_entity *se); static int dequeue_entities(struct rq *rq, struct sched_entity *se, int fl= ags) { bool was_sched_idle =3D sched_idle_rq(rq); - int rq_h_nr_running =3D rq->cfs.h_nr_running; + int rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; bool task_sleep =3D flags & DEQUEUE_SLEEP; bool task_delayed =3D flags & DEQUEUE_DELAYED; struct task_struct *p =3D NULL; @@ -7145,7 +7158,9 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) break; } =20 - cfs_rq->h_nr_running -=3D h_nr_running; + if (!h_nr_delayed) + cfs_rq->h_nr_running -=3D h_nr_running; + cfs_rq->h_nr_enqueued -=3D h_nr_running; cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 @@ -7184,7 +7199,9 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) se->slice =3D slice; slice =3D cfs_rq_min_slice(cfs_rq); =20 - cfs_rq->h_nr_running -=3D h_nr_running; + if (!h_nr_delayed) + cfs_rq->h_nr_running -=3D h_nr_running; + cfs_rq->h_nr_enqueued -=3D h_nr_running; cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 @@ -7198,7 +7215,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) =20 sub_nr_running(rq, h_nr_running); =20 - if (rq_h_nr_running && !rq->cfs.h_nr_running) + if (rq_h_nr_enqueued && !rq->cfs.h_nr_enqueued) dl_server_stop(&rq->fair_server); =20 /* balance early to pull high priority tasks */ @@ -12862,7 +12879,7 @@ static int sched_balance_newidle(struct rq *this_rq= , struct rq_flags *rf) pulled_task =3D 1; =20 /* Is there a task of a high priority class? */ - if (this_rq->nr_running !=3D this_rq->cfs.h_nr_running) + if (this_rq->nr_running !=3D this_rq->cfs.h_nr_enqueued) pulled_task =3D -1; =20 out: @@ -13549,7 +13566,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) parent_cfs_rq->idle_nr_running--; } =20 - idle_task_delta =3D grp_cfs_rq->h_nr_running - + idle_task_delta =3D grp_cfs_rq->h_nr_enqueued - grp_cfs_rq->idle_h_nr_running; if (!cfs_rq_is_idle(grp_cfs_rq)) idle_task_delta *=3D -1; diff --git a/kernel/sched/pelt.c b/kernel/sched/pelt.c index fee75cc2c47b..fc07382361a8 100644 --- a/kernel/sched/pelt.c +++ b/kernel/sched/pelt.c @@ -321,7 +321,7 @@ int __update_load_avg_cfs_rq(u64 now, struct cfs_rq *cf= s_rq) { if (___update_load_sum(now, &cfs_rq->avg, scale_load_down(cfs_rq->load.weight), - cfs_rq->h_nr_running - cfs_rq->h_nr_delayed, + cfs_rq->h_nr_running, cfs_rq->curr !=3D NULL)) { =20 ___update_load_avg(&cfs_rq->avg, 1); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1e494af2cd23..b5fe4a622822 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -647,6 +647,7 @@ struct cfs_rq { struct load_weight load; unsigned int nr_running; unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ + unsigned int h_nr_enqueued; unsigned int idle_nr_running; /* SCHED_IDLE */ unsigned int idle_h_nr_running; /* SCHED_IDLE */ unsigned int h_nr_delayed; @@ -899,11 +900,8 @@ struct dl_rq { =20 static inline void se_update_runnable(struct sched_entity *se) { - if (!entity_is_task(se)) { - struct cfs_rq *cfs_rq =3D se->my_q; - - se->runnable_weight =3D cfs_rq->h_nr_running - cfs_rq->h_nr_delayed; - } + if (!entity_is_task(se)) + se->runnable_weight =3D se->my_q->h_nr_running; } =20 static inline long se_runnable(struct sched_entity *se) --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DDE5157E82 for ; Thu, 28 Nov 2024 09:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786083; cv=none; b=gYMPGeNjDROl+uKUHv2TBmE7ZqFbZRhE7QUT00bvYuuS0ys4vrGVwop9uX/bbOOYwzgg7KuESXAwrxfae3DM0I+soI0j6aD4kGQcI2kZGvyBiEgC2Mcs22w/z9oqEzV0Nf9zdQRL3w8JpBc5/GvA49xi8crKuEWTLbeT7LSN5AM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786083; c=relaxed/simple; bh=AFwaOtlJwBmL7UWVL/LuCsLkRORFbRAcghfQ7vZwWw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RS1qooaBDZ89ZpBSrtCZIoKFYLLSJRQcaGbwCfK7IHu7SYQtKF7WsrF3er7LDAD1GDnjamRXz70reBSbhi4hiqFdPhAWDTMZHfeRD6FvXrrex7OtKEgW01qK13Im32BDRHTRbirSF9F7v/MZTeYVhkUMKLx4dAGyHLIfLpgtZsA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=q8B6kzP4; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="q8B6kzP4" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-382456c6597so490577f8f.2 for ; Thu, 28 Nov 2024 01:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786079; x=1733390879; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JHyrrLyD8GVTk1lrJ8IGYXmn5uMVrFFI+lZ5smrxk9s=; b=q8B6kzP4pcfH8OFGeQ2zuP/HJOXp4K0XEUawGaEw8GKdXY9Bpnjm2S/PjuzWEFLG5q UOHQlDwvzMCECxE+/S/hlYG1BJOYtsBT7CAL6ngSO7VsIUDe/H+EtYNYiByz90KsE7/Y zfalTt48pAKAC2N8VC8k14tBSihZViEwDrPgCpoFQHAtaaAhll1f1vvo8eeY/o/jqypl hMq/vHnmjDieOvP028GDvjbYCzX90EO99ptKJ6R3d9a3qeeR/zHPzAy9ysJ7OSCKKViT /fIM+kOW8uFWbG+HNymuCW80mypP5OSBdHnZQoVXoyTzceMW3zkiZFdxwzjZtUCJOl2/ xBjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786079; x=1733390879; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JHyrrLyD8GVTk1lrJ8IGYXmn5uMVrFFI+lZ5smrxk9s=; b=d+40oijY+yf/dCcHJXSEfOdKFLSt9fSLckXVv/fd/J3aIjftBF0+7lNOveIthOrvJl RWV3YxWmBevMVG46knJwblkpeHTrwDj+W8or87Kr6LM26KgznbcHIz4MMfsM/7rLg/T6 0poLtezyjfPrLf63NUUlzDdb80jtHDD0O4vV1wMlVBKwOK2XcbCBM7JLpb9cQbp6Yv4x MeNyubgirxucAcmaBJz7lho9JsK2tP+Zch5cgLJrcc8ISTrdxj56AvOGv1IBu/jWqRNX XREr2zs/kHFc3CfbLM4izDNq4Dk7YWHI7v6LYcmRkZLOUHXeLjCfUM6Zj6Ku9RM4dUSD FL6A== X-Forwarded-Encrypted: i=1; AJvYcCWQrngnZSW344u0v8MMuuLGcMHT2HN+Jkb1iOLe47P2kmadjPs4b1TUGfYmkmF759m0g+TrlRjQlRXqgbw=@vger.kernel.org X-Gm-Message-State: AOJu0YzZZ3yDAMYKwMhzm3b51AGYrtWuRAey1D8Sf9t2RnE+jjzlQLfU DQQRBOlsBLq4/rfg6pxDsAtxAO6p6Bh1wjPWqvPz2AxyeB4J/n+gOzJ89UuHh0vAl5pGu7lSxlv TOTs= X-Gm-Gg: ASbGncvjgEd3zzCstLR2H8RCd6jsfOwl4GNxsxm75PZDFLR8l+Pokk6x0c2lVYUP8ny h4qFqPP7r2C/kFzI/PQY43YwxamC+oN0M+mOEB3UWra9OfWasjuxHegcRBUbaDWST+YKTpifWa+ WMW1OngG6VtNHyVf9C7EzlhzYz1+QLJ9jvkU5DYiEAWlV511U75LqEl8Sc8uO70LrXI1vyCGwTg T5xHMM/mjxslnz1jZ37J7ZrREMxbrXaPVFWnmoETciCTftQvJTypYeExUI= X-Google-Smtp-Source: AGHT+IGd79W4eNyWkAVmSWcoCFYN1gmmNchqQI21EFS46Q8ouW1SouVj0543hUKO/49QVSlWok5o2A== X-Received: by 2002:a05:6000:1561:b0:382:359f:5338 with SMTP id ffacd0b85a97d-385c6ebe4f3mr5666869f8f.34.1732786079578; Thu, 28 Nov 2024 01:27:59 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:27:58 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 3/9] sched/fair: Rename cfs_rq.idle_h_nr_running into h_nr_idle Date: Thu, 28 Nov 2024 10:27:44 +0100 Message-ID: <20241128092750.2541735-4-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use same naming convention as others starting with h_nr_* and rename idle_h_nr_running into h_nr_idle. The "running" is not correct anymore as it includes delayed dequeue tasks as well. Signed-off-by: Vincent Guittot --- kernel/sched/debug.c | 4 ++-- kernel/sched/fair.c | 52 ++++++++++++++++++++++---------------------- kernel/sched/sched.h | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 6b8cd869a2f4..63ec08c8ccf1 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -849,8 +849,8 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running", cfs_rq->idle_nr_running); - SEQ_printf(m, " .%-30s: %d\n", "idle_h_nr_running", - cfs_rq->idle_h_nr_running); + SEQ_printf(m, " .%-30s: %d\n", "h_nr_idle", + cfs_rq->h_nr_idle); SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight); #ifdef CONFIG_SMP SEQ_printf(m, " .%-30s: %lu\n", "load_avg", diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6b7afb69d8ff..2cd2651305ae 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5938,7 +5938,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long running_delta, enqueued_delta, idle_task_delta, delayed_delta, deque= ue =3D 1; + long running_delta, enqueued_delta, idle_delta, delayed_delta, dequeue = =3D 1; long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 raw_spin_lock(&cfs_b->lock); @@ -5971,7 +5971,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) =20 running_delta =3D cfs_rq->h_nr_running; enqueued_delta =3D cfs_rq->h_nr_enqueued; - idle_task_delta =3D cfs_rq->idle_h_nr_running; + idle_delta =3D cfs_rq->h_nr_idle; delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); @@ -5992,11 +5992,11 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) dequeue_entity(qcfs_rq, se, flags); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_enqueued; + idle_delta =3D cfs_rq->h_nr_enqueued; =20 qcfs_rq->h_nr_running -=3D running_delta; qcfs_rq->h_nr_enqueued -=3D enqueued_delta; - qcfs_rq->idle_h_nr_running -=3D idle_task_delta; + qcfs_rq->h_nr_idle -=3D idle_delta; qcfs_rq->h_nr_delayed -=3D delayed_delta; =20 if (qcfs_rq->load.weight) { @@ -6016,11 +6016,11 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) se_update_runnable(se); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_enqueued; + idle_delta =3D cfs_rq->h_nr_enqueued; =20 qcfs_rq->h_nr_running -=3D running_delta; qcfs_rq->h_nr_enqueued -=3D enqueued_delta; - qcfs_rq->idle_h_nr_running -=3D idle_task_delta; + qcfs_rq->h_nr_idle -=3D idle_delta; qcfs_rq->h_nr_delayed -=3D delayed_delta; } =20 @@ -6047,7 +6047,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long running_delta, enqueued_delta, idle_task_delta, delayed_delta; + long running_delta, enqueued_delta, idle_delta, delayed_delta; long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 se =3D cfs_rq->tg->se[cpu_of(rq)]; @@ -6083,7 +6083,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) =20 running_delta =3D cfs_rq->h_nr_running; enqueued_delta =3D cfs_rq->h_nr_enqueued; - idle_task_delta =3D cfs_rq->idle_h_nr_running; + idle_delta =3D cfs_rq->h_nr_idle; delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); @@ -6098,11 +6098,11 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) enqueue_entity(qcfs_rq, se, ENQUEUE_WAKEUP); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_enqueued; + idle_delta =3D cfs_rq->h_nr_enqueued; =20 qcfs_rq->h_nr_running +=3D running_delta; qcfs_rq->h_nr_enqueued +=3D enqueued_delta; - qcfs_rq->idle_h_nr_running +=3D idle_task_delta; + qcfs_rq->h_nr_idle +=3D idle_delta; qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ @@ -6117,11 +6117,11 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) se_update_runnable(se); =20 if (cfs_rq_is_idle(group_cfs_rq(se))) - idle_task_delta =3D cfs_rq->h_nr_enqueued; + idle_delta =3D cfs_rq->h_nr_enqueued; =20 qcfs_rq->h_nr_running +=3D running_delta; qcfs_rq->h_nr_enqueued +=3D enqueued_delta; - qcfs_rq->idle_h_nr_running +=3D idle_task_delta; + qcfs_rq->h_nr_idle +=3D idle_delta; qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ @@ -6937,7 +6937,7 @@ static inline void check_update_overutilized_status(s= truct rq *rq) { } /* Runqueue only has SCHED_IDLE tasks enqueued */ static int sched_idle_rq(struct rq *rq) { - return unlikely(rq->nr_running =3D=3D rq->cfs.idle_h_nr_running && + return unlikely(rq->nr_running =3D=3D rq->cfs.h_nr_idle && rq->nr_running); } =20 @@ -6989,7 +6989,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) { struct cfs_rq *cfs_rq; struct sched_entity *se =3D &p->se; - int idle_h_nr_running =3D task_has_idle_policy(p); + int h_nr_idle =3D task_has_idle_policy(p); int h_nr_delayed =3D 0; int task_new =3D !(flags & ENQUEUE_WAKEUP); int rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; @@ -7043,11 +7043,11 @@ enqueue_task_fair(struct rq *rq, struct task_struct= *p, int flags) if (!h_nr_delayed) cfs_rq->h_nr_running++; cfs_rq->h_nr_enqueued++; - cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; + cfs_rq->h_nr_idle +=3D h_nr_idle; cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) - idle_h_nr_running =3D 1; + h_nr_idle =3D 1; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(cfs_rq)) @@ -7069,11 +7069,11 @@ enqueue_task_fair(struct rq *rq, struct task_struct= *p, int flags) if (!h_nr_delayed) cfs_rq->h_nr_running++; cfs_rq->h_nr_enqueued++; - cfs_rq->idle_h_nr_running +=3D idle_h_nr_running; + cfs_rq->h_nr_idle +=3D h_nr_idle; cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) - idle_h_nr_running =3D 1; + h_nr_idle =3D 1; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(cfs_rq)) @@ -7131,7 +7131,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) bool task_sleep =3D flags & DEQUEUE_SLEEP; bool task_delayed =3D flags & DEQUEUE_DELAYED; struct task_struct *p =3D NULL; - int idle_h_nr_running =3D 0; + int h_nr_idle =3D 0; int h_nr_running =3D 0; int h_nr_delayed =3D 0; struct cfs_rq *cfs_rq; @@ -7140,7 +7140,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) if (entity_is_task(se)) { p =3D task_of(se); h_nr_running =3D 1; - idle_h_nr_running =3D task_has_idle_policy(p); + h_nr_idle =3D task_has_idle_policy(p); if (!task_sleep && !task_delayed) h_nr_delayed =3D !!se->sched_delayed; } else { @@ -7161,11 +7161,11 @@ static int dequeue_entities(struct rq *rq, struct s= ched_entity *se, int flags) if (!h_nr_delayed) cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->h_nr_enqueued -=3D h_nr_running; - cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; + cfs_rq->h_nr_idle -=3D h_nr_idle; cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) - idle_h_nr_running =3D h_nr_running; + h_nr_idle =3D h_nr_running; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(cfs_rq)) @@ -7202,11 +7202,11 @@ static int dequeue_entities(struct rq *rq, struct s= ched_entity *se, int flags) if (!h_nr_delayed) cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->h_nr_enqueued -=3D h_nr_running; - cfs_rq->idle_h_nr_running -=3D idle_h_nr_running; + cfs_rq->h_nr_idle -=3D h_nr_idle; cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) - idle_h_nr_running =3D h_nr_running; + h_nr_idle =3D h_nr_running; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(cfs_rq)) @@ -13567,7 +13567,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) } =20 idle_task_delta =3D grp_cfs_rq->h_nr_enqueued - - grp_cfs_rq->idle_h_nr_running; + grp_cfs_rq->h_nr_idle; if (!cfs_rq_is_idle(grp_cfs_rq)) idle_task_delta *=3D -1; =20 @@ -13577,7 +13577,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) if (!se->on_rq) break; =20 - cfs_rq->idle_h_nr_running +=3D idle_task_delta; + cfs_rq->h_nr_idle +=3D idle_task_delta; =20 /* Already accounted at parent level and above. */ if (cfs_rq_is_idle(cfs_rq)) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b5fe4a622822..8727bfb0e080 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -649,7 +649,7 @@ struct cfs_rq { unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ unsigned int h_nr_enqueued; unsigned int idle_nr_running; /* SCHED_IDLE */ - unsigned int idle_h_nr_running; /* SCHED_IDLE */ + unsigned int h_nr_idle; /* SCHED_IDLE */ unsigned int h_nr_delayed; =20 s64 avg_vruntime; --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1066F1885BF for ; Thu, 28 Nov 2024 09:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786085; cv=none; b=dQUFtS1/hcMA8fK43VF5HQoT1V/z9fX6w4FPFQCY+4xgtCR/RyXOtZpwKJ/c2r8wa3QzCujfoZh9n4vE5TcIkJwN0vXCXgx/qQkMqCKs/tla2UbJJxtoGRw9gFtGHvIKak48nmHOup/QltB/4OXGKG3JyCEZoiviPruLbbv6WDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786085; c=relaxed/simple; bh=/0nArOpcytNqd1DAa59R62G/XX/W4P65Vf8Wh1yPYgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HEZGooQcQlAPD2WVYpM0hONZmkvMu4nKEi1DAZKrioZvUA0g0EBCIgFjiEGBSmIsls1LJV5LhORpbWib4Aq1n+xmja7PkjyECpu+8o5rDdBrSt3SrNoFmT4JR9HzVM2CN6BpaJzQq4rmDyTCsrOuQ6rSakxdJnBczwJoSKmk/aY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=PRLxACs6; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PRLxACs6" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-53ddb99e9dcso512904e87.3 for ; Thu, 28 Nov 2024 01:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786081; x=1733390881; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xhHbLSbi+1lky1o+Pz8IqrlWhoDlD5xGRmhjzmPSnWQ=; b=PRLxACs6GNXTRNVNrIfJ2IY4tl9jj+7C2b3zokJmg9X/NKJCTtReyCF7FaY4zD74xJ jPtBJ/JjX5yujZsh9UUO46wBOeGch4uufOiFqvyq1LBsEyFmHpd1OPewzalZzhxiSSGh B21QVXdjMOdjN22o2mfC1oqSQyoW4j4cEvWFsdhf81lWCH2FMBAw+0fOKNk2le5sl7eD EnMxDgNLmshsXOII2IovJdcnSwlA2qa5F5LaOUsh+D4VJ9S+2VASvoyUcc7uIq4RFHUx a7GR1EMykJqHR15qFtbEKEOZa/k3jeR98eMb6ZgQ+tpRAdb6AztJzfiCCUpGPAeKmn9A Jz9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786081; x=1733390881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xhHbLSbi+1lky1o+Pz8IqrlWhoDlD5xGRmhjzmPSnWQ=; b=p1xmPejrKPJUEbuz0qU9QY2kF3lOK6wcPPbz+qxsOWDo1PRLdJ4ENf81DNPgDQACJu k13YeFnFC76Th9SRau6hb9megOwK5rcAJ0Svd6t6qZ3JXSHA9Z66P2TiUgmeV7l7TXiV 84fb208ie2a/AtTA9/5ho0LjjpC7Iw0UReFhXpr+q7FSExwiKlJL3DGqsGR2MhRgygna DGENN9rgPMz5QTMYgBJRpomzpreSdSLwnnrbVfFB7Mbe5c1B7g0HRm6ilANnYQ9YlcJu eaTm0SXq/Xqbz82udEeRJMLlhpaDMrpZCwSw089CPkNXo1HKUXWYiQ89gtQXEySK3osA YnNA== X-Forwarded-Encrypted: i=1; AJvYcCVR0aP6ku9n/PxZ/mEBI10jL33cLjW6pK5LHaUBETqIk7NiKwCqacJB33pZuzDybOTjfrEcgH88tE1gD+4=@vger.kernel.org X-Gm-Message-State: AOJu0YxWYPRUO8my44Hb8R77qMENQAiQyVmQwvuC9tXJg2SVaR4YXB6/ pJbA/rii+yaOheNrj92XGzjjIKuw2jHpkz1/iCC5/AtVsd10o+Kl0QE3yOJJ2UQ= X-Gm-Gg: ASbGncuoyQ3LozS9+6UwwFZX4rV92Yho0J6ZvZCDEDKak1QvIvdu2Hwyx/vrDmT/yhp QEHMivajIFzqK87xnfSCtckAaeohrL59QgR3uyd3tBLTz1yImZHE5ORqTQPvhMBL03nthu1HuKs kI7hAnKG3Ck4y3mjsX6fOUdee6NCIaUg/ZaMuKffIZRKxQtNx+8mTf/VScBVcESZEspOREKQMMQ 19NHUQG+LhEs55UKgSTWAXM5IiFl5MePN7tB3FAnOpMWzeVuaPO2559eN8= X-Google-Smtp-Source: AGHT+IGBUhsP3a2SkQaqiE7IVzKlt9UpWFR1dd6jSL9aJlBBkeTjc+GoFRAA0Pl7qUeeEcDMbwvYhQ== X-Received: by 2002:a05:6512:3c99:b0:53d:ed8d:9a14 with SMTP id 2adb3069b0e04-53df00c7448mr3722933e87.2.1732786081175; Thu, 28 Nov 2024 01:28:01 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:00 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 4/9] sched/fair: Remove unused cfs_rq.idle_nr_running Date: Thu, 28 Nov 2024 10:27:45 +0100 Message-ID: <20241128092750.2541735-5-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" cfs_rq.idle_nr_running field is not used anywhere so we can remove the useless associated computation Signed-off-by: Vincent Guittot --- kernel/sched/debug.c | 2 -- kernel/sched/fair.c | 14 +------------- kernel/sched/sched.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 63ec08c8ccf1..0c8e21f9039c 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -847,8 +847,6 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_enqueued", cfs_rq->h_nr_enqueued); SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); - SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running", - cfs_rq->idle_nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_idle", cfs_rq->h_nr_idle); SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2cd2651305ae..65492399f200 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3674,8 +3674,6 @@ account_entity_enqueue(struct cfs_rq *cfs_rq, struct = sched_entity *se) } #endif cfs_rq->nr_running++; - if (se_is_idle(se)) - cfs_rq->idle_nr_running++; } =20 static void @@ -3689,8 +3687,6 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct = sched_entity *se) } #endif cfs_rq->nr_running--; - if (se_is_idle(se)) - cfs_rq->idle_nr_running--; } =20 /* @@ -13547,7 +13543,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) for_each_possible_cpu(i) { struct rq *rq =3D cpu_rq(i); struct sched_entity *se =3D tg->se[i]; - struct cfs_rq *parent_cfs_rq, *grp_cfs_rq =3D tg->cfs_rq[i]; + struct cfs_rq *grp_cfs_rq =3D tg->cfs_rq[i]; bool was_idle =3D cfs_rq_is_idle(grp_cfs_rq); long idle_task_delta; struct rq_flags rf; @@ -13558,14 +13554,6 @@ int sched_group_set_idle(struct task_group *tg, lo= ng idle) if (WARN_ON_ONCE(was_idle =3D=3D cfs_rq_is_idle(grp_cfs_rq))) goto next_cpu; =20 - if (se->on_rq) { - parent_cfs_rq =3D cfs_rq_of(se); - if (cfs_rq_is_idle(grp_cfs_rq)) - parent_cfs_rq->idle_nr_running++; - else - parent_cfs_rq->idle_nr_running--; - } - idle_task_delta =3D grp_cfs_rq->h_nr_enqueued - grp_cfs_rq->h_nr_idle; if (!cfs_rq_is_idle(grp_cfs_rq)) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 8727bfb0e080..d795202a7174 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -648,7 +648,6 @@ struct cfs_rq { unsigned int nr_running; unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ unsigned int h_nr_enqueued; - unsigned int idle_nr_running; /* SCHED_IDLE */ unsigned int h_nr_idle; /* SCHED_IDLE */ unsigned int h_nr_delayed; =20 --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39A6819049B for ; Thu, 28 Nov 2024 09:28:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786086; cv=none; b=bwZ0mmCRcGbvW62YNzzFp4BYklspW7lhw5W72Sse4sGwD1ZXXCjjO0gw2fUDUC/YJDbzWAxQK2XAllrBIWYYVqXCyX/JJ4Lx7BYx7EzMntZcJzHorLpa6UCcYmxgnE7l2x5XZLPdz+jfpevW822IKxcbu57NRSqqhep8c2cz0Wg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786086; c=relaxed/simple; bh=kMEX057xnOKxanvXKojIuYognrIC/ESd92hfo61DxoQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=naPJsW1tuG4nt4byuL2a+94UmXSp/0KXHtm5i35vvQPgz/m+htuIvk53Xct0CNkq9dXhWHRCm260hQFgeaQvAQR9hFSsqtpv9hnB7aOzBZOb0Cfo2yJRYdIbJ+VZQr01B+p4CcLoIsB8VEDudA+otGjmHKHYMc924gE6PgpksQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Mr7sntZF; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Mr7sntZF" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-434a7ee3d60so9955085e9.1 for ; Thu, 28 Nov 2024 01:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786082; x=1733390882; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0RJnvdeirAoOPRQXdey1AZfjeU4m7OozAEH8LULGv+c=; b=Mr7sntZFzTYuWmJlTx3GPATwLbfA7tkPVAx1VeHZ7jGbZ1VMwx2akeSa56Jh+y8IWR 6FG26S0WUZ3Dnp6Hbzh9pHYx/t99+IK15Psyq4qjKg+WgXVXI/gDhpCTwoECeaZVuprR z/rM/vqiPw1WLPzdOmwTY9F2S7B6O80bjRyy/SBNjRfTvy0jkfhCFbhAmWgHbLoWC193 Y9mQ+fQ4u6VeMyQpxWZpRdRMvnoT0IZcaAKtgh/PgwDOoG/Ewp2pBQXIUkEEY9XYPEHt sINvWgBjZ09Fe65cYEyGiL8KXxZHu91aIATuBdJbikZackOAdsWoXC0qipO8BbgZ9cBA DaqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786082; x=1733390882; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0RJnvdeirAoOPRQXdey1AZfjeU4m7OozAEH8LULGv+c=; b=CJX0rCzNr2RIEdSeazxNDZ9lX+29zUtyn5DGCWBSq+nwq/hfoOvdOX5LTJbaYIqlIQ p4sf/mbseT4K55/LSS84HcBmTRW9uR993G7vg5n1dWR6DogO/eb01Qer59X0n4BMqpPK TdyhtKTc7ZdeMaYZ+K7TUG8Rvmu0VcldrpXUnGkWLdhHAAs9ti50jTcubbh91XEXHPq8 9bo3M8Y3d/Bxt8RWAH4RO84YDMA2Y7zqG51c3Ab519y0YXPm8XK3tdzUalKE/zK5UK0u PKuo6pBiqn7RMbG4f28uiTsQ3lmtQIltFurhauawd+gLihgOHLu+r8kLJit6WcoxJknd QLDg== X-Forwarded-Encrypted: i=1; AJvYcCVZbN8xXfNd/5M35zXqrdE/QvBH8fhc2yuNCOr6r4U/tguHeXljeMvsg/XxOfFmHeCOWewn+rAnnSyjBWk=@vger.kernel.org X-Gm-Message-State: AOJu0YyIc6shxWIkuYKEpWQbUMR2T8DdhOQ6x5v8ds8GfJgnB3xnn2mI 9PE839IWxLQfQkLXsjAsQNxrvtuwXwTaS2RsLXroWB5Sc96Fp3i7pboNGtTyvFs= X-Gm-Gg: ASbGncu1qbjWvrCDb1VoKycavPGZ+iiStUG10pWZUb1pv1OL1T7cp1AYU182JDxc1NO xcEz0FWZdSmAlwIwPZD377dhSF2s9HpsZVm0JzFDVrieo1MQAKdECcvu5nT1RN+lXBJiVfKFAav f7p7HXJJ6fqEhbBaHgsQcmASJCgelbn5XB6t3Y5rfV9hKjUj5mdRq53GD8wphZZVBJbvpfpnxPC tufF3bh1RnyXSJ8U9mH3zf+NKKuskpQRR3sVG9KGXrv4DZKYm6+ataHmf0= X-Google-Smtp-Source: AGHT+IG5x7UXSamlxr4tvQL+ndZOAUhaH5l1vZWFAEf6TvRbC1lb6JqxxLg43El4hkzXQjGt/O1h+Q== X-Received: by 2002:a05:600c:3589:b0:431:15f1:421d with SMTP id 5b1f17b1804b1-434afc44774mr20000965e9.16.1732786082532; Thu, 28 Nov 2024 01:28:02 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:01 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 5/9] sched/fair: Rename cfs_rq.nr_running into nr_enqueued Date: Thu, 28 Nov 2024 10:27:46 +0100 Message-ID: <20241128092750.2541735-6-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename cfs_rq.nr_running into cfs_rq.nr_enqueued which better reflects the reality as the value includes both the ready to run tasks and the delayed dequeue tasks. Signed-off-by: Vincent Guittot --- kernel/sched/core.c | 2 +- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 38 +++++++++++++++++++------------------- kernel/sched/sched.h | 4 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 425739bbdc63..daaa20f01ad4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1341,7 +1341,7 @@ bool sched_can_stop_tick(struct rq *rq) if (scx_enabled() && !scx_can_stop_tick(rq)) return false; =20 - if (rq->cfs.nr_running > 1) + if (rq->cfs.nr_enqueued > 1) return false; =20 /* diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 0c8e21f9039c..8f5273043c16 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -843,7 +843,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SPLIT_NS(right_vruntime)); spread =3D right_vruntime - left_vruntime; SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "spread", SPLIT_NS(spread)); - SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running); + SEQ_printf(m, " .%-30s: %d\n", "nr_enqueued", cfs_rq->nr_enqueued); SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_enqueued", cfs_rq->h_nr_enqueued); SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 65492399f200..a96a771d8e61 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -915,7 +915,7 @@ static struct sched_entity *pick_eevdf(struct cfs_rq *c= fs_rq) * We can safely skip eligibility check if there is only one entity * in this cfs_rq, saving some cycles. */ - if (cfs_rq->nr_running =3D=3D 1) + if (cfs_rq->nr_enqueued =3D=3D 1) return curr && curr->on_rq ? curr : se; =20 if (curr && (!curr->on_rq || !entity_eligible(cfs_rq, curr))) @@ -1247,7 +1247,7 @@ static void update_curr(struct cfs_rq *cfs_rq) =20 account_cfs_rq_runtime(cfs_rq, delta_exec); =20 - if (cfs_rq->nr_running =3D=3D 1) + if (cfs_rq->nr_enqueued =3D=3D 1) return; =20 if (resched || did_preempt_short(cfs_rq, curr)) { @@ -3673,7 +3673,7 @@ account_entity_enqueue(struct cfs_rq *cfs_rq, struct = sched_entity *se) list_add(&se->group_node, &rq->cfs_tasks); } #endif - cfs_rq->nr_running++; + cfs_rq->nr_enqueued++; } =20 static void @@ -3686,7 +3686,7 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct = sched_entity *se) list_del_init(&se->group_node); } #endif - cfs_rq->nr_running--; + cfs_rq->nr_enqueued--; } =20 /* @@ -5220,7 +5220,7 @@ static inline void update_misfit_status(struct task_s= truct *p, struct rq *rq) =20 static inline bool cfs_rq_is_decayed(struct cfs_rq *cfs_rq) { - return !cfs_rq->nr_running; + return !cfs_rq->nr_enqueued; } =20 #define UPDATE_TG 0x0 @@ -5276,7 +5276,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_enti= ty *se, int flags) * * EEVDF: placement strategy #1 / #2 */ - if (sched_feat(PLACE_LAG) && cfs_rq->nr_running && se->vlag) { + if (sched_feat(PLACE_LAG) && cfs_rq->nr_enqueued && se->vlag) { struct sched_entity *curr =3D cfs_rq->curr; unsigned long load; =20 @@ -5425,7 +5425,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_en= tity *se, int flags) __enqueue_entity(cfs_rq, se); se->on_rq =3D 1; =20 - if (cfs_rq->nr_running =3D=3D 1) { + if (cfs_rq->nr_enqueued =3D=3D 1) { check_enqueue_throttle(cfs_rq); if (!throttled_hierarchy(cfs_rq)) { list_add_leaf_cfs_rq(cfs_rq); @@ -5573,7 +5573,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_en= tity *se, int flags) if (flags & DEQUEUE_DELAYED) finish_delayed_dequeue_entity(se); =20 - if (cfs_rq->nr_running =3D=3D 0) + if (cfs_rq->nr_enqueued =3D=3D 0) update_idle_cfs_rq_clock_pelt(cfs_rq); =20 return true; @@ -5921,7 +5921,7 @@ static int tg_throttle_down(struct task_group *tg, vo= id *data) list_del_leaf_cfs_rq(cfs_rq); =20 SCHED_WARN_ON(cfs_rq->throttled_clock_self); - if (cfs_rq->nr_running) + if (cfs_rq->nr_enqueued) cfs_rq->throttled_clock_self =3D rq_clock(rq); } cfs_rq->throttle_count++; @@ -6033,7 +6033,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) */ cfs_rq->throttled =3D 1; SCHED_WARN_ON(cfs_rq->throttled_clock); - if (cfs_rq->nr_running) + if (cfs_rq->nr_enqueued) cfs_rq->throttled_clock =3D rq_clock(rq); return true; } @@ -6136,7 +6136,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) assert_list_leaf_cfs_rq(rq); =20 /* Determine whether we need to wake up potentially idle CPU: */ - if (rq->curr =3D=3D rq->idle && rq->cfs.nr_running) + if (rq->curr =3D=3D rq->idle && rq->cfs.nr_enqueued) resched_curr(rq); } =20 @@ -6437,7 +6437,7 @@ static __always_inline void return_cfs_rq_runtime(str= uct cfs_rq *cfs_rq) if (!cfs_bandwidth_used()) return; =20 - if (!cfs_rq->runtime_enabled || cfs_rq->nr_running) + if (!cfs_rq->runtime_enabled || cfs_rq->nr_enqueued) return; =20 __return_cfs_rq_runtime(cfs_rq); @@ -6960,14 +6960,14 @@ requeue_delayed_entity(struct sched_entity *se) if (sched_feat(DELAY_ZERO)) { update_entity_lag(cfs_rq, se); if (se->vlag > 0) { - cfs_rq->nr_running--; + cfs_rq->nr_enqueued--; if (se !=3D cfs_rq->curr) __dequeue_entity(cfs_rq, se); se->vlag =3D 0; place_entity(cfs_rq, se, 0); if (se !=3D cfs_rq->curr) __enqueue_entity(cfs_rq, se); - cfs_rq->nr_running++; + cfs_rq->nr_enqueued++; } } =20 @@ -8900,7 +8900,7 @@ static struct task_struct *pick_task_fair(struct rq *= rq) =20 again: cfs_rq =3D &rq->cfs; - if (!cfs_rq->nr_running) + if (!cfs_rq->nr_enqueued) return NULL; =20 do { @@ -9017,7 +9017,7 @@ static struct task_struct *__pick_next_task_fair(stru= ct rq *rq, struct task_stru =20 static bool fair_server_has_tasks(struct sched_dl_entity *dl_se) { - return !!dl_se->rq->cfs.nr_running; + return !!dl_se->rq->cfs.nr_enqueued; } =20 static struct task_struct *fair_server_pick_task(struct sched_dl_entity *d= l_se) @@ -9807,7 +9807,7 @@ static bool __update_blocked_fair(struct rq *rq, bool= *done) if (update_cfs_rq_load_avg(cfs_rq_clock_pelt(cfs_rq), cfs_rq)) { update_tg_load_avg(cfs_rq); =20 - if (cfs_rq->nr_running =3D=3D 0) + if (cfs_rq->nr_enqueued =3D=3D 0) update_idle_cfs_rq_clock_pelt(cfs_rq); =20 if (cfs_rq =3D=3D &rq->cfs) @@ -12989,7 +12989,7 @@ static inline void task_tick_core(struct rq *rq, st= ruct task_struct *curr) * MIN_NR_TASKS_DURING_FORCEIDLE - 1 tasks and use that to check * if we need to give up the CPU. */ - if (rq->core->core_forceidle_count && rq->cfs.nr_running =3D=3D 1 && + if (rq->core->core_forceidle_count && rq->cfs.nr_enqueued =3D=3D 1 && __entity_slice_used(&curr->se, MIN_NR_TASKS_DURING_FORCEIDLE)) resched_curr(rq); } @@ -13133,7 +13133,7 @@ prio_changed_fair(struct rq *rq, struct task_struct= *p, int oldprio) if (!task_on_rq_queued(p)) return; =20 - if (rq->cfs.nr_running =3D=3D 1) + if (rq->cfs.nr_enqueued =3D=3D 1) return; =20 /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index d795202a7174..7d99d18e8984 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -645,7 +645,7 @@ struct balance_callback { /* CFS-related fields in a runqueue */ struct cfs_rq { struct load_weight load; - unsigned int nr_running; + unsigned int nr_enqueued; unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ unsigned int h_nr_enqueued; unsigned int h_nr_idle; /* SCHED_IDLE */ @@ -2566,7 +2566,7 @@ static inline bool sched_rt_runnable(struct rq *rq) =20 static inline bool sched_fair_runnable(struct rq *rq) { - return rq->cfs.nr_running > 0; + return rq->cfs.nr_enqueued > 0; } =20 extern struct task_struct *pick_next_task_fair(struct rq *rq, struct task_= struct *prev, struct rq_flags *rf); --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8E56192B94 for ; Thu, 28 Nov 2024 09:28:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786088; cv=none; b=QAmr9i079+PAHVi+NE3+7IBEBTDR3736KuvAfdZt1iNUSpzb8bguTS7jWu+rpgrsWX3uKwytZTJIWq81WVBcS4uSWXrFOuW8QhBr8XY+/GTv5YFirM17SgMXEvRgKEhZGE79pYSXAYC45DHrOHa3DaUpAaL1DYdlKy79ar7PHmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786088; c=relaxed/simple; bh=dWnM/7fMGmDUt4fGQfcYcFzuYHJ6obAGrUXWMxvqB6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MbnYOf3cbNuLB3itQjh89B10N9MWWkNwVnNUbColCXBEyuNUn+B+wOmo3v75Zq++FAZs/8Znof3QlZ/1NpkzQr7azLe8vp69ZbQ/XJ7hNH3UpNLpPQPD997fHph2TXwxXSMhLCm9cVam5MZ+TNBwbAJOGmVR5H1SQrTDJRfAcjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=roZPrRia; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="roZPrRia" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-434a752140eso5040495e9.3 for ; Thu, 28 Nov 2024 01:28:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786084; x=1733390884; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1sCmgeQzfYei2G42vQ2RJNQKdvbxfWwnCrC/7TrOSpU=; b=roZPrRiaWXfeuIq8NV+0/cdfuOkskilTg1ejYrgg0O9Fe3vkJjz7SSGWxHx37RmBFc JhjzDWMATznZjydg7gzKgtOtqS3RVgdfjNiYQP4M0InMoDwk7IcHT4pZxXisY4dbIfZ0 yDUIR8S8X0ct4SCPUT2Uce8pXP9WXFvhFcgfskm5w6qe+rfGZf9HWxxndey3RF1Y1+fI Z4X94ImJWAzU5hXQLSRAVdz4X+y6V9e5NwarKPHNNnS1ITZB9nvm5MvZMCInJb1mXwCg +Ak6p2HH41RbOE+eaAmKh556Q/qM/rnXkh5GZQJaChn2GMrRPAzsHVazI9Yuu8kkjHJa DYxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786084; x=1733390884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sCmgeQzfYei2G42vQ2RJNQKdvbxfWwnCrC/7TrOSpU=; b=AzZZvyUUeKLh74pPf0RCZ2ztvEInEYK0Vi9fOzDBeoOHGDrSoM8vz+Vy/EZAYQe/xP oaRsWs83MERKL3/rJ1cfPVahmFiVfZLyQVgOgVyPbCyrt3jKZeKWYq6KnumoJZBbm0Vi ITHhYnOyVNZdmF5l9zUS9MApBFYPhJMfBP60sUAP5owtxCijbbmVFFNV/7m+8Ziw72WQ g7/0N7U1AWfNGBLIgpZNz2BL0HFmT9Zov8oScRjnoL5BPjEkdvO27R6+Gnly9JTWEsdJ GY8A32t6nYTC7XXXeUxuGyvGbQthTXt1WPgc2+lp9RA36KGiR2EFi3dod6EgY3R7g9qV VxcQ== X-Forwarded-Encrypted: i=1; AJvYcCVC+PBZv+3/oQl5qraM1CJHbfNDHhHm3O9QxFdK8fc9EeasV0ZChv5NHiQjk5z1dxoPXHKF7d4IdgExYR4=@vger.kernel.org X-Gm-Message-State: AOJu0YxxGlbQ/9pA/nGprKoRwZuWD85KJsO7+L1Ehvqk6lp6K0po3AT1 yNQT7nYhhmRE3+12ieovPPsh9bxyOUON5GgdDO/oeT7p5XpHcSiaroYUFhCb3RU= X-Gm-Gg: ASbGncsXAstWE8//Ivvo/OIAh051y+ZbfSTjwffnYQexB0LrnNgoXFEbTUiRqvW+fUR 0DGTvwI6M+Q24vGvGN+fWY737SunA2MuIaTL+L9FWQQA3QXaBxEjvuylW7Ll5N8eR83nkeikW7T oO64E/HCarcwbjsJ0IU2337c4RnryHM7ZGnn1ZYwxQ0qdOZ4uKqFTtjDb8a2hCGT3PKDPxL0HyE HDNgzmSVGU9DOoSIN8LNZJlwqFoBWXpncv0R/UcD2sSQ8HqPFACOmFKoUg= X-Google-Smtp-Source: AGHT+IGbAZ8sOAp9ERSWKNx1W3oZeGtODmDr/HyIMa7lWX9KL1Icz6v5ae0QqXM0gzN9crt1RckdQw== X-Received: by 2002:a05:600c:3ba6:b0:434:9e63:faff with SMTP id 5b1f17b1804b1-434a9dbc41bmr58648595e9.2.1732786084085; Thu, 28 Nov 2024 01:28:04 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:02 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 6/9] sched/fair: Removed unsued cfs_rq.h_nr_delayed Date: Thu, 28 Nov 2024 10:27:47 +0100 Message-ID: <20241128092750.2541735-7-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" h_nr_delayed is not used anymore. We now have - h_nr_running which tracks tasks ready to run - h_nr_enqueued which tracks enqueued tasks either ready to run or delayed dequeue Signed-off-by: Vincent Guittot --- kernel/sched/debug.c | 1 - kernel/sched/fair.c | 41 ++++++++++++++--------------------------- kernel/sched/sched.h | 1 - 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 8f5273043c16..84f623b9d4af 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -846,7 +846,6 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct c= fs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %d\n", "nr_enqueued", cfs_rq->nr_enqueued); SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running); SEQ_printf(m, " .%-30s: %d\n", "h_nr_enqueued", cfs_rq->h_nr_enqueued); - SEQ_printf(m, " .%-30s: %d\n", "h_nr_delayed", cfs_rq->h_nr_delayed); SEQ_printf(m, " .%-30s: %d\n", "h_nr_idle", cfs_rq->h_nr_idle); SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a96a771d8e61..1b4f1b610543 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5468,21 +5468,18 @@ static void set_delayed(struct sched_entity *se) struct cfs_rq *cfs_rq =3D cfs_rq_of(se); =20 cfs_rq->h_nr_running--; - cfs_rq->h_nr_delayed++; if (cfs_rq_throttled(cfs_rq)) break; } } =20 -static void clear_delayed(struct sched_entity *se, bool running) +static void clear_delayed(struct sched_entity *se) { se->sched_delayed =3D 0; for_each_sched_entity(se) { struct cfs_rq *cfs_rq =3D cfs_rq_of(se); =20 - if (running) - cfs_rq->h_nr_running++; - cfs_rq->h_nr_delayed--; + cfs_rq->h_nr_running++; if (cfs_rq_throttled(cfs_rq)) break; } @@ -5490,7 +5487,7 @@ static void clear_delayed(struct sched_entity *se, bo= ol running) =20 static inline void finish_delayed_dequeue_entity(struct sched_entity *se) { - clear_delayed(se, false); + se->sched_delayed =3D 0; if (sched_feat(DELAY_ZERO) && se->vlag > 0) se->vlag =3D 0; } @@ -5934,7 +5931,7 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long running_delta, enqueued_delta, idle_delta, delayed_delta, dequeue = =3D 1; + long running_delta, enqueued_delta, idle_delta, dequeue =3D 1; long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 raw_spin_lock(&cfs_b->lock); @@ -5968,7 +5965,6 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) running_delta =3D cfs_rq->h_nr_running; enqueued_delta =3D cfs_rq->h_nr_enqueued; idle_delta =3D cfs_rq->h_nr_idle; - delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); int flags; @@ -5993,7 +5989,6 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running -=3D running_delta; qcfs_rq->h_nr_enqueued -=3D enqueued_delta; qcfs_rq->h_nr_idle -=3D idle_delta; - qcfs_rq->h_nr_delayed -=3D delayed_delta; =20 if (qcfs_rq->load.weight) { /* Avoid re-evaluating load for this entity: */ @@ -6017,7 +6012,6 @@ static bool throttle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running -=3D running_delta; qcfs_rq->h_nr_enqueued -=3D enqueued_delta; qcfs_rq->h_nr_idle -=3D idle_delta; - qcfs_rq->h_nr_delayed -=3D delayed_delta; } =20 /* At this point se is NULL and we are at root level*/ @@ -6043,7 +6037,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - long running_delta, enqueued_delta, idle_delta, delayed_delta; + long running_delta, enqueued_delta, idle_delta; long rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; =20 se =3D cfs_rq->tg->se[cpu_of(rq)]; @@ -6080,7 +6074,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) running_delta =3D cfs_rq->h_nr_running; enqueued_delta =3D cfs_rq->h_nr_enqueued; idle_delta =3D cfs_rq->h_nr_idle; - delayed_delta =3D cfs_rq->h_nr_delayed; for_each_sched_entity(se) { struct cfs_rq *qcfs_rq =3D cfs_rq_of(se); =20 @@ -6099,7 +6092,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running +=3D running_delta; qcfs_rq->h_nr_enqueued +=3D enqueued_delta; qcfs_rq->h_nr_idle +=3D idle_delta; - qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(qcfs_rq)) @@ -6118,7 +6110,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running +=3D running_delta; qcfs_rq->h_nr_enqueued +=3D enqueued_delta; qcfs_rq->h_nr_idle +=3D idle_delta; - qcfs_rq->h_nr_delayed +=3D delayed_delta; =20 /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(qcfs_rq)) @@ -6972,7 +6963,7 @@ requeue_delayed_entity(struct sched_entity *se) } =20 update_load_avg(cfs_rq, se, 0); - clear_delayed(se, true); + clear_delayed(se); } =20 /* @@ -6986,7 +6977,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) struct cfs_rq *cfs_rq; struct sched_entity *se =3D &p->se; int h_nr_idle =3D task_has_idle_policy(p); - int h_nr_delayed =3D 0; + int se_delayed =3D 0; int task_new =3D !(flags & ENQUEUE_WAKEUP); int rq_h_nr_enqueued =3D rq->cfs.h_nr_enqueued; u64 slice =3D 0; @@ -7014,7 +7005,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *= p, int flags) cpufreq_update_util(rq, SCHED_CPUFREQ_IOWAIT); =20 if (task_new) - h_nr_delayed =3D !!se->sched_delayed; + se_delayed =3D !!se->sched_delayed; =20 for_each_sched_entity(se) { if (se->on_rq) { @@ -7036,11 +7027,10 @@ enqueue_task_fair(struct rq *rq, struct task_struct= *p, int flags) enqueue_entity(cfs_rq, se, flags); slice =3D cfs_rq_min_slice(cfs_rq); =20 - if (!h_nr_delayed) + if (!se_delayed) cfs_rq->h_nr_running++; cfs_rq->h_nr_enqueued++; cfs_rq->h_nr_idle +=3D h_nr_idle; - cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) h_nr_idle =3D 1; @@ -7062,11 +7052,10 @@ enqueue_task_fair(struct rq *rq, struct task_struct= *p, int flags) se->slice =3D slice; slice =3D cfs_rq_min_slice(cfs_rq); =20 - if (!h_nr_delayed) + if (!se_delayed) cfs_rq->h_nr_running++; cfs_rq->h_nr_enqueued++; cfs_rq->h_nr_idle +=3D h_nr_idle; - cfs_rq->h_nr_delayed +=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) h_nr_idle =3D 1; @@ -7129,7 +7118,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) struct task_struct *p =3D NULL; int h_nr_idle =3D 0; int h_nr_running =3D 0; - int h_nr_delayed =3D 0; + int se_delayed =3D 0; struct cfs_rq *cfs_rq; u64 slice =3D 0; =20 @@ -7138,7 +7127,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags) h_nr_running =3D 1; h_nr_idle =3D task_has_idle_policy(p); if (!task_sleep && !task_delayed) - h_nr_delayed =3D !!se->sched_delayed; + se_delayed =3D !!se->sched_delayed; } else { cfs_rq =3D group_cfs_rq(se); slice =3D cfs_rq_min_slice(cfs_rq); @@ -7154,11 +7143,10 @@ static int dequeue_entities(struct rq *rq, struct s= ched_entity *se, int flags) break; } =20 - if (!h_nr_delayed) + if (!se_delayed) cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->h_nr_enqueued -=3D h_nr_running; cfs_rq->h_nr_idle -=3D h_nr_idle; - cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) h_nr_idle =3D h_nr_running; @@ -7195,11 +7183,10 @@ static int dequeue_entities(struct rq *rq, struct s= ched_entity *se, int flags) se->slice =3D slice; slice =3D cfs_rq_min_slice(cfs_rq); =20 - if (!h_nr_delayed) + if (!se_delayed) cfs_rq->h_nr_running -=3D h_nr_running; cfs_rq->h_nr_enqueued -=3D h_nr_running; cfs_rq->h_nr_idle -=3D h_nr_idle; - cfs_rq->h_nr_delayed -=3D h_nr_delayed; =20 if (cfs_rq_is_idle(cfs_rq)) h_nr_idle =3D h_nr_running; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 7d99d18e8984..0b297242eb5d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -649,7 +649,6 @@ struct cfs_rq { unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */ unsigned int h_nr_enqueued; unsigned int h_nr_idle; /* SCHED_IDLE */ - unsigned int h_nr_delayed; =20 s64 avg_vruntime; u64 avg_load; --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 595BA195385 for ; Thu, 28 Nov 2024 09:28:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786089; cv=none; b=b4r2OEAXcnoiZ515OXX8hVKyHcYg6KS2Cvf1jhHYfp9xUKTH1RhtDNwM1Scc3Qr3J34E7YpdpFiUEVJnsVxhV5pna0cFfJSgZyjwTlsu7X9/8b6DDkrrKthPEt+tL4ADIgwyvidFT+y5hKd6aFRPbTAIccAmWxDdFJfESGzGwVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786089; c=relaxed/simple; bh=UIIYEoRfwucrwBbEJhBfjYYwlb/jiHJwud+KZyqDXrY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ddTh+8Q8kOH+V0Y1Cu3d3YwGtHbQNiMfG9tCTUyuHco/cyOfIpRK9f4RpgqM0/lrQFHyp1Y0/xvrDm5/mZWqjPn0qMzBHTvxAKjsmUiyKFmsk1H8sN4S57w4KRXjdySm97933Y96NN5oPJl3l6Gw7FupMl0IcyjDDXtee4nc/HI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UXzpmHtP; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UXzpmHtP" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4349cc45219so5180155e9.3 for ; Thu, 28 Nov 2024 01:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786085; x=1733390885; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vuroh5C1klk4kN6wv0hOcaU0Pn0SYvlMsqJMKuXS2gQ=; b=UXzpmHtPs0X53xyLqldp9ts2adJiwfZJHnQt2+upxQJ8XN5M3hIKfk4iXJl46539v8 BVlvGWjGi0jGQxsTztUXB4UqIvtMjSR0PvLmAStGclS/58zMbn0yIMmGjC6asR6sAitY F+vUIiGTurFRYm2fPs08DBLjheUGiyF/1nPcr1iFlluSnVSUvif62rQAT7c2EEO0x5hd kqYl80quMFcPYKJ/45FB/UP4/jQjRKn1ZzejONUY9H4q+TBs04qjekWSIgoJWUVoJyAc jOGoCeyqnRdpqNd18OTic3ot5Lc3+hrBh7N+qqfCKAqd/P2speyfB8C2JfKF3shgZLHB 56sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786085; x=1733390885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vuroh5C1klk4kN6wv0hOcaU0Pn0SYvlMsqJMKuXS2gQ=; b=P/Yl2DwdBod8Zwq/Rof6CeeNPN9OfCBKVcvudrG1FkvQDhyRqEhC0uL3sFvE5xamOu YnqCEVx1Is2sh2zraP7C81FkQWzdFwnW4QN5tHhurn43Km5X6NPIZjaT+A9xra+WevVu 5aXNnXftUeBeJI7cMZ+pqive0YNTIzk2bC7+h33vOrZvujrL3x+MAqzYiFtbDgVfxo1E +epVQI5RXVmuuKGWTn+ijUIMBPs23FF8n/pevEYSjXAkd3EiZKw8bI/6AQRmSapUxfYB uFlK+dfyPbcNB9W+WfRWGiuYKxNzBZsnQVIVe0Xu5G6l/m90enwJUAVbXp1lLk8NhzGE NAbQ== X-Forwarded-Encrypted: i=1; AJvYcCW4TmkrHzT4n2YHYBun89/i/JyTU49DB09G/ghDVhlx8KGgifK+PL1jD4gaiBuOiUS1NZBnR32Jm7YF3Ks=@vger.kernel.org X-Gm-Message-State: AOJu0YwPojitZMh0+g/FlDfpPcBCqlCoOai22cFc1W8atrtl++9qcirZ H/ihQjzbIErVDkDsxFsHO+znR7KwdulmimnmT+eoUm/r8nU9dO9cHsGOrb7jt/E= X-Gm-Gg: ASbGncvrFe9sy06HSKmb6FJ0Hf/OJPe2XCOAPqxRtQaenH6dkRyk/oB2x3liSwJFLjh ediyvNjmPxw+S6IeYFMVZsEyfa3t/APXmrH1G5OxEgcazMYDdCgU4UOtlh1j15JZZqtozcjUlWC /+RqHmcgMLUkOpfwVfaeDJjOJC7CDSZNfHnZCCsrbCbQRSBXSXTvBJT06smuyKevDFKuHyEDQYT BsnFVh/gdNQTqq2kcUt5e2XI+67Jlp+52tLatS8Qp4MrcDWmMPG2ttPeT8= X-Google-Smtp-Source: AGHT+IHGBkA2zl/ikPXG6pg1WTISmV5deom2arD9egv2feljQDS9HeFt8d4tgIMXYUBkYsfkiLuPKw== X-Received: by 2002:a05:600c:83c5:b0:431:44f6:566f with SMTP id 5b1f17b1804b1-434a9dc14c7mr58208195e9.13.1732786085657; Thu, 28 Nov 2024 01:28:05 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:04 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 7/9] sched/fair: Do not try to migrate delayed dequeue task Date: Thu, 28 Nov 2024 10:27:48 +0100 Message-ID: <20241128092750.2541735-8-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Migrating a delayed dequeued task doesn't help in balancing the number of runnable tasks in the system. Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1b4f1b610543..9d80f3a61082 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9405,11 +9405,15 @@ int can_migrate_task(struct task_struct *p, struct = lb_env *env) =20 /* * We do not migrate tasks that are: - * 1) throttled_lb_pair, or - * 2) cannot be migrated to this CPU due to cpus_ptr, or - * 3) running (obviously), or - * 4) are cache-hot on their current CPU. + * 1) delayed dequeued, or + * 2) throttled_lb_pair, or + * 3) cannot be migrated to this CPU due to cpus_ptr, or + * 4) running (obviously), or + * 5) are cache-hot on their current CPU. */ + if (p->se.sched_delayed) + return 0; + if (throttled_lb_pair(task_group(p), env->src_cpu, env->dst_cpu)) return 0; =20 --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CB3119415D for ; Thu, 28 Nov 2024 09:28:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786090; cv=none; b=lOJSboYTLLHez6EhPbVk0fDxFLyXlfnjEX0IV4FVZRKbwk78mjhX2rjEiGr0etkUrHwGce4EJR025rfw0286aqQvVGPWKNMaUMzRfXGntFo/+Y+At3KToJhvTx4KW/BTcDGSfCMdI/FjA4CQvmkmxc1QVKvOQMC4WsWSy0tx6ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786090; c=relaxed/simple; bh=JuPwY2gAqqhqdGZbJm6EVlqc8orysFV9Bi6yHM6dzlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cwstuCroR3UTPD2a+Zjjddwxp8ZX34HV/c68vm0W/0c+baWdvgFrOAiyWQE7eZ7XrHiS49Bj3QbVIeah//iFBhsAOPDQyO/znsYfKAkzO4iagS76QxzrcnKfD/zg97We1BVD825gMcvN1Rf1I8ajJ873bUevT30YW1cZ2sqU80M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=M05kyuFI; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="M05kyuFI" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-434a1639637so5386385e9.1 for ; Thu, 28 Nov 2024 01:28:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786087; x=1733390887; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wsDFxn7301RDaNGp7P8YsoLSZ4PS+XlO69NVe0RTAME=; b=M05kyuFI0i0uHqSIYxYzvo+itazAJaG7EjiWGkvf984Cv2vNfuS0kyjh0yfIGgahYz Gfaf4KI0ulm0rRUayrI54AeU7k7pJ/m5vji0/SdkyQHtMqv2SOkteHw7bCVxlhWH0J9Q Vw6yrCcJ4klMv1HeB2bm7pQM4W2pVsCPCYB1NWZGFJ5xLKBNpYQryROUATjTOqqbelvk x6p5LL7KlkNljVF8SoYEMDrFEmpIeo7pClWEYahs3xxEEFcfhLpuPF3XEOKYfinIUV/a HQNkB55MK/ZcD5rmhAx1xA7dSk9BAm2fChtzs0TS5Eb1fj5HI65lHSO1sybx82ZQ5Vs8 fAMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786087; x=1733390887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wsDFxn7301RDaNGp7P8YsoLSZ4PS+XlO69NVe0RTAME=; b=iojwBqXh5E5riUhaPCm2SzuzO+6dypj3uE96PfBXCgG5ux7iCPaKMbAFSQbTtDIReC 6eYv6UbHfYoHP48Y/Mie92PaGBxzEkfmOCnwBU1CLOsXgmV5BnfnU1zxOCFIjKBte0Rw v56Bde+ikFJKkdKMyaI4ecNZBPnRISY3DUO5P74X5/+6quTjyHM7qNOUzWSWIZjTX/6w Qcivm0PF72GWQm3qXAHuxjfo50AlSnGCqtrsct2vrE5O8t8Y8PgAfstc8XBpXl9oSxLU 32BWQeXXQA6reMAjuQZXYEyCB5BcWSIXU1sfwey3AshhwBHs5KWbRrIzhy0ZAiDmT3R8 ksPg== X-Forwarded-Encrypted: i=1; AJvYcCWY0vP3PnhAjAu0hR9aAzZCFCLDbeI25p1S76klC9hipu1WHrkSQjnqRmz5HeSBURm7pQCoiwVk4CT5kE8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6LYvOE9EPC6PeDm3Kfo2vCz8Gykkwg3YnpgjFhTHJwqoee7ob llfQgIyTNILX+6r90+BGWhQT2Tl/XspI4Emf6sSZAhAgJFRSO/ostJeQ2a0wpt0= X-Gm-Gg: ASbGncvKAcsTGSi/1Ff2BaVFVoYkdMLNtC8Vyn75sQ0LMdUa/jF5q3vhG3FfXapK6qD e4E1x6XlKjUTM4XqAbyZsAgvab7+6XqAsb5pvRVewg3PprEr0/jq0o4Hiv7cRCNc35x8f2aEeNi 53G2r6lcHLJQsPJaRGtGUPqP7U+qIZNtdInRSK+pUq9xnybxmHCRUB2Pyy+gZ13PfMReOdqxwIx 8WsvCXkWh2TT27Ex/ERGu1Y6WOzthkJP9sn3/pDtQnmf2PFK6JHoDo8ZFg= X-Google-Smtp-Source: AGHT+IEO0/4AaHypX2r4gi9zIhtlVSw3hN1ccYm5g9jBfiRqvJ9+sKDOMYQCIGhR+W2SP8GZT6CTAA== X-Received: by 2002:a05:600c:4686:b0:434:a7e3:db5c with SMTP id 5b1f17b1804b1-434a9dbf4a1mr54944585e9.11.1732786086854; Thu, 28 Nov 2024 01:28:06 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:06 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 8/9] sched/fair: Fix sched_can_stop_tick() for fair tasks Date: Thu, 28 Nov 2024 10:27:49 +0100 Message-ID: <20241128092750.2541735-9-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We can't stop the tick of a rq if there are at least 2 tasks enqueued in the whole hierarchy and not only at the root cfs rq. rq->cfs.nr_running tracks the number of sched_entity at one level whereas rq->cfs.h_nr_enqueued tracks all enqueued tasks in the hierarchy. Signed-off-by: Vincent Guittot --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index daaa20f01ad4..263e0b9bb7d5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1341,7 +1341,7 @@ bool sched_can_stop_tick(struct rq *rq) if (scx_enabled() && !scx_can_stop_tick(rq)) return false; =20 - if (rq->cfs.nr_enqueued > 1) + if (rq->cfs.h_nr_enqueued > 1) return false; =20 /* --=20 2.43.0 From nobody Sun Feb 8 23:32:15 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 566D11991D8 for ; Thu, 28 Nov 2024 09:28:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786093; cv=none; b=EUuxlv/IrNxKY6PsYrVu2g5bkUJppkITnPIF6Sdh6CPMg98k6JMvXCYoZZpxyw2kFyRRp9vp2PGc/3Ox9XnH2mzNb11W2GEglxLK7ELHr1Yl3yxgrDmIlyXI6SJIl+iCmZ9yWSRyE59sj+TFKYlO4XdFC76OtFUFM1f4AjaPutA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732786093; c=relaxed/simple; bh=MalSzRdhHnNIgF7qDomQeNjDhQnIZpEr/y0LcGSav28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nwvJShPvniRDchhMzXMN3c7jYlDFEBEKBKND+kSsxeEZtuCJAyr1/N0QnJcl4YB9df1T34i5DHKCXI2ubn94DWY/NznTA1oaSQ1CizDI7MLA0pw8pDOBikkaZ9cD0SRTBV6JWbC+sU306EUIobqZdREAWzqQ5WkGoXy2GMuXIbQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=EqPI81E7; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EqPI81E7" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53ddb99e9dcso513037e87.3 for ; Thu, 28 Nov 2024 01:28:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732786089; x=1733390889; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mEypF55ds3j9wOzmWAD3rv+tXWcjl55SaLnSdcxNZ9c=; b=EqPI81E7DnAeQiU59mkBHbDtVpTOWbr5RENRbLuZK5SY2+fg4sMHm5hjSxQt+G4JVK V0LCOYItbd4e7mrDnnmWM1luy6nV/dtUwA0xA/hE9Y31V/YdMR17jTMnDBUV7p6dRzbk 4ROLgabHLEeFaf3VvBGtGJ2Doz3jvdiGu1GIxIcloLzkAyhv7UcqH7j/r1rPsR3GYqme +HxbpgPytsLmDwp7/2yNwxAI5q6Ns/QCKjE9uh+40dGWCqUHUUSWiO717LmA/8SLOyFL ba3VVk5iV+aTEfn6BOOjpAXVgrVo+nRTGjUQ9G23PDU7xhPDyhzD+UIOcEU77Jt0rBfj MrqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732786089; x=1733390889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mEypF55ds3j9wOzmWAD3rv+tXWcjl55SaLnSdcxNZ9c=; b=R1cKecAGwbBWnkXTjjpA9uMyQORs1oD3JXrHPeyViHz/yLx0btWu1xDmA1dGsiw1zf KdWVSVj+HyQsKNnL48Sz7oJz6vcyzauuxOPIIful+U6SZb3rB6LQU2uPZWpXQpn0xuqr 73VZ2nV5wl0YwXVJZqiCE/HdN7cxYDRpm+bqjFqiR53PTpOPF5nLiKlLiHM5BP0F1AqP nzeFwEV7smXEsT7A+gaYwpSxYwAtfpeIAwDUg4A1I0pSO+cLbi+gFmWu5wExpargpT6/ ZZygVrd4LPt8JOCBLfXzvAbChHfnsS2v0OBpC1PmhMKxITxiWx55KyPkMcZxWcHkh8+3 gCag== X-Forwarded-Encrypted: i=1; AJvYcCXQUXFs8U7uovIWJQloN19rwhlp7iL5pH9EnQiKW/hH/BVhsUT3SuAMzMvw54UKOTyWXMzKBLOmEFGjd5I=@vger.kernel.org X-Gm-Message-State: AOJu0YyT+Mlav7E2KCqXc2qnpAM4UimHeXmQmzVvWRVMYCC8G6OXu4p8 tzkcdB+RsVbk0R2r7UKru5enVPrA9CUYRhOqANsnAiEBtvoK9DBIvaWKKpSxVjE= X-Gm-Gg: ASbGncvU8z1S2ioZR9Y/O/VHIxBCSAjSDJv8nbsVdkj9WYCU0r+omGXA0XhH3s7Rqjx XUIdVdng90ZfO0Gn/qOmlIenkXNvFqahGtRf3ixqfiIJZNEga39lXlxRFNy3ahVngUnkcqVkRcw 8illJQcPIjRPdYBNt2QyaSOnBQRdtXy56cEVk7C8NWZ3Q68DFfmZ3QQ10lyekHUUpXRRKBktvTP l9j3DtJdyOPlSdvUpLIShCkYP258Iy2TRCIO4labh3ZK6PQychrrRvFsJQ= X-Google-Smtp-Source: AGHT+IGOUyYRWfkeWgbwmxJcXBx+7esuhZ99GFV3NPzvQkdwUeRiEJlB4qVMDGTEuiYfV2DackqQFA== X-Received: by 2002:a05:6512:3d8b:b0:53d:d957:9f93 with SMTP id 2adb3069b0e04-53df001e8d1mr3345550e87.0.1732786088078; Thu, 28 Nov 2024 01:28:08 -0800 (PST) Received: from vingu-cube.. ([2a01:e0a:f:6020:c0d5:15dc:1ec9:3f30]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434aa7e4d42sm47078885e9.37.2024.11.28.01.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 01:28:07 -0800 (PST) From: Vincent Guittot To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, linux-kernel@vger.kernel.org Cc: kprateek.nayak@amd.com, pauld@redhat.com, efault@gmx.de, luis.machado@arm.com, Vincent Guittot Subject: [PATCH 9/9] sched/fair: Fix variable declaration position Date: Thu, 28 Nov 2024 10:27:50 +0100 Message-ID: <20241128092750.2541735-10-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241128092750.2541735-1-vincent.guittot@linaro.org> References: <20241128092750.2541735-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move variable declaration at the beginning of the function Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 9d80f3a61082..47faaed3ad92 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5632,6 +5632,7 @@ static int dequeue_entities(struct rq *rq, struct sch= ed_entity *se, int flags); static struct sched_entity * pick_next_entity(struct rq *rq, struct cfs_rq *cfs_rq) { + struct sched_entity *se; /* * Enabling NEXT_BUDDY will affect latency but not fairness. */ @@ -5642,7 +5643,7 @@ pick_next_entity(struct rq *rq, struct cfs_rq *cfs_rq) return cfs_rq->next; } =20 - struct sched_entity *se =3D pick_eevdf(cfs_rq); + se =3D pick_eevdf(cfs_rq); if (se->sched_delayed) { dequeue_entities(rq, se, DEQUEUE_SLEEP | DEQUEUE_DELAYED); /* --=20 2.43.0