Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 18 Jul 2023 23:13:12 +0800
From:   Chen Yu <yu.c.chen@intel.com>
To:     Aaron Lu <aaron.lu@intel.com>
CC:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Juri Lelli <juri.lelli@redhat.com>,
        Vincent Guittot <vincent.guittot@linaro.org>,
        Daniel Jordan <daniel.m.jordan@oracle.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>,
        Tim Chen <tim.c.chen@intel.com>,
        "Nitin Tekchandani" <nitin.tekchandani@intel.com>,
        Waiman Long <longman@redhat.com>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/4] sched/fair: free allocated memory on error in
 alloc_fair_sched_group()
Message-ID: <ZLasCKO4KA5Pgvdd@chenyu5-mobl2>
References: <20230718134120.81199-1-aaron.lu@intel.com>
 <20230718134120.81199-2-aaron.lu@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230718134120.81199-2-aaron.lu@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Qwes7L/bIhVzfzirFObRWCQFC/Ku4rW7QP82+qaHnLB2trO++0Ff96AGgyul?=
 =?us-ascii?Q?gapvcrjZ8IK1YOxIVd+GTft9prPaT87LBUx3Ejz2z9Q6UFLcIW4s+pxut2l5?=
 =?us-ascii?Q?A9IJ7XSRNg13xRI4zQ8diUZsVw8YSx6ZtpVvFYuM9Yv+ppYiOtz8hhDzaDAw?=
 =?us-ascii?Q?Ur0dOCff6wPd58CE68Tqqjylu+LKZR0M/7BQF4m4CjXsU5sO/9vVfbYDGbyh?=
 =?us-ascii?Q?KbQMREfX43vWzsxaJelD5hY7GPeeEec5Ilh3/7PPzOUH1Hf1BLJ2VTHSBmYO?=
 =?us-ascii?Q?fU6MCDaMwQnaOGXbsdBt9UqA4F3wtcZ3antjLbStEnZcPYdNOuk463MBQqm0?=
 =?us-ascii?Q?3/JSvm/cl0X8UDEX2oXviIJRhx+pG84L5dEhlc7eG0ZqXkkueXY3BSTTE4QR?=
 =?us-ascii?Q?RLHjyArTfLt5+DIhXwfCgYBdFvgCDOIgYu+iXTQpnHS2L/l3w5LkcEjpDtFy?=
 =?us-ascii?Q?XW0MYnlR69/PegvaMvyjKdTKbxvLrqA6YoBaYTxfO2J+0RtWXrvTUAaNVeQk?=
 =?us-ascii?Q?6u+ySi1GiZVmgH/S2k9/wLX07t3feZYRdLNT7ZFGHb3b9uW44jw9+0AGtdTC?=
 =?us-ascii?Q?a9Ja65OlVLinEpkJKetlB6nVMQBgGx7XN7pNknNFutDmwAUXG1XWs0Rb0ntA?=
 =?us-ascii?Q?M0axBuQsu5aW0H16npPPg6NHy6xRzuppCLtfB+oS43/oR/D8eOXh7pXsvWEg?=
 =?us-ascii?Q?NlM4Ya9hFc1URALDprz+u1X2VP3d5Fpc7lYqPolXnvOv8rRIU7Dspak/Sdno?=
 =?us-ascii?Q?ErRwZE0hcTfXoTi/ymUMAovaQEWJ/W9c77RsayHpJFkyncZvdtdEj8zIoFzp?=
 =?us-ascii?Q?ueQmyxBBFv/33Bb5yk5KUto5slB0LEnLNh0uDBxED/+ddh7IqB4Sd8ySUKgt?=
 =?us-ascii?Q?5hg71KpFMt6z6ARlJcRUnNYvyXezs34umFs2qml9qnyjPNgXIvEsDeBQP7dP?=
 =?us-ascii?Q?1kNXBR2kAKfl7pvd3YdXTfAnKKzOCc5p9Q0Ixox/XykTnou2+WBXR+IRwDRX?=
 =?us-ascii?Q?vzr/wdZEXWm/SCnAMHlE8ssrGomaQpvSQ0j/I5n8MAgPzYmUwRHzEGmcNAgG?=
 =?us-ascii?Q?7Uyk0MHJflo0KIK2BHvD+5WhGAvssNeTUXVWggNNG2pPigW3sBU4OHdiJmBP?=
 =?us-ascii?Q?J5rKaQ8lZLA3iAQDKZVfIdbWrB5izJEOywBqY7w2atHyf6bwul/AIOf18P2Y?=
 =?us-ascii?Q?7en8p0T5hYCOZBFLqrGADLRuIhDRzf0mWRjlzbN7/No8TlJ4EmXmErPbqVAV?=
 =?us-ascii?Q?4v3/ANrhNEROiZZSMB7pK6Fi5mlC1VjdM2lOiOaH9GC6cmxgXZkSvD2895Zt?=
 =?us-ascii?Q?RdDuxeX4Oq1SGrZ6n51mTPaj4HOh9xW/MCGfdhWrJs050bO8LnW9KXYD7Zcc?=
 =?us-ascii?Q?p18fZfyUnzyMn8h0IGy+FYOX8LjO477kjuzkTcyQCfpr4qER6oM6qjWeUtV/?=
 =?us-ascii?Q?kHas+S5yuYhNAHUL7Z+jJz/ZnGL8uSuAyOH7oyidx8+eNd10pJpBZCMFdFN2?=
 =?us-ascii?Q?dKAbr4vjJs/MBcFt3vJog1mOFArSuqpUK+7Pt89w6Tg9NC0eoz96Jii7ALiQ?=
 =?us-ascii?Q?RyLm6zrNSnljhzaMxRIQnazLBeKpjNe8xed4HpfI?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4d0edb74-3555-45c8-0129-08db87a18d57
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6206.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 15:13:33.5177
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: SZxcMW6wIMm0yw5NpaB6OCCF6EZ9lQFLMPc7xRek7cWfSxF8C+mWOqPmjIL0dOpUwE2qPORoWjVRqNAzFGkr4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5054
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
        RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2023-07-18 at 21:41:17 +0800, Aaron Lu wrote:
> There is one struct cfs_rq and one struct se on each cpu for a taskgroup
> and when allocation for tg->cfs_rq[X] failed, the already allocated
> tg->cfs_rq[0]..tg->cfs_rq[X-1] should be freed. The same for tg->se.
> 
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>
> ---
>  kernel/sched/fair.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index a80a73909dc2..0f913487928d 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -12443,10 +12443,10 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
>  
>  	tg->cfs_rq = kcalloc(nr_cpu_ids, sizeof(cfs_rq), GFP_KERNEL);
>  	if (!tg->cfs_rq)
> -		goto err;
> +		return 0;
>  	tg->se = kcalloc(nr_cpu_ids, sizeof(se), GFP_KERNEL);
>  	if (!tg->se)
> -		goto err;
> +		goto err_free_rq_pointer;
>  
>  	tg->shares = NICE_0_LOAD;
>  
> @@ -12456,12 +12456,12 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
>  		cfs_rq = kzalloc_node(sizeof(struct cfs_rq),
>  				      GFP_KERNEL, cpu_to_node(i));
>  		if (!cfs_rq)
> -			goto err;
> +			goto err_free;
>  
>  		se = kzalloc_node(sizeof(struct sched_entity_stats),
>  				  GFP_KERNEL, cpu_to_node(i));
>  		if (!se)
> -			goto err_free_rq;
> +			goto err_free;
>  
>  		init_cfs_rq(cfs_rq);
>  		init_tg_cfs_entry(tg, cfs_rq, se, i, parent->se[i]);
> @@ -12470,9 +12470,18 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
>  
>  	return 1;
>  
> -err_free_rq:
> -	kfree(cfs_rq);
> -err:
> +err_free:
> +	for_each_possible_cpu(i) {
> +		kfree(tg->cfs_rq[i]);
> +		kfree(tg->se[i]);
> +
> +		if (!tg->cfs_rq[i] && !tg->se[i])
> +			break;
> +	}
> +	kfree(tg->se);
> +err_free_rq_pointer:
> +	kfree(tg->cfs_rq);
> +
Not sure if I overlooked, if alloc_fair_sched_group() fails in sched_create_group(),
would sched_free_group()->free_fair_sched_group() do the cleanup?

thanks,
Chenyu