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 948DBC0218B for ; Fri, 24 Jan 2025 07:46:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29C6E280044; Fri, 24 Jan 2025 02:46:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09C8C280039; Fri, 24 Jan 2025 02:46:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF9A4280044; Fri, 24 Jan 2025 02:46:18 -0500 (EST) 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 992D2280039 for ; Fri, 24 Jan 2025 02:46:18 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 55CAB45991 for ; Fri, 24 Jan 2025 07:46:18 +0000 (UTC) X-FDA: 83041562436.23.C53A050 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf09.hostedemail.com (Postfix) with ESMTP id B2853140007 for ; Fri, 24 Jan 2025 07:46:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=none (imf09.hostedemail.com: domain of chenridong@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=chenridong@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737704776; 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; bh=d7CIj29+cQZlmSdNWoIYc4ubeJw4gRHGR/eh+nyjA40=; b=20XmLYMTllYL9JRvCMsoKA54etfeeIGoJSFIAUstJfZBSrPlUIuYVbzcmOfpLznW7eNJVy DjH6riimZh/n2iHJNPIFIM3r4SxKsEYks+blZ/vpaFZLPcYISVPOSYC0to3yEmYLq428dA UmT8GiATpWfgb81XaC33ErDZVdiuPxA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=none (imf09.hostedemail.com: domain of chenridong@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=chenridong@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737704776; a=rsa-sha256; cv=none; b=fKFslE3VCjAkA3j6uSbRzHS9xNmnvTyyBmpW3q06yspqsJxrxeR0fwky+I608x0LfiVf5K x6eaVNaa1ROF/X8wvY0eB+gKR2jmCO1rs4qSCsA1SHB17EOJ6TmLPNZ4441/BmFpe3oKZX Da0+MvX3ySDUbZyMhV9aFdcDz3g+O2c= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YfVH02fb9z4f3jYJ for ; Fri, 24 Jan 2025 15:45:48 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 140CA1A1065 for ; Fri, 24 Jan 2025 15:46:09 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP1 (Coremail) with SMTP id cCh0CgBHqnozRZNn89xFBw--.58969S4; Fri, 24 Jan 2025 15:46:08 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, mhocko@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, davidf@vimeo.com, vbabka@suse.cz, mkoutny@suse.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, chenridong@huawei.com, wangweiyang2@huawei.com Subject: [PATCH -v4 next 2/4] memcg: call the free function when allocation of pn fails Date: Fri, 24 Jan 2025 07:35:12 +0000 Message-Id: <20250124073514.2375622-3-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250124073514.2375622-1-chenridong@huaweicloud.com> References: <20250124073514.2375622-1-chenridong@huaweicloud.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgBHqnozRZNn89xFBw--.58969S4 X-Coremail-Antispam: 1UD129KBjvJXoW7WFWUXFWUuF45JF1UKF17ZFb_yoW8tFW3pa nxKa45Z3y5Ar4UWa1fKa4jva4rZa18Xw4UWryxXw1IkF1aqwnYqr12yw1F9r98CFWfXrnr trn8Aw1xK39FkrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI 0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr 0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUbJD G5UUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B2853140007 X-Stat-Signature: g8jripqj5mt1hj1999tk87mrrtc3wbjn X-Rspam-User: X-HE-Tag: 1737704775-279971 X-HE-Meta: U2FsdGVkX18pHdb/SSIBXi3+cK0Jgmh2cIJ2qgzGyemGe4zb3ngI5k9t0/np/Ukz2Fp92PAbu/ufFSVmJYd+b7W12wJ/o9XLMZXFOgWLM3a6gPuFcgRpe+6fXCwmImZ3ikWitHXNLqUobScRCtG2+r22APoSilguBH+/+OAxEZ8vBrS5L0Pt4qBMdxkXAksuDW1RynIttbQAYvodjVOvKNZxpH3wPNgR5Mf5UnX+TJsisQzjYaiEFchV1TspInetFNdMCepfNUGB1RdgANxYzGhG/zpRGXsxVHddjxrbdxScX72LR/tFXId2qjkN9268p5oiH9tP1Wh1Kr17xoZxtaoHetOsEpYK5YG9Ykg+2Jhgb27pC7vzAkJBdG1zkrZF0hqeuBQ9BOXiVIOXWoq2pGS8TLSvzV50Yvf//edNEujNS6JyXbJ9oGR/Ixa4wLDeDpzIEWHP4txLL1eyhaY7YRgp/IJYGbFT91SCLxmWLLfqTWXoqalb5wOxNHtH4ShdD31vawTCAx8ROtVo8dYvqamE/CcTQ3ckyXHdH6jNISuRNhxUlkqbYYVOolu97s0zigDe6mc1o4a/KvEPb4NTFp2SVYuTMSxbdBUjeX22zPSeCYdkPW8HUj/yj6aPojnUdKkTBmXTjVJbZIAWLXCg7dRjB3Bkk+YCQ+f9vXo39Am9AGV6DCiDLlN/mYLU1pbNdGs2uC5yznFPHVD3zlA2b4yTCAoYNkPRHWQIamsAlU3KQ0v5ImkuHTV7vexUt66JVcJnPgAuQYqlwJjrBG0KKwDWbhyBMRB4luOfZUgKtXjZiz6qjp0WtRygasFr354vAv3lADkGKDaEkHq1LnvM9N60NT+QhAfOOLsc8o7C/LWkPVFyC/u3ydaBYJnXjaXSbSUlV9O1pSMCN6MxwkEhaZ14231un4ux/9t3ml8A9axM2r8vx2W31Evqd2JxkDpWSII67SvEkvmREU7QT3R 4B2GHgj6 OCfnM5PWwQmJpTkGzVUDC4pws7I0v3Z7lZGWfBaB//IxXsU9x9zRYlHgFyJDRyihGaqaLCCakyPpMtZjaNBhHW2oSqR0NEZdGe54eXUbL6CRttrnKXI0AqiEVJDaHjxUYkFKWHFrHmy5SKNauYHdVztfbha/c4YY4IuYwlYoG0Iq86PK+SX/aJ1uxs7DwKWFf39V063Sj8hFBrq27mssc9MTJMTW0KEpFnPP/9yXdPNzrDeL6mSjNwLVdA7ArFErZjVLwyXmYXbdq6/K/HmlmebEdPFuZlTIAj8pluby3cBGMsuQ= 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: From: Chen Ridong The 'free_mem_cgroup_per_node_info' function is used to free the 'mem_cgroup_per_node' struct. Using 'pn' as the input for the free_mem_cgroup_per_node_info function will be much clearer. Call 'free_mem_cgroup_per_node_info' when 'alloc_mem_cgroup_per_node_info' fails, to free 'pn' as a whole, which makes the code more cohesive. Signed-off-by: Chen Ridong Reviewed-by: Michal Koutný Acked-by: Shakeel Butt Acked-by: Johannes Weiner --- mm/memcontrol.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 05a32c860554..98f84a9fa228 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3424,6 +3424,16 @@ struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino) } #endif +static void free_mem_cgroup_per_node_info(struct mem_cgroup_per_node *pn) +{ + if (!pn) + return; + + free_percpu(pn->lruvec_stats_percpu); + kfree(pn->lruvec_stats); + kfree(pn); +} + static bool alloc_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) { struct mem_cgroup_per_node *pn; @@ -3448,23 +3458,10 @@ static bool alloc_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) memcg->nodeinfo[node] = pn; return true; fail: - kfree(pn->lruvec_stats); - kfree(pn); + free_mem_cgroup_per_node_info(pn); return false; } -static void free_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) -{ - struct mem_cgroup_per_node *pn = memcg->nodeinfo[node]; - - if (!pn) - return; - - free_percpu(pn->lruvec_stats_percpu); - kfree(pn->lruvec_stats); - kfree(pn); -} - static void __mem_cgroup_free(struct mem_cgroup *memcg) { int node; @@ -3472,7 +3469,7 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) obj_cgroup_put(memcg->orig_objcg); for_each_node(node) - free_mem_cgroup_per_node_info(memcg, node); + free_mem_cgroup_per_node_info(memcg->nodeinfo[node]); memcg1_free_events(memcg); kfree(memcg->vmstats); free_percpu(memcg->vmstats_percpu); -- 2.34.1