From nobody Wed Feb 19 02:17:59 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D72A25A65B; Fri, 17 Jan 2025 02:14:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080088; cv=none; b=SrEMJOIKuwjjKD7nKQB9kl/wQqbIgmrBNCsYlPdU58Im+zVcnvPHk07ZGOf+2WfB8wo02Q6LOX+XUGT1yH2qzWbeYQedi7ONrAqjitrHDv9ZXqwugyXrTssq3F83YhpZOR83StP1MbwDRT4tLCg+CEW4aGjGFW7XO8+QBKC3/Wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080088; c=relaxed/simple; bh=t8ZApSVZF7kYvsUpMXc542nOM3zha9IX6Jo+ZeLhhiE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=XsROT4Ng1tloTEVCsLe8y2hVi1sEHs3H7UF90p+VKRyOMfhRGLyUeUscod/4df2hTMCOtCM7yF2RDlvnIHfSauBkjfYuOQDDzFJbPY7XHJYgBg9i39dz3mwTRbdRt2Zrpucnc1Uyx7p5qtptU1y3W9mtnR3I8kDoElwgNAPZ6EM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t661Rpz4f3jt1; Fri, 17 Jan 2025 09:57:18 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 185F81A177B; Fri, 17 Jan 2025 09:57:34 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP2 (Coremail) with SMTP id Syh0CgCnsWT7uIln8NWrBA--.20802S3; Fri, 17 Jan 2025 09:57:33 +0800 (CST) From: Chen Ridong <chenridong@huaweicloud.com> 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 v3 next 1/5] memcg: use OFP_PEAK_UNSET instead of -1 Date: Fri, 17 Jan 2025 01:46:41 +0000 Message-Id: <20250117014645.1673127-2-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250117014645.1673127-1-chenridong@huaweicloud.com> References: <20250117014645.1673127-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnsWT7uIln8NWrBA--.20802S3 X-Coremail-Antispam: 1UD129KBjvdXoWrZFWrJF43Cw1xWF1xWr4Uurg_yoWfGFX_uF WkKr1DZr15J3ySk3Z0yrySvrnayF1UX347Kw45tw13AFyqqasYvF1vqr4vvw1kXr47try3 Cwsaqayqgw12gjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r18M2 8IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK 021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r 4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx 0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWU JVW8JwACjcxG0xvY0x0EwIxGrwACI402YVCY1x02628vn2kIc2xKxwCY1x0262kKe7AKxV WUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jjuWdU UUUU= X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ From: Chen Ridong <chenridong@huawei.com> The 'OFP_PEAK_UNSET' has been defined, use it instead of '-1'. Signed-off-by: Chen Ridong <chenridong@huawei.com> Reviewed-by: Michal Koutn=C3=BD <mkoutny@suse.com> Acked-by: David Finkel <davidf@vimeo.com> Acked-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 46f8b372d212..05a32c860554 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4004,7 +4004,7 @@ static ssize_t peak_write(struct kernfs_open_file *of= , char *buf, size_t nbytes, WRITE_ONCE(peer_ctx->value, usage); =20 /* initial write, register watcher */ - if (ofp->value =3D=3D -1) + if (ofp->value =3D=3D OFP_PEAK_UNSET) list_add(&ofp->list, watchers); =20 WRITE_ONCE(ofp->value, usage); --=20 2.34.1 From nobody Wed Feb 19 02:17:59 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DAFD1F5606; Fri, 17 Jan 2025 02:14:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080099; cv=none; b=IhKm5HbWvrrLRjwaePlWIn3ciIoV14KKp7qe3mtLeKYC+X6OQgsooVK05Vn/myAzOgjBL83OiZxPvXWD76zgb88rpaWXO9d6kP1ZG3rihIacsMbljYuDMmO/FnSTrzDq55c7QbtB1JeUrYTZXAyyD++TsvNRHqzIqsspe7Psmvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080099; c=relaxed/simple; bh=139wZiZAYzcX1f9OvPYAgt8ouCnZd/ur8n21fqubZb4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=GVvNCVVRCrcUIyS7tSNL4T796IAhSCTT7vAzKBrmQouLFUKAq+0Mlx7eW/VqPdkd6YBT++Y7MmlksaHUllxBuNtC2De2Xn+j3VI5rQirZmE7VyAH4eWHENQusuxdNasLXaHTz+Bb/bjGYucIrAf8jVpO/8Xks3vcXYtJI4fvTQ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t03Plgz4f3kvv; Fri, 17 Jan 2025 09:57:12 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 2DDEB1A0E3E; Fri, 17 Jan 2025 09:57:34 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP2 (Coremail) with SMTP id Syh0CgCnsWT7uIln8NWrBA--.20802S4; Fri, 17 Jan 2025 09:57:33 +0800 (CST) From: Chen Ridong <chenridong@huaweicloud.com> 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 v3 next 2/5] memcg: call the free function when allocation of pn fails Date: Fri, 17 Jan 2025 01:46:42 +0000 Message-Id: <20250117014645.1673127-3-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250117014645.1673127-1-chenridong@huaweicloud.com> References: <20250117014645.1673127-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnsWT7uIln8NWrBA--.20802S4 X-Coremail-Antispam: 1UD129KBjvJXoW7WFWUuFykKFWktw1xCr13CFg_yoW8trWrpa nxKa45Z3y5Jr4UWa1fKa4jva4rZa18Xw4UWryxXw1IkF1aqwnYqr12yw1F9r98CFyfXrnr trn8Aw1xK39FkrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPFb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI 0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUob18 DUUUU X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ From: Chen Ridong <chenridong@huawei.com> 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 <chenridong@huawei.com> Reviewed-by: Michal Koutn=C3=BD <mkoutny@suse.com> Acked-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Johannes Weiner <hannes@cmpxchg.org> --- 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 =20 +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 n= ode) { struct mem_cgroup_per_node *pn; @@ -3448,23 +3458,10 @@ static bool alloc_mem_cgroup_per_node_info(struct m= em_cgroup *memcg, int node) memcg->nodeinfo[node] =3D pn; return true; fail: - kfree(pn->lruvec_stats); - kfree(pn); + free_mem_cgroup_per_node_info(pn); return false; } =20 -static void free_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int no= de) -{ - struct mem_cgroup_per_node *pn =3D 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 *memc= g) obj_cgroup_put(memcg->orig_objcg); =20 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); --=20 2.34.1 From nobody Wed Feb 19 02:17:59 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4A89335BA; Fri, 17 Jan 2025 02:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080182; cv=none; b=CHqjqVykC6fxC5PEBdTthw+MRz3O0pIlwblg0U/sNTPCRmzciuXwHjPy3/vSjYYmyQlM6PJGDngc+m/fRDTGew7fqPZ1MZxP97HX1lLR9dsg8HJizU0UhWZNDMYppsf1vXtIZ1t2JsGhPbgmXAi5xWMtm2J7vtIBK5zczEO1+8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080182; c=relaxed/simple; bh=+Bhx16vHvyLqIDwMe2+t4y00aSSeZ3KvvXVZUYGhjKs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WWeV70eLBcbeUj6ixUNh2wINWB926lEjRJL4Ognr56gkn03WfSi5PbRdSNnFS8H310KHXmgyFDaazL17AS1RNsJOyhmwXlHVN3TPNsc1tUS5bNElJ1eOdbp+gHGeuiqg5IXvBXUI3osADZCdcwVATgu2NIe52y2a+xym1ANmpt8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t15vlNz4f3l6y; Fri, 17 Jan 2025 09:57:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 473621A0E3E; Fri, 17 Jan 2025 09:57:34 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP2 (Coremail) with SMTP id Syh0CgCnsWT7uIln8NWrBA--.20802S5; Fri, 17 Jan 2025 09:57:33 +0800 (CST) From: Chen Ridong <chenridong@huaweicloud.com> 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 v3 next 3/5] memcg: factor out the replace_stock_objcg function Date: Fri, 17 Jan 2025 01:46:43 +0000 Message-Id: <20250117014645.1673127-4-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250117014645.1673127-1-chenridong@huaweicloud.com> References: <20250117014645.1673127-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnsWT7uIln8NWrBA--.20802S5 X-Coremail-Antispam: 1UD129KBjvJXoW7tryDAw47ur15CF4UuF1xZrb_yoW5Jr17pF srKas8Jr48AFW2gan8Ga17Zr1fXF4vqFnFkr4Iqw1xCFnIgF1Yq342yFyjya4kJr9xtF4x Jr4qyFsrGayUJ37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUP2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI 0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr 0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUbd- BtUUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong <chenridong@huawei.com> Factor out the 'replace_stock_objcg' function to make the code more cohesive. Signed-off-by: Chen Ridong <chenridong@huawei.com> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> Acked-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Johannes Weiner <hannes@cmpxchg.org> --- mm/memcontrol.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 98f84a9fa228..b10e0a8f3375 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2691,6 +2691,20 @@ void __memcg_kmem_uncharge_page(struct page *page, i= nt order) obj_cgroup_put(objcg); } =20 +/* Replace the stock objcg with objcg, return the old objcg */ +static struct obj_cgroup *replace_stock_objcg(struct memcg_stock_pcp *stoc= k, + struct obj_cgroup *objcg) +{ + struct obj_cgroup *old =3D NULL; + + old =3D drain_obj_stock(stock); + obj_cgroup_get(objcg); + stock->nr_bytes =3D atomic_read(&objcg->nr_charged_bytes) + ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; + WRITE_ONCE(stock->cached_objcg, objcg); + return old; +} + static void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *= pgdat, enum node_stat_item idx, int nr) { @@ -2708,11 +2722,7 @@ static void mod_objcg_state(struct obj_cgroup *objcg= , struct pglist_data *pgdat, * changes. */ if (READ_ONCE(stock->cached_objcg) !=3D objcg) { - old =3D drain_obj_stock(stock); - obj_cgroup_get(objcg); - stock->nr_bytes =3D atomic_read(&objcg->nr_charged_bytes) - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; - WRITE_ONCE(stock->cached_objcg, objcg); + old =3D replace_stock_objcg(stock, objcg); stock->cached_pgdat =3D pgdat; } else if (stock->cached_pgdat !=3D pgdat) { /* Flush the existing cached vmstat data */ @@ -2866,11 +2876,7 @@ static void refill_obj_stock(struct obj_cgroup *objc= g, unsigned int nr_bytes, =20 stock =3D this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) !=3D objcg) { /* reset if necessary */ - old =3D drain_obj_stock(stock); - obj_cgroup_get(objcg); - WRITE_ONCE(stock->cached_objcg, objcg); - stock->nr_bytes =3D atomic_read(&objcg->nr_charged_bytes) - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; + old =3D replace_stock_objcg(stock, objcg); allow_uncharge =3D true; /* Allow uncharge when objcg changes */ } stock->nr_bytes +=3D nr_bytes; --=20 2.34.1 From nobody Wed Feb 19 02:17:59 2025 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4AEE1DED6D; Fri, 17 Jan 2025 02:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080183; cv=none; b=GFN8LsIZFmAbWWLZU67jAatB7288QpmZUFoT2EwCESdjyE8CR8QoeJtqo440rkeYsSS01rVWSJn7o7GFtpwmFXPrYenfQ/vGlib9NDamechwjc8BVpXndDou6ah1xa77nYHN+RhthajLej/SN0E/CeHgRfvDdPVXBIEi39VbYVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080183; c=relaxed/simple; bh=uYFeOQXjO62U2XhsRsH7z3Oi0OppiBwQPhPzSOnj+NI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rxPItICuk4zZ8CRGM7uaZnRqsRxXG1N42E9zZQMl3qc5eS55AsHQqrE2JEmmeriqtdx5arOr51WB14cELs6yaXHsQvYbxlTClAoi2c+/ZwoYWNe9dM53X3Bvn1g0svwGecrww8X8Or2NtOkzlKkh699UXQZMTP8dn+H7GsMCF8g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t16sRBz4f3l72; Fri, 17 Jan 2025 09:57:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 677CA1A0F72; Fri, 17 Jan 2025 09:57:34 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP2 (Coremail) with SMTP id Syh0CgCnsWT7uIln8NWrBA--.20802S6; Fri, 17 Jan 2025 09:57:34 +0800 (CST) From: Chen Ridong <chenridong@huaweicloud.com> 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 v3 next 4/5] memcg: factor out stat(event)/stat_local(event_local) reading functions Date: Fri, 17 Jan 2025 01:46:44 +0000 Message-Id: <20250117014645.1673127-5-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250117014645.1673127-1-chenridong@huaweicloud.com> References: <20250117014645.1673127-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnsWT7uIln8NWrBA--.20802S6 X-Coremail-Antispam: 1UD129KBjvJXoWxKw4Dtw4kKrWDAw4fZFW3trb_yoWxtFy7pF sxtayY93y3J3yFgr13KFWUZ34rAw1xX3y5JrWxJ3yfZasxt3W5W3ZxKFW7ZrW5Cr95XF13 Jayqyr1DJ3y2qa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2 AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7I UbXAw7UUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong <chenridong@huawei.com> The only difference between 'lruvec_page_state' and 'lruvec_page_state_local' is that they read 'state' and 'state_local', respectively. Factor out an inner functions to make the code more concise. Do the same for reading 'memcg_page_stat' and 'memcg_events'. Signed-off-by: Chen Ridong <chenridong@huawei.com> --- include/linux/memcontrol.h | 31 +++++++++++++++--- mm/memcontrol-v1.h | 14 ++++++-- mm/memcontrol.c | 67 +++++++------------------------------- 3 files changed, 49 insertions(+), 63 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6e74b8254d9b..ec469c5f7491 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -936,10 +936,33 @@ static inline void mod_memcg_page_state(struct page *= page, rcu_read_unlock(); } =20 -unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx); -unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item= idx); -unsigned long lruvec_page_state_local(struct lruvec *lruvec, - enum node_stat_item idx); +unsigned long __memcg_page_state(struct mem_cgroup *memcg, int idx, bool l= ocal); + +/* idx can be of type enum memcg_stat_item or node_stat_item. */ +static inline unsigned long memcg_page_state_local(struct mem_cgroup *memc= g, int idx) +{ + return __memcg_page_state(memcg, idx, true); +} + +static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int= idx) +{ + return __memcg_page_state(memcg, idx, false); +} + +unsigned long __lruvec_page_state(struct lruvec *lruvec, + enum node_stat_item idx, bool local); + +static inline unsigned long lruvec_page_state(struct lruvec *lruvec, + enum node_stat_item idx) +{ + return __lruvec_page_state(lruvec, idx, false); +} + +static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, + enum node_stat_item idx) +{ + return __lruvec_page_state(lruvec, idx, true); +} =20 void mem_cgroup_flush_stats(struct mem_cgroup *memcg); void mem_cgroup_flush_stats_ratelimited(struct mem_cgroup *memcg); diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 144d71b65907..f68c0064d674 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -59,9 +59,17 @@ unsigned long mem_cgroup_usage(struct mem_cgroup *memcg,= bool swap); =20 void drain_all_stock(struct mem_cgroup *root_memcg); =20 -unsigned long memcg_events(struct mem_cgroup *memcg, int event); -unsigned long memcg_events_local(struct mem_cgroup *memcg, int event); -unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx); +unsigned long __memcg_events(struct mem_cgroup *memcg, int event, bool loc= al); +static inline unsigned long memcg_events(struct mem_cgroup *memcg, int eve= nt) +{ + return __memcg_events(memcg, event, false); +} + +static inline unsigned long memcg_events_local(struct mem_cgroup *memcg, i= nt event) +{ + return __memcg_events(memcg, event, true); +} + unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item); unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int = item); int memory_stat_show(struct seq_file *m, void *v); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b10e0a8f3375..404bbdfa352f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -375,7 +375,8 @@ struct lruvec_stats { long state_pending[NR_MEMCG_NODE_STAT_ITEMS]; }; =20 -unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item= idx) +unsigned long __lruvec_page_state(struct lruvec *lruvec, + enum node_stat_item idx, bool local) { struct mem_cgroup_per_node *pn; long x; @@ -389,30 +390,8 @@ unsigned long lruvec_page_state(struct lruvec *lruvec,= enum node_stat_item idx) return 0; =20 pn =3D container_of(lruvec, struct mem_cgroup_per_node, lruvec); - x =3D READ_ONCE(pn->lruvec_stats->state[i]); -#ifdef CONFIG_SMP - if (x < 0) - x =3D 0; -#endif - return x; -} - -unsigned long lruvec_page_state_local(struct lruvec *lruvec, - enum node_stat_item idx) -{ - struct mem_cgroup_per_node *pn; - long x; - int i; - - if (mem_cgroup_disabled()) - return node_page_state(lruvec_pgdat(lruvec), idx); - - i =3D memcg_stats_index(idx); - if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, id= x)) - return 0; - - pn =3D container_of(lruvec, struct mem_cgroup_per_node, lruvec); - x =3D READ_ONCE(pn->lruvec_stats->state_local[i]); + x =3D local ? READ_ONCE(pn->lruvec_stats->state_local[i]) : + READ_ONCE(pn->lruvec_stats->state[i]); #ifdef CONFIG_SMP if (x < 0) x =3D 0; @@ -651,7 +630,7 @@ static void flush_memcg_stats_dwork(struct work_struct = *w) queue_delayed_work(system_unbound_wq, &stats_flush_dwork, FLUSH_TIME); } =20 -unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) +unsigned long __memcg_page_state(struct mem_cgroup *memcg, int idx, bool l= ocal) { long x; int i =3D memcg_stats_index(idx); @@ -659,7 +638,9 @@ unsigned long memcg_page_state(struct mem_cgroup *memcg= , int idx) if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, id= x)) return 0; =20 - x =3D READ_ONCE(memcg->vmstats->state[i]); + x =3D local ? READ_ONCE(memcg->vmstats->state_local[i]) : + READ_ONCE(memcg->vmstats->state[i]); + #ifdef CONFIG_SMP if (x < 0) x =3D 0; @@ -706,23 +687,6 @@ void __mod_memcg_state(struct mem_cgroup *memcg, enum = memcg_stat_item idx, trace_mod_memcg_state(memcg, idx, val); } =20 -/* idx can be of type enum memcg_stat_item or node_stat_item. */ -unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx) -{ - long x; - int i =3D memcg_stats_index(idx); - - if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, id= x)) - return 0; - - x =3D READ_ONCE(memcg->vmstats->state_local[i]); -#ifdef CONFIG_SMP - if (x < 0) - x =3D 0; -#endif - return x; -} - static void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, int val) @@ -859,24 +823,15 @@ void __count_memcg_events(struct mem_cgroup *memcg, e= num vm_event_item idx, memcg_stats_unlock(); } =20 -unsigned long memcg_events(struct mem_cgroup *memcg, int event) -{ - int i =3D memcg_events_index(event); - - if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, ev= ent)) - return 0; - - return READ_ONCE(memcg->vmstats->events[i]); -} - -unsigned long memcg_events_local(struct mem_cgroup *memcg, int event) +unsigned long __memcg_events(struct mem_cgroup *memcg, int event, bool loc= al) { int i =3D memcg_events_index(event); =20 if (WARN_ONCE(BAD_STAT_IDX(i), "%s: missing stat item %d\n", __func__, ev= ent)) return 0; =20 - return READ_ONCE(memcg->vmstats->events_local[i]); + return local ? READ_ONCE(memcg->vmstats->events_local[i]) : + READ_ONCE(memcg->vmstats->events[i]); } =20 struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p) --=20 2.34.1 From nobody Wed Feb 19 02:17:59 2025 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E13371F5603; Fri, 17 Jan 2025 02:14:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080099; cv=none; b=XVa2ZWETANwBEgX4WWUuJZfMC7IyejyVPjQz8x047Q4x4hci2V5o7tsy45XcOHquuH4NMU2/WUxx6g+FPihws2KAohN59FpGDdzZtant8AhuyFpzKqP59NfJRa38yVSfCAMQDEmbWZMOYlw6VM0MjnINjw+ClIIGG+BfYa7G3y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737080099; c=relaxed/simple; bh=l1kCOwteYrIcyq+dm+I29IOPNOtGzICZ2j2iAum8Nno=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C5Q0qaARqZYkFY9B50A9UYE5/pjKXrW++hxUwKqIEJO6w5tHg9olftwXa0jbQbYWordWui2gp7iaCMOueyErj2rMh+9HdDL/1oBMtWsiBeoL5sCrbGVt2CHhkD1AzL7mOqPAi4wBbpTj0xsiYvMVpGMsgxoSCRu6OfNrDELDBc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t05VKwz4f3lDc; Fri, 17 Jan 2025 09:57:12 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 6F8E51A178E; Fri, 17 Jan 2025 09:57:34 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP2 (Coremail) with SMTP id Syh0CgCnsWT7uIln8NWrBA--.20802S7; Fri, 17 Jan 2025 09:57:34 +0800 (CST) From: Chen Ridong <chenridong@huaweicloud.com> 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 v3 next 5/5] memcg: move the 'local' functions to memcontrol-v1.c Date: Fri, 17 Jan 2025 01:46:45 +0000 Message-Id: <20250117014645.1673127-6-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250117014645.1673127-1-chenridong@huaweicloud.com> References: <20250117014645.1673127-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnsWT7uIln8NWrBA--.20802S7 X-Coremail-Antispam: 1UD129KBjvJXoWxWr4Dur4rJr4UCryUtFyUGFg_yoWrGryUpF n3Ga13Kw47Jw45WF1akFyUu3s3Zw1fXrW5t3yxt34xZa43twn0gasIgrZ8ZrW5GrWFqFsx J3yYyr1kJ3yUtaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2 AFwI0_Jw0_GFyl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7I UbXAw7UUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong <chenridong@huawei.com> Move the 'local' functions, which are only used in memcg v1, to the memcontrol-v1.c. Signed-off-by: Chen Ridong <chenridong@huawei.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> --- include/linux/memcontrol.h | 6 ------ mm/memcontrol-v1.c | 17 +++++++++++++++++ mm/memcontrol-v1.h | 7 +------ mm/memcontrol.c | 8 +------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ec469c5f7491..6895b2958835 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -938,12 +938,6 @@ static inline void mod_memcg_page_state(struct page *p= age, =20 unsigned long __memcg_page_state(struct mem_cgroup *memcg, int idx, bool l= ocal); =20 -/* idx can be of type enum memcg_stat_item or node_stat_item. */ -static inline unsigned long memcg_page_state_local(struct mem_cgroup *memc= g, int idx) -{ - return __memcg_page_state(memcg, idx, true); -} - static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int= idx) { return __memcg_page_state(memcg, idx, false); diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 2be6b9112808..2e8529b63366 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -106,6 +106,23 @@ static struct lockdep_map memcg_oom_lock_dep_map =3D { =20 DEFINE_SPINLOCK(memcg_oom_lock); =20 +static unsigned long memcg_events_local(struct mem_cgroup *memcg, int even= t) +{ + return __memcg_events(memcg, event, true); +} + +/* idx can be of type enum memcg_stat_item or node_stat_item. */ +static unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int = idx) +{ + return __memcg_page_state(memcg, idx, true); +} + +static unsigned long memcg_page_state_local_output(struct mem_cgroup *memc= g, int item) +{ + return memcg_page_state_local(memcg, item) * + memcg_page_state_output_unit(item); +} + static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, struct mem_cgroup_tree_per_node *mctz, unsigned long new_usage_in_excess) diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index f68c0064d674..d76e9a47adaa 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -65,13 +65,8 @@ static inline unsigned long memcg_events(struct mem_cgro= up *memcg, int event) return __memcg_events(memcg, event, false); } =20 -static inline unsigned long memcg_events_local(struct mem_cgroup *memcg, i= nt event) -{ - return __memcg_events(memcg, event, true); -} - +int memcg_page_state_output_unit(int item); unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item); -unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int = item); int memory_stat_show(struct seq_file *m, void *v); =20 /* Cgroup v1-specific declarations */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 404bbdfa352f..3f32d4ab55b3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1367,7 +1367,7 @@ static int memcg_page_state_unit(int item) } =20 /* Translate stat items to the correct unit for memory.stat output */ -static int memcg_page_state_output_unit(int item) +int memcg_page_state_output_unit(int item) { /* * Workingset state is actually in pages, but we export it to userspace @@ -1402,12 +1402,6 @@ unsigned long memcg_page_state_output(struct mem_cgr= oup *memcg, int item) memcg_page_state_output_unit(item); } =20 -unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int = item) -{ - return memcg_page_state_local(memcg, item) * - memcg_page_state_output_unit(item); -} - #ifdef CONFIG_HUGETLB_PAGE static bool memcg_accounts_hugetlb(void) { --=20 2.34.1