From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753373AbdKWWBA (ORCPT ); Thu, 23 Nov 2017 17:01:00 -0500 Received: from ipmail07.adl2.internode.on.net ([150.101.137.131]:62184 "EHLO ipmail07.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753317AbdKWWA7 (ORCPT ); Thu, 23 Nov 2017 17:00:59 -0500 Date: Fri, 24 Nov 2017 09:00:46 +1100 From: Dave Chinner To: Michal Hocko Cc: Tetsuo Handa , hch@infradead.org, darrick.wong@oracle.com, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] xfs: handle register_shrinker error Message-ID: <20171123220045.GV5858@dastard> References: <20171123120828.31881-1-mhocko@kernel.org> <20171123132633.GB21798@infradead.org> <20171123134128.mzxv6234hypokg4k@dhcp22.suse.cz> <201711240101.CJF18223.FJtHOLOSQFOMVF@I-love.SAKURA.ne.jp> <20171123161137.ncjqskbvdm6dgb3z@dhcp22.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171123161137.ncjqskbvdm6dgb3z@dhcp22.suse.cz> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 23, 2017 at 05:11:37PM +0100, Michal Hocko wrote: > On Fri 24-11-17 01:01:10, Tetsuo Handa wrote: > > Michal Hocko wrote: > > > On Thu 23-11-17 05:26:33, Christoph Hellwig wrote: > > > > Looks good, > > > > > > > > Reviewed-by: Christoph Hellwig > > > > > > Thanks! > > > > > > > I can take a stab at the quota one. > > > > > > That would be really great! > > > > > Again, it does not look good. Since kmem_free() does only kvfree(), > > nothing will release memory allocated by list_lru_init(). > > Hmm, you are right. I have (blindly) followed the current code flow > which is wrong as well. The following should do the trick. Should I > split that into two patches? One is fine by me - if we're need to backport one fix, then we need to backport both :/ > --- > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index dd0e18af990c..4c6e86d861fd 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -1815,25 +1815,27 @@ xfs_alloc_buftarg( > btp->bt_daxdev = dax_dev; > > if (xfs_setsize_buftarg_early(btp, bdev)) > - goto error; > + goto error_free; > > if (list_lru_init(&btp->bt_lru)) > - goto error; > + goto error_free; > > if (percpu_counter_init(&btp->bt_io_count, 0, GFP_KERNEL)) > - goto error; > + goto error_lru; > > btp->bt_shrinker.count_objects = xfs_buftarg_shrink_count; > btp->bt_shrinker.scan_objects = xfs_buftarg_shrink_scan; > btp->bt_shrinker.seeks = DEFAULT_SEEKS; > btp->bt_shrinker.flags = SHRINKER_NUMA_AWARE; > - if (register_shrinker(&btp->bt_shrinker)) { > - percpu_counter_destroy(&btp->bt_io_count); > - goto error; > - } > + if (register_shrinker(&btp->bt_shrinker)) > + goto error_pcpu; > return btp; > > -error: > +error_pcpu: > + percpu_counter_destroy(&btp->bt_io_count); > +error_lru: > + list_lru_destroy(&btp->bt_lru); > +error_free: > kmem_free(btp); > return NULL; That should do the trick. Acked-by: Dave Chinner Cheers, Dave. -- Dave Chinner david@fromorbit.com