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:   Wed, 19 Jul 2023 10:13:55 +0800
From:   Aaron Lu <aaron.lu@intel.com>
To:     Chen Yu <yu.c.chen@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: <20230719021355.GA84059@ziqianlu-dell>
References: <20230718134120.81199-1-aaron.lu@intel.com>
 <20230718134120.81199-2-aaron.lu@intel.com>
 <ZLasCKO4KA5Pgvdd@chenyu5-mobl2>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <ZLasCKO4KA5Pgvdd@chenyu5-mobl2>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DEtxvuB+ZkcOFehhqZJWrgmp+JLFNcigDTw0lC9xRgL48B0rh7hLPRHxLFz0?=
 =?us-ascii?Q?iTGo57dQ0/Xbaa2lbX9gCc7HlFqFzCKDcLyvPR5/3O9YXAxGgWgBlCQodFBy?=
 =?us-ascii?Q?254NUF0FZ+ntpPGGQpNdLW7NnVURftFXBpVckTVLcnECayDKknWqIyZFjcIr?=
 =?us-ascii?Q?ep4dEj6qO5TmhBX839BzeU1XwUbY8rgKGDOJVNeD3QK4fDws5fjs5EeHMXhc?=
 =?us-ascii?Q?tPzYU5t8XBEYmABgiOVpSIXgN4WHyzSyiR8xQMTFH7FFw3A5xiVqV4j5fEt1?=
 =?us-ascii?Q?8hHNwyEJsspBm1iaAsFxJDJ1htriAUyL9iNP8EX0sv/+NxtZe2pt5zr3/bFC?=
 =?us-ascii?Q?gc9DG8wJBGK5tUZQVWKyOM2SvpqWrR8c3PTUCMzIJf/sYO+Hvpj3I2jr0Pri?=
 =?us-ascii?Q?5oM4mIk1ka0w2Tz8LF5fjaU1fJegvGFeV31uFIZ1kuEeIUZNp2xcRzTcpNuO?=
 =?us-ascii?Q?aNTp9+4L0GXpeB1ZTsqhFV576RQ4ddjZpwTODqoEEOX5wWLPVfjf2Lm3I1LH?=
 =?us-ascii?Q?FNpcZLpQip2dPT4t0t/sCKMkLVI5u23IN49hzpvgv8t7GNDfbsiruW9tmoqJ?=
 =?us-ascii?Q?kfqPgMif4fmbBHBpS9W0P9FN1e5eeBuufrenQX7emdtI5cpLzct0KcgqN0Kq?=
 =?us-ascii?Q?Np7iXMpXqvVTHcO3nMb7uB1BbW4YZZMl9yOK7kJR3pqqs1XrgwEGF2C7ByZc?=
 =?us-ascii?Q?/DeKvyCw9liLU5viE+YjIKLkqqmEOzWl65TBaYXml1R7dXuPsTpqJLb91INa?=
 =?us-ascii?Q?Ii96nUfW0lKGBleSQsyZ8LzwSCY6cgyjLsuEPLc1r5AleI2GksLEcfH3mDfk?=
 =?us-ascii?Q?YE5oUOrjuSBKFY9N8HyN9phz64K8nDJ9SNorYGXZbodbPyU8HYJBN+AQHUW8?=
 =?us-ascii?Q?pcvGA5mgQG09U9aDIyGdtffTZR0YBEF3E93PoWxGdRwM1h/rd9IlFsMaYOe1?=
 =?us-ascii?Q?fBvC+OlrKMZWqaZC5/3XiA4QTW0eV6Ov5G9UocdEwPnqC4mEh/b/bfOFA6Ed?=
 =?us-ascii?Q?3evxGJxfsDvKvfxcU1i9aFcWy4eL2xpG44WvNNat1sabg+rTHZrsuTFi+iU9?=
 =?us-ascii?Q?oaHAXT0oNVI5tyUO6JHxX0vlOGuMfyqH5+QzUMHNFknI00JDuRVy2z9VT1Mi?=
 =?us-ascii?Q?fygeWAwdJlumEahOmk/l2cXe17kN5whnqwPSuwDH/jokT+Hu9LJuLOwoGqON?=
 =?us-ascii?Q?ZBb5SR9FT74ojNlnB5ZqhnilY4CaCwFzSoLoJdFzVHFQzHykC48q8lKQn5ec?=
 =?us-ascii?Q?D2LkWsSLJmvIon2S2DmmTqHWu03wl21u026xL/j5bpYyvW5AeLgcK8lmfyUH?=
 =?us-ascii?Q?Q/q/IhGW3WEkCs7sBGGbhqovVfmmpOXVzna6o6ewGn7q4WdaGYRqy9Lb6njN?=
 =?us-ascii?Q?s8ewgKhXB4U/thPgVxZLnoZFHunOsPkWbf4zvEgAQgbB939RB8+0Dsj0YREX?=
 =?us-ascii?Q?gu5p/rTyU+kKQ0yR1MlNquS98khs/6gch9hVNSeF+576ywkQQoeconMB0Ute?=
 =?us-ascii?Q?X9gQRnZJjm5KY4lsXTZhmvdl5c4QiamAeALrO7JixcY0J6klpuYqnMI8xnXL?=
 =?us-ascii?Q?HhOV0JxsDAvPT8tCeyK72N8EtTCfHG5cBgNRYaE7?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0a24d0a5-cdb6-4c86-a703-08db87fdd540
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3062.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 02:14:07.8949
 (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: 8Q6Lcah3dVKjoxh3PdUIIXK8cnKYcEJaOHOl9/7rsRT0fBXXBwIHYP/f5spsSLKPmir1MKgLL/YFcS8+y0mFDQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR11MB7463
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,RCVD_IN_MSPIKE_H2,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 Tue, Jul 18, 2023 at 11:13:12PM +0800, Chen Yu wrote:
> 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?

You are right, I overlooked... Thanks for pointing this out.