From nobody Thu Jan 30 23:27:02 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 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: List-Subscribe: List-Unsubscribe: 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 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 --- 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