From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94857306D2A for ; Tue, 2 Dec 2025 08:13:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764663203; cv=none; b=KVGG2MdR3EOGRvJmactWeR/SejZihi2PZ/912qM33NHpChS+DHcWIlzLiUdGE8PnV3ujBzgiwUza+XoPKRE4pWbzU7zYs3LZstSTZDzCGkf2YacklyErERAAglymFzR4I2UaYMTsEfGq2cmT08rIQxzgIa7zDJRzcqjIgYSkr/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764663203; c=relaxed/simple; bh=01CvlYtQ2W+NVfg7ShYIcBuoHgs5KzA7XHEW09Z0r38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cio2BcmFseT5/tUqOVe1vn03RqszWV7IgVHM6tU4QkcwEDsNg1dPk2AaMglHTdJSA+zs1OtijN0JlPvmX+lMDNne7KdK9qjQhPMzKXrwsL0V7GN8mjtiI+8F5aWBYGcBXoKftrUTau/6DU1kqMcYePNNP3rac9+5ameHNirVQSU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XwApNA6C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XwApNA6C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C58C6C4CEF1; Tue, 2 Dec 2025 08:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764663203; bh=01CvlYtQ2W+NVfg7ShYIcBuoHgs5KzA7XHEW09Z0r38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XwApNA6CmYYOr5gPsurnQcWCITkyLP+vTeWpqOaIYk8Z7VwYMRw6n06LkCxqY4qfS mV+9IOs5HmB2kqHNSwfOCsM4Bl0Gb3iSbUsXhxZ5XXDY996uefXtc588aOwiPhpSbf yYOsmL6+xRQf4TizmvPcB3zX6orktntq8yqjKYfrnEqfzNvfVnXNiEVLmeflxAnjuQ N2KMgoVM0LgJzXy1plFYG9TcVZ9+7fGO52te0KCKp/vcoB0IAMIzxCQz1A3odcUjo2 vzitU6J946r/jL3RWZitIbI4rvRJZh2NVbUEQxECy50c66cDSCYR2lDvDUYa3/V0Ws 20OJ6kD3cGCVg== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Frederic Weisbecker , Shrikanth Hegde , Juri Lelli , Dietmar Eggemann , Valentin Schneider , Vincent Guittot , Linus Torvalds , Mel Gorman , Steven Rostedt , Thomas Gleixner , Ingo Molnar , Frederic Weisbecker Subject: [PATCH 3/3] sched/fair: Rename cfs_rq_has_blocked() => cfs_rq_has_blocked_load_avg() Date: Tue, 2 Dec 2025 09:13:04 +0100 Message-ID: <20251202081304.3103393-4-mingo@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251202081304.3103393-1-mingo@kernel.org> References: <20251202081304.3103393-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit There's three separate, independent pieces of logic in the scheduler that are named 'has_blocked': 1) nohz.has_blocked, 2) rq->has_blocked_load - both of these relate to NOHZ balancing, 3) and cfs_rq_has_blocked(), which operates on SMP load-balancing averages. To reduce confusion, split these 3 shared uses of 'has_blocked' name patterns into 3 distinct and greppable patterns: 1) nohz.has_blocked related functions and variables use 'has_blocked', 2) rq->has_blocked_load related functions and variables use 'has_blocked_load', 3) and cfs_rq_has_blocked() uses 'has_blocked_load_avg'. This patch implements (3) and renames cfs_rq_has_blocked() to cfs_rq_has_blocked_load_avg(). No change in functionality. Cc: Shrikanth Hegde Cc: Peter Zijlstra Cc: Frederic Weisbecker Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a8a67d25873c..c098aedab694 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9767,7 +9767,7 @@ static void attach_tasks(struct lb_env *env) } #ifdef CONFIG_NO_HZ_COMMON -static inline bool cfs_rq_has_blocked(struct cfs_rq *cfs_rq) +static inline bool cfs_rq_has_blocked_load_avg(struct cfs_rq *cfs_rq) { if (cfs_rq->avg.load_avg) return true; @@ -9806,7 +9806,7 @@ static inline void update_blocked_load_status(struct rq *rq, bool has_blocked_lo rq->has_blocked_load = 0; } #else /* !CONFIG_NO_HZ_COMMON: */ -static inline bool cfs_rq_has_blocked(struct cfs_rq *cfs_rq) { return false; } +static inline bool cfs_rq_has_blocked_load_avg(struct cfs_rq *cfs_rq) { return false; } static inline bool others_have_blocked(struct rq *rq) { return false; } static inline void update_blocked_load_tick(struct rq *rq) {} static inline void update_blocked_load_status(struct rq *rq, bool has_blocked_load) {} @@ -9866,7 +9866,7 @@ static bool __update_blocked_fair(struct rq *rq, bool *done) list_del_leaf_cfs_rq(cfs_rq); /* Don't need periodic decay once load/util_avg are null */ - if (cfs_rq_has_blocked(cfs_rq)) + if (cfs_rq_has_blocked_load_avg(cfs_rq)) *done = false; } @@ -9926,7 +9926,7 @@ static bool __update_blocked_fair(struct rq *rq, bool *done) bool decayed; decayed = update_cfs_rq_load_avg(cfs_rq_clock_pelt(cfs_rq), cfs_rq); - if (cfs_rq_has_blocked(cfs_rq)) + if (cfs_rq_has_blocked_load_avg(cfs_rq)) *done = false; return decayed; -- 2.51.0