Received-SPF: pass (google.com: domain of linux-kernel+bounces-196212-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: pugaowei <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] sched/fair: updates weight of cfs_rq before update_cfs_group() in enqueue_entity()
Date: Fri, 31 May 2024 11:08:33 +0800
Message-Id: <20240531030833.3375-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?yFAfc70fF2VnWnipSWmp9jP6BIF3lXUSIGym6JgnT7H7KVGDljBnpyywFhiQ?=
 =?us-ascii?Q?3JCkaCIVxVzD86g3qDCQnBXDP8r2rhfUmuc3vsxDV8XFwviJynviNf6xe+NX?=
 =?us-ascii?Q?0kB5Yyhz8iWE6M80gDV7/Uxg1N1F5vc2lKzh4N6YuBMwctBGZ3xyGi0f0wHs?=
 =?us-ascii?Q?P0zi+uVHg4q2UUlFKc4Fmf3y5pc6HFo7w9kvfsO5xpDNDQHY3RE+sfGNVSjs?=
 =?us-ascii?Q?Qcd0ZxNgkANGpoQWbmPDjEdedojOWxoLcheUx7dancbXVk89K1+Z5nFkxeY2?=
 =?us-ascii?Q?wsXtr4ijo3ZkuVEX4queNqVaZXxMCYLxVF6LgdmzOSmwfRRETzn0NhduEdGq?=
 =?us-ascii?Q?MYT8rXZlMrs19DpMUnRYyTEPW4CswXx4hLWJJPiGhXM7QVVzfW7tq/TqTK+k?=
 =?us-ascii?Q?i2UQJDYIgLfmebjCZEuzw3F/nJ10Qp9JQ5q794fiCKQjX9t1nPH6V62dvrfF?=
 =?us-ascii?Q?oOzVA3PKUuo2gqr9mvvDPDNLLzUDyDJj4YuM2lIJBCVPDA1BydCA2DGYAtfq?=
 =?us-ascii?Q?ubCPTFCx3zx61BHvUkmnRyaHC465NXXOe5B4wBNi1scJ72Gkl25qssr9kJRa?=
 =?us-ascii?Q?18cm04dH+Ya/Cmu8jAh8GXLBUPP7uvrFFwRUQboZo6sVMxcRCNR9C/Wtv7vP?=
 =?us-ascii?Q?11vb9q6bgJT9t/9ckVLZzQF7WD05Pf+Tt4Ks6Fa4v9GS5oq8bW46wnufdzRQ?=
 =?us-ascii?Q?otmt9TullrYObGWsMqie5X6xKJhF9o3uRhQYHp8RrYoXqLU1n6vDNLgiYIu0?=
 =?us-ascii?Q?LzudpIJV5WpaP/z6G4NUZoaXtyyL0AfrO5FR/v0Ts0CWyNzHHGrIn7TjHfwP?=
 =?us-ascii?Q?roxmEJjdCVimGu1V7H7Sk1JTRl/157whtRxdEGsYY25DDLNEaVfQoFbu6b9+?=
 =?us-ascii?Q?dyFPtMV5uOjdRH3fOkv3ArqtgULAlT2TJ1ebwHeNucInYTfnEr+H3vlSlRGu?=
 =?us-ascii?Q?nr0mh1vBU0q7a7eOQ6FROqEi+qF3Lc/ZdtK/k3tTle02R0BXpVAARv/0Z1k/?=
 =?us-ascii?Q?3SMwunpaTwfZO1GjNlfJQQ7hFSHd0zmnMSmO6dGQjo2g6LxAMAYYsHkFqw1N?=
 =?us-ascii?Q?azc6+PeF8b0Lm+oexRV6hU2mgno451ytH5HifW1DXmV1MtxF+RDVZjl+aRKZ?=
 =?us-ascii?Q?OKgBWRouMxOXHIeejFqgH8bjRN51RPWtkcnyjvL2YNNGVjlOt9wbySTlr0qw?=
 =?us-ascii?Q?Xs1+3z4P/d8PME4uUmSZoJUiB0fqNQ6Jsw/y7zxUmVY2POpaj0HGvAxfCZt0?=
 =?us-ascii?Q?ykHvfV7pBmHTxDqfvI7HP46Uv2KZf0NhH0JL/h5bUJBAMJ7/dU86eWIMpZag?=
 =?us-ascii?Q?DPiQX4Kfnstr062nDBONVfoBufMbLCghps7UYqzBL98Pyy9sTsNdC3pI7jvQ?=
 =?us-ascii?Q?vf8APm7vimlvwcOSHe8vmZWefWc+6fZe2zm7P2HQhMbEvKmrj9G1njg4x2YX?=
 =?us-ascii?Q?q2c/EkemhAmh9A+BvZLHUILumDo/rhK9W0Bo35eoKH6+hVelDCKX03ZaNZwt?=
 =?us-ascii?Q?R23CrlOfPtkZLlSZzNmCuZauDDIMQ51hjjRqhYsTdnqcuaJ/+G48BZHtxmIu?=
 =?us-ascii?Q?CMMTh+7l5tv1T8hgz5Qw7VIYGh46tG3wOZsmHOIB?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ca57c3b6-3e18-4c0d-b02a-08dc811efbbe
X-MS-Exchange-CrossTenant-AuthSource: SEYPR02MB8152.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 03:08:45.4863
 (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: X3XSbZ42lN/ixni3L8wJUu0yslmQkJi5xPuWRwD+T5eOKvdcWjCvEHqbLp7fIPjdCUQ0VOJVb0Qo8J3iyaJfvg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR02MB7555

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.

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

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8a5b1ae0aa55..395840f3fa1d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5304,6 +5304,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 +5324,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