Received-SPF: pass (google.com: domain of linux-kernel+bounces-198855-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Gaowei.Pu" <pugaowei@oppo.com>
To: mingo@redhat.com,
	peterz@infradead.org,
	juri.lelli@redhat.com,
	vincent.guittot@linaro.org,
	dietmar.eggemann@arm.com,
	rostedt@goodmis.org,
	bsegall@google.com,
	mgorman@suse.de,
	bristot@redhat.com,
	vschneid@redhat.com
Cc: linux-kernel@vger.kernel.org,
	pugaowei <pugaowei@oppo.com>
Subject: [PATCH_V2] sched/fair: updates weight of cfs_rq before update_cfs_group() in enqueue_entity()
Date: Mon,  3 Jun 2024 17:18:05 +0800
Message-Id: <20240603091805.858-1-pugaowei@oppo.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?9EbAMi7Hoj4i/6g44thPu1jtuSGJzxfbeEpIvBmCS0eFgDf8pT+pNbT8lcKP?=
 =?us-ascii?Q?O+GgtcvqEmXXAET2Wr6JvgeH5E4s0bFnWaLn8bourDRx4aCpFMMGFOWRvpk9?=
 =?us-ascii?Q?X30tve6A7NIk/c6yogPEqtoU8qD5h29OOa/k29ISdBgdBDBDJTJqbUCol20Y?=
 =?us-ascii?Q?yzDAHJRIrJ6bv0UQU4XM9C670aBiKqe9s4iGLDaer7FzsMYvtl6WwIqJUhZu?=
 =?us-ascii?Q?mXqv3z8lvFTExkmv0kQedrkJrb3AmkwFZdyLr3aLiulva5bWuomyF6gqBemp?=
 =?us-ascii?Q?FI7naeN16ktOkGd/32HAFSXHCh1jHCe5aCqrOIhPjiO4SvmPxfrK6Dv7hS8T?=
 =?us-ascii?Q?EC+MWrXBO3ZP2+H1or5yDkgN2sny8iJI5v+tL1W4fNqb45jtdLP05Ou22JrL?=
 =?us-ascii?Q?5GcGMGAHBRiJHYwqJ6UPGdNt0bKAJRbLAXSYOFKi0A7+JPP5aVvgStlpGqAZ?=
 =?us-ascii?Q?5ZpgOaWeZ1jU6VFWrxtiuvfKzWG1/Bu4jsGw1fnMtspeNKMI7YtzhlJ110c7?=
 =?us-ascii?Q?8d3GzWeQVQdeZFWS0iHbNMwqBDo8MrzA1pkTBCHxlC/Ziw8xXWaQK6lt3jQK?=
 =?us-ascii?Q?cHq2cJ5T8kIwI8m4VaFrJXZAonOcHZWmuwspyDu53vl8bnrDR8DhdaHgQIjE?=
 =?us-ascii?Q?ve4BYLXZQLis3TmcL9TurfED+KVMcCfW4eXSL1s8TJH/r4lKzymdLnDx6zjA?=
 =?us-ascii?Q?9EN/OJGmR75MK32Hwzkm2Z0qgZ6SV3FD/aQO7DR6ryIIj7qlcW1typeBz9Ri?=
 =?us-ascii?Q?qvwAUOnIgASpYOrOuQ5fhZAPsTDf2JUpLnUBc+r5pzLotb34eZdvRBAcki57?=
 =?us-ascii?Q?YH1UwTVFtC2XE0YFRhbaUbwx3/46Kty+o/j4pV2JuEaSfiMgoeZb8K7wcXBn?=
 =?us-ascii?Q?W8s17GWPoTfIIMrTlXl8rnTvdW0ubAw/804yNwBDqvWnLFZWRhdkR3nOeVU+?=
 =?us-ascii?Q?BsOENp47IjIw+ZvVBvB68q9iI5PpmXv5lOWz4irvgyZbzhgFX16EXbI7pL1h?=
 =?us-ascii?Q?bt63D1TPSTHcnL34qPoZK8iLU6U/kEUSJwWd0xpHsU4jIlipGPMVJq1I9w2N?=
 =?us-ascii?Q?zFS17sgn0LGbEQe79bA0WgCsB+pXChkm8pWdKqaXUyDSX7pPhZx4eegb0jY4?=
 =?us-ascii?Q?SMLhdgQ3bb5jGag2ncnDTXAKjzUWqUUDuBpoAMjnRYrlDUfVYeKOKlI/uQOc?=
 =?us-ascii?Q?oA5ZJzMeTbwrZf5gvaIaoKW+7B00piArOYwBnq3VQ8J32o+IX4Tq3yOtCDjZ?=
 =?us-ascii?Q?wAK3ndfSG/t269Fhe3qm3Ns58VyWTxdCldVeveUGf/dq152CB88x1+BM9bEL?=
 =?us-ascii?Q?H71/370W5nV6/oKjj4LIWZY2MRxUehECd6CKlQlYNyYlTs3Z3inJ0thxmuGr?=
 =?us-ascii?Q?iGgTvBvCKWnqWvf59IEkMWYUz13siql+UQmIzxUaQHx4ADudDTBTHgjGah+r?=
 =?us-ascii?Q?UYVXkw+z9A+sk5LjxxN0kjTZDiPT8L+nw+roTs7iyGzFplKX2VE7gH7qyy6J?=
 =?us-ascii?Q?ZwTlh6xUyxGSqCSqqgcpcsAKdpKn2N2fagJVpgaPHnjzPXqGxeczPeQhEImC?=
 =?us-ascii?Q?M8ATee8GwcQ3+yU3tfVSMge3DGLHJajaeVN5nfdm?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b6c8eaf0-e134-46a4-f2ea-08dc83ae1aa0
X-MS-Exchange-CrossTenant-AuthSource: SEYPR02MB8152.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 09:18:17.6824
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4lAe2UDeVaYgFAXnOJRs33z2ueWLMnQdjrwhM8+fkgXO5GkpU+DEPEx97SCJv8IVMOi0FpLbAtz/EIaE9dXtlQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR02MB6107

From: pugaowei <pugaowei@oppo.com>

we should update the weight of cfs_rq before update_cfs_group().
Ensure that we can get accurate shares of the cfs_rq when its
weights changes. we can find this work was done correctly in
dequeue_entity(). so fix it.

patch_V1 :
https://lore.kernel.org/lkml/20240531030833.3375-1-pugaowei@oppo.com/T/#u
trigger a warnning below because of the changing order of
account_entity_enqueue().

[ 0.400603][ T0] ? __warn (kernel/panic.c:693)

[ 0.400603][ T0] ? place_entity (kernel/sched/fair.c:5256 (discriminator 1))

[ 0.400603][ T0] ? report_bug (lib/bug.c:180 lib/bug.c:219)

[ 0.400603][ T0] ? handle_bug (arch/x86/kernel/traps.c:239)

[ 0.400603][ T0] ? exc_invalid_op (arch/x86/kernel/traps.c:260 (discriminator 1))

[ 0.400603][ T0] ? asm_exc_invalid_op (arch/x86/include/asm/idtentry.h:621)

[ 0.400603][ T0] ? place_entity (kernel/sched/fair.c:5256 (discriminator 1))

[ 0.400603][ T0] ? place_entity (kernel/sched/fair.c:5182)

[ 0.400603][ T0] enqueue_entity (kernel/sched/fair.c:5328)

[ 0.400603][ T0] enqueue_task_fair (kernel/sched/fair.c:6785)

V2 fix the warnning and keep the lag without inflating it when it is
the first sched_entity queued on the cfs_rq.

Signed-off-by: pugaowei <pugaowei@oppo.com>
---
 kernel/sched/fair.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8a5b1ae0aa55..2fb1fbcfdda3 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5190,12 +5190,12 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	 *
 	 * EEVDF: placement strategy #1 / #2
 	 */
-	if (sched_feat(PLACE_LAG) && cfs_rq->nr_running) {
+	if (sched_feat(PLACE_LAG)) {
 		struct sched_entity *curr = cfs_rq->curr;
-		unsigned long load;
+		unsigned long load, se_load;
 
 		lag = se->vlag;
-
+		se_load = scale_load_down(se->load.weight);
 		/*
 		 * If we want to place a task and preserve lag, we have to
 		 * consider the effect of the new entity on the weighted
@@ -5252,9 +5252,13 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 		if (curr && curr->on_rq)
 			load += scale_load_down(curr->load.weight);
 
-		lag *= load + scale_load_down(se->load.weight);
-		if (WARN_ON_ONCE(!load))
-			load = 1;
+		lag *= load + se_load;
+		/*
+		 * we just need to keep the lag whithout inflating it when the se is
+		 * the first sched_entity queued on cfs_rq.
+		 */
+		if (!load)
+			load = se_load;
 		lag = div_s64(lag, load);
 	}
 
@@ -5304,6 +5308,12 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	 */
 	update_load_avg(cfs_rq, se, UPDATE_TG | DO_ATTACH);
 	se_update_runnable(se);
+
+	/*
+	 * we should update the weight of cfs_rq before update_cfs_group.
+	 * Ensure we can get accurate shares of the cfs_rq when its weights changes.
+	 */
+	account_entity_enqueue(cfs_rq, se);
 	/*
 	 * XXX update_load_avg() above will have attached us to the pelt sum;
 	 * but update_cfs_group() here will re-adjust the weight and have to
@@ -5318,8 +5328,6 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	if (!curr)
 		place_entity(cfs_rq, se, flags);
 
-	account_entity_enqueue(cfs_rq, se);
-
 	/* Entity has migrated, no longer consider this task hot */
 	if (flags & ENQUEUE_MIGRATED)
 		se->exec_start = 0;
-- 
2.17.1