Received-SPF: pass (google.com: domain of linux-kernel+bounces-11111-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <2cf94373-4f25-4a33-a0b4-cab04031bae7@virtuozzo.com>
Date: Mon, 25 Dec 2023 16:17:49 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] sched/fair: Do not scan non-movable tasks several times
To: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>,
 Juri Lelli <juri.lelli@redhat.com>,
 Dietmar Eggemann <dietmar.eggemann@arm.com>,
 Steven Rostedt <rostedt@goodmis.org>, Ben Segall <bsegall@google.com>,
 Mel Gorman <mgorman@suse.de>, Daniel Bristot de Oliveira
 <bristot@redhat.com>, Valentin Schneider <vschneid@redhat.com>,
 Alexander Atanasov <alexander.atanasov@virtuozzo.com>,
 linux-kernel@vger.kernel.org
References: <20231214144204.2179345-1-khorenko@virtuozzo.com>
 <CAKfTPtAqkY+attpekOyjeY10dcwgK0eND5_385cH6+wjR3EkTw@mail.gmail.com>
Content-Language: en-US
From: Konstantin Khorenko <khorenko@virtuozzo.com>
In-Reply-To: <CAKfTPtAqkY+attpekOyjeY10dcwgK0eND5_385cH6+wjR3EkTw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
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?TDM5OFMwZWZxNWtrMURvSnd5cENEZDBzMXUxd3lWTHRDSmJiY29zYUx2RU9u?=
 =?utf-8?B?djFzWTVYcVUyOFRQaGNreUloZ083UzhIbWYrSlVkb3pYRjJoWjVIQlh2dVVo?=
 =?utf-8?B?MlQ3NVpEYjY5SFBHdkVUN3B5cUs1Kyt6eVVJWDBOK1ZmMUVtb1pYSjVFS1Fi?=
 =?utf-8?B?QTlRS3FFQlp5aVZaRnJ0YzhWQ2UyOTVmaGZOT2ZNOVRlWm8yTysyUVZxeU9J?=
 =?utf-8?B?NVNta2dxVHE5UFBBKzJzWkZPZ29ESEk0MEZsdEJzZ1FvTlpXczZyMHJLWW9H?=
 =?utf-8?B?M2g3bDZScGhsak9rK2hwQWFpV2FweXRyMEl4bWEraUlCbHlIT3FqRXFZZ2tQ?=
 =?utf-8?B?c0RhUlA5R1docytsVUxSNnJmN3ZmNFVBVW1tWERQcDA5RFhmL1JPekJBRWNO?=
 =?utf-8?B?MWpPYmFTV0dQZEVndmdkVDJTaFJIaWhiZGJFSHptQWRLQjRxYis3Z0JReVVX?=
 =?utf-8?B?SHp4M01ENjcrY05HU1VBNDdFbVNzSnBYZlF0dVJrcXZ6Vno1QTRjNVYwbTNY?=
 =?utf-8?B?a3MrVExaQW8yYVhxTDltcStaenZ4NFJuTXQ2NTMveFVSaHJ5ZWZVU3JrNWNr?=
 =?utf-8?B?WTdGRGFYNmZGK0FpRUxZN2RmbVN3NmMwWi9sUmlUSlQvK21NTW9tZC8rRmcy?=
 =?utf-8?B?NVh4V2FKeDZWamFxbnBwR2NuNXZIM3NlOWFIbzRTSWduQnI1Q2ZZUEdvaWlv?=
 =?utf-8?B?RUNONWtEdkdCdGZleTZ4VWIxVGg0djRzdWVjQzYrZmtGdGM5QXN1NjVWVU5P?=
 =?utf-8?B?L3hTbjVxanorVHRlYU04ZUd4Q0VLRnNUeVhyelRGN0FMb1lkNUtmMWtpelk2?=
 =?utf-8?B?WU5WZGNvaDFzM3l5RnFza1NqY3dZdE9IeDE3elYrYU8zOUd2MHdqbDFqNmV0?=
 =?utf-8?B?N2Q1c2lvaXZpN3hUTVVZaFpuWVZObkpYdlFpWWZ4Q2Q2OEQyVEt5WlZFQTA3?=
 =?utf-8?B?OGpRQklEQkdrQ3EydnMzS3gybENsbDdVZ3ZxZVVBWmtaM3BISE4xYzBiZlRV?=
 =?utf-8?B?MFNyQ2xmL0tmU1FpYkNvZ3hlV1YyK2Y0a3U4Vjd2NTErdW5nbGRnQnpGdng4?=
 =?utf-8?B?NnphMmdZd3VMN2RmZUxBZTQwV1dvYmQ2dWp2ak5DSU0xalZZSGp3akY3bkZG?=
 =?utf-8?B?Ni96ZjYxT2liS2tmMGIwalF5YUdwUDBoU09nK1NKbkNNTjdjWnRTc0lYRTZL?=
 =?utf-8?B?NHc0NUh4SHRlTlZWMm5MOWxvT25rSnJaSzh0cUJFZzY3bHNFT2ZydnY4Rmp6?=
 =?utf-8?B?Uk0wK3ZYRWJEYTRweEJiQlRkSFBjNCtqd3MxZWx3R244eTA5YkJOR0swTG9t?=
 =?utf-8?B?Q3RUdWRWRUp1c0tiNm9GM0FiQndOQ2ZwOWw2WktzTW4zcXZDc1NwYVVlWlJt?=
 =?utf-8?B?ckYzRGRHNm9lb2NwcUxxemo5cnppN3c3NksrK3M2YUhUSjN0OUdzYUd6VXdT?=
 =?utf-8?B?QnpNTC9qRWVPZG9STHMvT2VUcThSSFgzcm5lWnJ5VXRrcUJQVkdRZ2taYU5k?=
 =?utf-8?B?bEhPVzRaaTFpTXY3YU1kLzRQclRVZkZhUkZpWDhaUjZZbVJ1NkNSdWJ6N0xh?=
 =?utf-8?B?QTFaRS9jOEc0Vk8rRDgyL0JQVWo0bkppbmhKanVGQkYzMHFnN0l0MGoxa0FQ?=
 =?utf-8?B?QXZCWEZuTkZKZGRYancyMDV3Slh5aHJ2Y3FoVWpjVjNVTWtGM0dkTnI2SmFm?=
 =?utf-8?B?WGMveUU0SmRzcjRuTUVxTkR3NTJYMFlLWC8wSmpOYUdUZmpKcUg5VE9oelFF?=
 =?utf-8?B?Z1owQWtBd2ozcUF6WGExY0xXTDlISnhmb1VESWpJNXpwWFdHZlFkUjBzU25V?=
 =?utf-8?B?RGJPU0trREhCVWE2VTVCK2VuSXZHaWhpQnIvcHh0TS9hbTFUUGpEbTVIbGhG?=
 =?utf-8?B?dUlZc3J5UjR5RjE1Y3ZFUFJpWk5tU0kwWTNOS2IweWJJMy8xNUo5M3JraTlE?=
 =?utf-8?B?SE1zOVN5ZXMySTJLVGY4Z25vaEtuaFJZVVhvNXgvbHJyVEpKLzhFU1pmeDZ6?=
 =?utf-8?B?czhpbWRVaDJaclZZd2duRjRrSjJ2cFU1MGloRVdxdTEwUjlnZmxBbDNKQlhy?=
 =?utf-8?B?TUtmSnlIT2VHbU5ZN1l2RzB4eDVLakdNeXZ1cUxDRkx6aThLRVZpQVJBeHAx?=
 =?utf-8?B?cGRlK28yL2FGWEYzdkNFa2FWSEJFTzNtbS9RNGFuYmxDOUI4QVVESUxXQjdi?=
 =?utf-8?B?SEE9PQ==?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b25c64f5-b91c-4231-7668-08dc055ca9b6
X-MS-Exchange-CrossTenant-AuthSource: PR3PR08MB5836.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2023 15:17:52.6651
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: h7Mb/jx3vFFKh0gJvPyUkXCEpTbwsJQVvJ33bT6QNfA4HS9P2YwH2LvhcTCU3bX753NkMk6+xRUhlUEexiREkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR08MB10557

On 18.12.2023 17:48, Vincent Guittot wrote:
> On Thu, 14 Dec 2023 at 15:42, Konstantin Khorenko
> <khorenko@virtuozzo.com> wrote:
>>
>> If busiest rq is small, nr_running < SCHED_NR_MIGRATE_BREAK and all
>> tasks are not movable, detach_tasks() should not iterate more than tasks
>> available in the busiest rq.
>>
>> Previously the (env->loop > env->loop_max) condition prevented us from
> 
> It's usually better to give the commit directly when we know it :
> Before commit : b0defa7ae03e ("sched/fair: Make sure to try to detach
> at least one movable task"),
> the (env->loop > env->loop_max) condition prevented us from ...

You are definitely right, added.

>> scanning non-movable tasks more than rq size times, but after we start
>> checking the LBF_ALL_PINNED flag, the "all tasks are not movable" case
>> is under threat.
>>
> 
> Fixes: b0defa7ae03e ("sched/fair: Make sure to try to detach at least
> one movable task")

Added this too, thank you.

>> Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
>> ---
>>   kernel/sched/fair.c | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
>> index d7a3c63a2171..faa2a765e899 100644
>> --- a/kernel/sched/fair.c
>> +++ b/kernel/sched/fair.c
>> @@ -11219,7 +11219,6 @@ static int load_balance(int this_cpu, struct rq *this_rq,
>>                  .dst_rq         = this_rq,
>>                  .dst_grpmask    = group_balance_mask(sd->groups),
>>                  .idle           = idle,
>> -               .loop_break     = SCHED_NR_MIGRATE_BREAK,
>>                  .cpus           = cpus,
>>                  .fbq_type       = all,
>>                  .tasks          = LIST_HEAD_INIT(env.tasks),
>> @@ -11265,6 +11264,12 @@ static int load_balance(int this_cpu, struct rq *this_rq,
>>                   * correctly treated as an imbalance.
>>                   */
>>                  env.loop_max  = min(sysctl_sched_nr_migrate, busiest->nr_running);
>> +               /*
>> +                * If busiest rq is small, nr_running < SCHED_NR_MIGRATE_BREAK
>> +                * and all tasks are not movable, detach_tasks() should not
>> +                * iterate more than tasks available in rq.
>> +                */
>> +               env.loop_break = min(SCHED_NR_MIGRATE_BREAK, busiest->nr_running);
> 
> Should it be after more_balance: ?
> In case we do "more_balance:" on a new_dst_cpu and it ends up that
> finally there is no more movable task as we released the lock of
> busiest rq in the meantime ?

Well, both yes and no here.
If we simply move the env.loop_break assignment after "more_balance" label,
we will break the handling LBF_NEED_BREAK case.

But you are right, the new_dst_cpu case should also not just reset loop_break to 
SCHED_NR_MIGRATE_BREAK, but do the same min() calculation.

So i've added one more label before the env.loop_break = min(...) and used it in
the new_dst_cpu case.

> Also you can remove one more superfluous init of loop_break:

Yep, dropped it, thank you.

> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -11361,7 +11361,6 @@ static int load_balance(int this_cpu, struct
> rq *this_rq,
>                           */
>                          if (!cpumask_subset(cpus, env.dst_grpmask)) {
>                                  env.loop = 0;
> -                               env.loop_break = SCHED_NR_MIGRATE_BREAK;
>                                  goto redo;
>                          }
>                          goto out_all_pinned;
> 
>>
>>   more_balance:
>>                  rq_lock_irqsave(busiest, &rf);
>> --
>> 2.39.3
>>