From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F67D2A537 for ; Wed, 16 Oct 2024 17:32:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 641206B007B; Wed, 16 Oct 2024 13:32:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C9D26B0082; Wed, 16 Oct 2024 13:32:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46B216B0083; Wed, 16 Oct 2024 13:32:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 289576B007B for ; Wed, 16 Oct 2024 13:32:02 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8B94BC0867 for ; Wed, 16 Oct 2024 17:31:50 +0000 (UTC) X-FDA: 82680158190.22.284FC86 Received: from out-187.mta0.migadu.com (out-187.mta0.migadu.com [91.218.175.187]) by imf06.hostedemail.com (Postfix) with ESMTP id E288F18001A for ; Wed, 16 Oct 2024 17:31:52 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JiOvf8Rl; spf=pass (imf06.hostedemail.com: domain of roman.gushchin@linux.dev designates 91.218.175.187 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729099774; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=km8BLia+/1QmGj2vLcf5Wy4/X9EH2zW/5AUiwrRAFjM=; b=oMXTPji9wHJCfT1xYlMJ9wSUwVCneq46OTJuEaqoQVf01H9in8xwFuWt0BJtkzz9+ZhIqk bQuAlblgZ72Hyl5p0mg4ekSbiOHJL4FARYfr7VvTo2ei3bk3G3iyEgsdFEmiNGAcSoM2v3 pMv9o32eec0g/d6vG+fQnkTkyerdenY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729099774; a=rsa-sha256; cv=none; b=qCHB3LIp81/WS13uZcGY8F66ihYrqqJseoB5W1RxikpWOV7eZIXjopNMoWCatZHmqKqsRe MBCS0Z5jcYdqdZh9SCfLj2X3IJNm9C+kg2Ju6X5QPTMG5vlzR/nUvF+5cTgApXupNfVkwe B3JHuchejWoHMVtE3k2BIRwjwQjYrz4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=JiOvf8Rl; spf=pass (imf06.hostedemail.com: domain of roman.gushchin@linux.dev designates 91.218.175.187 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev Date: Wed, 16 Oct 2024 17:31:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1729099916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=km8BLia+/1QmGj2vLcf5Wy4/X9EH2zW/5AUiwrRAFjM=; b=JiOvf8Rlw38c/tVZlBExWa+ZinE6bDR4PoUtxelv2iWPsWxEn0IUivgSK8fTVzdF1hj5Lw N5jSFD8txpbTU6k1pfiB3H7scAWIOB/DpJzqB1hNgrnrwqzb1iM17l5YBE+C66YzjL5t2y 9yusky4vH74HCE4CcY4SDJ7dG4gBFBU= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Vlastimil Babka Cc: Muchun Song , chenridong , Anshuman Khandual , "Kirill A. Shutemov" , akpm@linux-foundation.org, david@fromorbit.com, zhengqi.arch@bytedance.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, wangweiyang2@huawei.com Subject: Re: [PATCH v2] mm: shrinker: avoid memleak in alloc_shrinker_info Message-ID: References: <1BD74B20-879A-4159-B957-1223553217C1@linux.dev> <0b883f9e-451f-41c2-805f-7f5bc7eebee2@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0b883f9e-451f-41c2-805f-7f5bc7eebee2@suse.cz> X-Migadu-Flow: FLOW_OUT X-Stat-Signature: sreftwmww18a35x8r3w1zqk3zditrjrn X-Rspamd-Queue-Id: E288F18001A X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1729099912-485544 X-HE-Meta: U2FsdGVkX1+2YFvBGfvauvZTOwYYSARMr0TiAGELFHPGNQGzytKMRP1wPmNy4g5Y1FgvT77M9CR4rvPXgeiaComIV73GKeueqCwrjPWTvMJkrBKorSxE/GZ7Hh7Xo9sXxCleT1epoYrtPM2JQKJHUS+mIaR2b9/jpmac3eFs9B6j+7ZEm/KfdNilNagyshWS6MuAB+pcMzbe52+7YmxxAKQRY+kQnXr0tMsIGXA51SaMsFaw9UyVSIt3r2aO14UXQTXn0HOhFrB8eeIW9eBIFOaTf+/HwcVQPIxfKwbSJv/rAa6f5VXgrWI1+oeVXPzCOqz/cqfmYaZ2HMEl7R09Zq3JrU29EkbMuh73XZ2Btf5PX7vjq9sKa9OAVvACjCasCsCaPxhyYzjiK5SpaZAdyMrF5lTb837HHHZOSdPCX/h9NO+i/h0GregaRJlKpueKBwm8QmEFi29Ov4wPtR7wusDNuFA9LQ3scJ0dUCz2LADCEdDdj8/+n9DvEwAuBKkD2i7wy8Dq4e0JvNhpNXvfzfxEMYs6C8XokN7Tk9S0M66K+HBbWv1zL5Hqla2WYDTDsqeDL6hHTqh4WSTUKRbA0IQXuY8vJwYWDbUOk+DupWKu8H95NOmO9ymRc6Z1mPzIhDTVnzBhhLVC8xo5OtKuM7Y7fn/IuQupPcadRA4PVN/tPKs63GDQURZdY2mmPHtXEUa63p+u6cp6OxaM5YkpFvNTsGAmoCCKHSbv4quBjeyGZrp0ERY4vgbtcjpv9g4xlXMkMe5wzJ+nrxxlOTFNeck9ajQnLmbL9phligCHBuPA2J6L2LuAWLaAb7g0EA4X6/oVU9FmdFY/CBBFIHh86gxguK4ewWdHzAWWTmxcU/mK3kV2yTp4yF7t9cSVyKb9LjX/+QxoGjsPUUqvaUBuMLp64GYdrHNewtW4F/SFd5hOh8ukXQHDCZnU/TjH1RskWzUlL09LaNAg39MvA7W eMlzDclT M3FIoP9a+mIpyYuKBbedJj7JWO7ihX6fymlsHjCp9b/h/4R1cf690aWHWUbQrqmRHun409ZkFOIKfWQ+WUHVtvSpSKTwZ/GxcT6b6ht1QPQvcLq5X9rMw3tGA1gb1AmupytiLyQqDppKsLoTmIGYrqQem6W1t92XCkDsCo69hhmu44C3u4jseRY9uhlvYGTaYVcMGH4smU+sEXf+I9lP9VtZhxUyJ12VkwlYS8SL6CqyXMi5RvW5BSOBFd5nn/u30sLUivhko8tjMiG1Qw2wM2jOBDw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Oct 16, 2024 at 07:02:23PM +0200, Vlastimil Babka wrote: > On 10/16/24 16:08, Muchun Song wrote: > > > > > >> On Oct 16, 2024, at 19:43, Vlastimil Babka wrote: > >> On 10/16/24 04:21, Muchun Song wrote: > >>> > >>> > >>>> On Oct 16, 2024, at 09:25, chenridong wrote: > >>>> On 2024/10/15 14:55, Anshuman Khandual wrote: > >>>>> On 10/14/24 16:59, Kirill A. Shutemov wrote: > >>>>>> On Mon, Oct 14, 2024 at 03:23:36AM +0000, Chen Ridong wrote: > >>>>>>> From: Chen Ridong > >>>>>>> A memleak was found as bellow: > >>>>>>> unreferenced object 0xffff8881010d2a80 (size 32): > >>>>>>> comm "mkdir", pid 1559, jiffies 4294932666 > >>>>>>> hex dump (first 32 bytes): > >>>>>>> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > >>>>>>> 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 @............... > >>>>>>> backtrace (crc 2e7ef6fa): > >>>>>>> [] __kmalloc_node_noprof+0x394/0x470 > >>>>>>> [] alloc_shrinker_info+0x7b/0x1a0 > >>>>>>> [] mem_cgroup_css_online+0x11a/0x3b0 > >>>>>>> [] online_css+0x29/0xa0 > >>>>>>> [] cgroup_apply_control_enable+0x20d/0x360 > >>>>>>> [] cgroup_mkdir+0x168/0x5f0 > >>>>>>> [] kernfs_iop_mkdir+0x5e/0x90 > >>>>>>> [] vfs_mkdir+0x144/0x220 > >>>>>>> [] do_mkdirat+0x87/0x130 > >>>>>>> [] __x64_sys_mkdir+0x49/0x70 > >>>>>>> [] do_syscall_64+0x68/0x140 > >>>>>>> [] entry_SYSCALL_64_after_hwframe+0x76/0x7e > >>>>>>> In the alloc_shrinker_info function, when shrinker_unit_alloc return > >>>>>>> err, the info won't be freed. Just fix it. > >>>>>>> Fixes: 307bececcd12 ("mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred}") > >>>>>>> Signed-off-by: Chen Ridong > >>>>>>> --- > >>>>>>> mm/shrinker.c | 1 + > >>>>>>> 1 file changed, 1 insertion(+) > >>>>>>> diff --git a/mm/shrinker.c b/mm/shrinker.c > >>>>>>> index dc5d2a6fcfc4..92270413190d 100644 > >>>>>>> --- a/mm/shrinker.c > >>>>>>> +++ b/mm/shrinker.c > >>>>>>> @@ -97,6 +97,7 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) > >>>>>>> err: > >>>>>>> mutex_unlock(&shrinker_mutex); > >>>>>>> + kvfree(info); > >>>>>>> free_shrinker_info(memcg); > >>>>>>> return -ENOMEM; > >>>>>>> } > >>>>>> NAK. If in the future there going to one more error case after > >>>>>> rcu_assign_pointer() we will end up with double free. > >>>>>> This should be safer: > >>>>>> diff --git a/mm/shrinker.c b/mm/shrinker.c > >>>>>> index dc5d2a6fcfc4..763fd556bc7d 100644 > >>>>>> --- a/mm/shrinker.c > >>>>>> +++ b/mm/shrinker.c > >>>>>> @@ -87,8 +87,10 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) > >>>>>> if (!info) > >>>>>> goto err; > >>>>>> info->map_nr_max = shrinker_nr_max; > >>>>>> - if (shrinker_unit_alloc(info, NULL, nid)) > >>>>>> + if (shrinker_unit_alloc(info, NULL, nid)) { > >>>>>> + kvfree(info); > >>>>>> goto err; > >>>>>> + } > >>>>>> rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); > >>>>>> } > >>>>>> mutex_unlock(&shrinker_mutex); > >>>>> Agreed, this is what I mentioned earlier as well. > >>>>> ------------------------------------------------------------------ > >>>>> I guess kvfree() should be called just after shrinker_unit_alloc() > >>>>> fails but before calling into "goto err" > >>>>> ------------------------------------------------------------------ > >>>> After discussion, it seems that v1 is acceptable. > >>>> Hi, Muchun, do you have any other opinions? > >>> > >>> I insist on my opinion, not mixing two different approaches > >>> to do release resources. > >> > >> So instead we mix the cleanup of the whole function with the cleanup of what > >> is effectively a per-iteration temporary variable? > >> > >> The fact there was already a confusion in this thread about whether it's > >> safe and relies on kvfree(NULL) to be a no-op, should be a hint. > > > > Yes. I think someone is confused about my opinion. > > I don’t care about whether we should apply this hit. > > If we think the hint is tricky, we could add another > > label to fix it like I suggested previously. Because > > we already use goto-based approaches to > > cleanup the resources, why not keeping > > consistent? > > I think we're rather pragmatic than striving to be consistent for the sake > of consistency. goto is not the nicest thing in the world, but we (unlike > other projects) use it where it makes sense to avoid if/else nesting > explosion. Here for the info it's not the most pragmatic option. > > > It will be easier for us to add a new > > "if" statement and handle the failure case in the future. > > Let's not overengineer things for hypothetical future. > > > For example, if we use his v1 proposal, we should do > > the cleanups again for info. But for goto-based > > version, we just add another label to do the > > cleanups and go to the new label for failure case. goto-based fix is what I insisted on. I copied my previous suggested fix here to clarify my opinion. > > Again, info is a loop-iteration-local variable, v1 fix making it truly local > is the way to go. If there are further cleanups added in the loop itself in > the future, they could hopefully keep being local to the loop as well. > Cleanup of info outside the loop iteration is breaking its real scope. +1 to that. I don't think it's such a big deal and both versions are ok, but I strongly prefer the original version (without introduction of a new label). Please, feel free to use Acked-by: Roman Gushchin with the original version. Thanks!