Received-SPF: pass (google.com: domain of linux-kernel+bounces-209223-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <f35822e5-48f3-4b47-bef9-ad17f5e61359@oppo.com>
Date: Tue, 11 Jun 2024 11:36:31 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH_V2] sched/fair: updates weight of cfs_rq before
 update_cfs_group() in enqueue_entity()
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
References: <20240603091805.858-1-pugaowei@oppo.com>
From: Gaowei Pu <pugaowei@oppo.com>
In-Reply-To: <20240603091805.858-1-pugaowei@oppo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?dmM2RlJQNVB0anBrc24xaDVXK1ZRdGtMNjQvOE1nbVVQSHVKbEhGTlA1WFZi?=
 =?utf-8?B?dWdrNExaVEJ5YVprcGpkVDhvT2RtekQ1Nk56dlVjenVNbmxOaDMwc2FYbFpG?=
 =?utf-8?B?aW41UnR0WGlpSlprYVloa3c4cndRQVBxSDRKSTRCWVIwV2hUMTQ1SHhTMEhv?=
 =?utf-8?B?b3BRWDF3NVk3aERCUWxORGpuR1pCZDh2MnFvV2V1b0JCdk5QMklDRHNNN2ZI?=
 =?utf-8?B?S29FL2J1cmwybEg3ZzNraTZ4ZGJieGxWeXJiNGVhMDhOY3FNeDFBbzdXZjN3?=
 =?utf-8?B?T3RIUkNUczV6SlU0bkZBT3JHSGRXS2kwZEZ4U1dpUzRneDdzbC9ObnVORmtv?=
 =?utf-8?B?V3hMMTZqTnU1U3BHMmxmQjlOenB5VWZIU2hraThDSHpsZlREN1hYMnJyR3I0?=
 =?utf-8?B?VnQ0bStCSTkwdjFNU240QyttUnBQREZ4c2xadkdGU2ZFOGg0bEkrQ2ZubWNj?=
 =?utf-8?B?dHVyN1ZJakFKamRTTzJ5Nzl1eXlEZTRkQ3hKVFQzczRPbWt0MVdCT2RPWEox?=
 =?utf-8?B?dHprSVB1SkM0Nzdnek9yaDl6QUdoNGpwODZVazlMY2s2M2k4cDRNVHZ1a3N0?=
 =?utf-8?B?REE3YVc5TDlUcFdWNEtTMThURmdZbkNZUnQrTFFWUU1ZMlRwbThaNmp5Z1do?=
 =?utf-8?B?YXNDcWtIeWhBYUEzaHBZMVVkQkhTODB1cTVnQUVUUXlZck5PUTJLaVdwemFX?=
 =?utf-8?B?elhMaWNWVTJadnN6cG5tMEdpb0EyTGZ6dWM1cDhjVGVpdFJjTVkrREk2d3FS?=
 =?utf-8?B?YzZXUHZRcDZvaTJhOS9xdzRXcm0zZ0R6VmhwNXRaakc5VGcrWGNQcXp2Rk1Q?=
 =?utf-8?B?MUUzelRzQkFuSEZDQm13MHdtbTRhQVJWVDBnakpENHRlNnFobjhzeVI3UXZw?=
 =?utf-8?B?bC9QVElpM2R2ejVVLy9HaHVOaUcycWR0R24rLzZTRk5TaWsySVlJUU5zdVpO?=
 =?utf-8?B?d0NJc3BvalBiclhGZkNBVUtMaTlHL3VMU0czN3d3ekhWZWlTTkRqMXFBM2dZ?=
 =?utf-8?B?RUk5TDBNMDQwV2g3UXc4SWFtVmZLUVRnTXkrWXNDamhEUXN1NWRvL0xzZFRS?=
 =?utf-8?B?cUlqL3dKRVNkNERUT3VkQzBHZjROaFpwQm10c1VQNWUzUEg1eVNrWHZwMGl4?=
 =?utf-8?B?Mi8yWEgrNXRXWEROUGhhVmdWelNGRlNQZWJLUStaa1Y0UDRXZURzNDdVaTZi?=
 =?utf-8?B?blhJeHNydFlmNlNzZHc4VFZEM1NFNUgwMVR3RXgvUE03MFA0MW0zN2NmMEZ2?=
 =?utf-8?B?NC92SERyNldpbWVZYUdZNnNuZ0wrWCttdlE0R3pyMXZnc1Y0YmhLc3BuODdx?=
 =?utf-8?B?WlVNQitCTStrdGh6bVAzMGxFR3phVllSMWwxbWR6cFJZUGlEaUdkRDZRZzgx?=
 =?utf-8?B?Y1N6R3NtaUdFQjhsSUVTcVVTanBFMDhBalZNQzAvN1JDSHpIUmhvOEl2bE1V?=
 =?utf-8?B?VGNoS2s0UzhFMUZrWTcrUE1iOEZkc1ZDTk4vTEdrdEIvamdDazVCS3B6bEdM?=
 =?utf-8?B?OTBkeGttVHFwZW04K3JnUEN4cFhITlNlY2JJN3NlRjVFTGhnNDNwdm1CeThN?=
 =?utf-8?B?eE0zdGM4U3F5RlY0elpNbm4yK3lqNWp4OS9yVUVsNEIvVHBRNjR3MzlOS2tt?=
 =?utf-8?B?Vi9VTDRaanJYOGgwRnplM2RFUjdXTUxVbExzTUxxNi80OVB2Qy9jMk1TUXN2?=
 =?utf-8?B?dTNqZFJjNlgwdnNHSDdnYWkxUWJDNlc2V3ZTWTA4cVFTaElvYzZhN2dTTzli?=
 =?utf-8?B?WWZIeUtoMFZtS3hWZ3pueFZPV0phVzlzTFNyakJBMHpsVEh5SEY1cmxNcXd0?=
 =?utf-8?B?RldUcFNVeXNYVjU4WlcyQUJ2Y0RucUhSSG52TEhnaFNKUStZaGhlSGxXdjVi?=
 =?utf-8?B?eTlwNitKaE9CL0JWOVN4V3dTVDM3UlI1T05ibE5PTTVVUkk3YUhUV1hJcS9N?=
 =?utf-8?B?QmhhVkNtbkd1QnVrK0ZqY3MzYnJlUVBqQVppQmN5eURmMjZvQ1NLVWg2aEZq?=
 =?utf-8?B?NU5vempkSVJIeTRXMkRpb0dKVld6d2NaeDR3WC9EclVMM1EraHZmNzEzdVFV?=
 =?utf-8?B?dWRjMjh3UjZRRG5CMFZ3RHNPdVdTT0pnRDBidXVSQ3NEWGZoZkVieVo2UVNo?=
 =?utf-8?Q?W3VbRb+R3NhqIPeZm7kwcZpCZ?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e8a59a4-0ee8-473d-4845-08dc89c7b1f2
X-MS-Exchange-CrossTenant-AuthSource: SEYPR02MB8152.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 03:36:35.8233
 (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: z/30ZPZGfOhPnQghghdbQhWb2wMrh55v5Wa7eq1tqp2EBJUaeknGWaZQUpOS/lPRGndh6f6JR1ksehv6lNvTlA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR02MB6268

ping...

On 2024/6/3 17:18, Gaowei.Pu wrote:
> 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;