From patchwork Fri Jan 17 01:46:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Ridong X-Patchwork-Id: 13942788 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 1B232C02188 for ; Fri, 17 Jan 2025 01:57:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C9796B008C; Thu, 16 Jan 2025 20:57:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0AA1E6B0092; Thu, 16 Jan 2025 20:57:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF1286B0089; Thu, 16 Jan 2025 20:57:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B30566B008C for ; Thu, 16 Jan 2025 20:57:44 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C5A71464D1 for ; Fri, 17 Jan 2025 01:57:43 +0000 (UTC) X-FDA: 83015282406.24.EFF094D Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf20.hostedemail.com (Postfix) with ESMTP id 829551C0007 for ; Fri, 17 Jan 2025 01:57:39 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737079062; a=rsa-sha256; cv=none; b=55rgg4dyNVpl7uEcYcYb+5x5SnE5d9DXQZMNdQVzuz6NPEcJVL6DH6Ut9aP5CRkYuBAO+q bGL28K3MSTF3r0imKWQ5RfUbSVy9J70r8mDpZVoG8+nwYVqyXXxL1aSgMSRozAQy//OO3k /oL4HP7j5BytggT4PGJrRBtdgM3BQ7w= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737079062; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L6rEP3U/zDd80hEB74hZcIOTyTo/xR/mGDs42QRyIDo=; b=FeHjdCRJUce2ypKn4mGn2EDvLKeZ2v79OLt7ce2QohvtHBBlAphQK8oTaCkOWnogUfJ//4 dH3kMXvmcXwIqhBincOsxIwD0JQtfWL2IhNKgZcHX3qTaoqrTgp9+rfMNDtRUIsLV7vOAR WbLMwUX1L+SQv+bACvH49ZOQ+Fh5UwI= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4YZ2t14vsLz4f3l6r for ; 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 25E101A0E08 for ; 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 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> MIME-Version: 1.0 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/ X-Rspam-User: X-Rspamd-Queue-Id: 829551C0007 X-Rspamd-Server: rspam10 X-Stat-Signature: yqgoc1dxkgzutxpfbdbnxxrmahpzz4e1 X-HE-Tag: 1737079059-67278 X-HE-Meta: U2FsdGVkX19tzYJLvdTptW1PWxiv1ZPT8gE4HK4zM3gTEmb/UEFIDfgR9p6UTsRVR6KnyZeKLo9DaUiW8vElzB5ZSyXZ7AWweaqm2IqU0VJOB3CsfpfChhN05A5TfTSu92aQGmD0zkCQz7AnYQicImxi1AIccECCPmXGZ2WcsQKv/rTF9h5QByF5TpJbVZX6uZ3zZ1lErqfl30ylqHjkZOVFj0yhQZRNdYU5AFpV6A6HfsJ0T/wvPBph4a4sUEDaKlpwRWTcAHojmuX3C1GW7/EZcH4lKsOEGczjHOx9KyC8G/NtmlgjS3Nl671Fsm5Hr5jbIQTXwNYb4GfpvYixmjACLGYm2sFF2m2bO6KSF3Ok8zBZ/t0MUHfkJUtQuHmFvbs6MOQuMkfKQ3TcJogV0jWyKv5aksshIsgy4EnuX+rx85Yuco3bgs+BW82Y6FsUPcc5G2gyli9ORyJNkkY+aMvfc4UmSkevd/eRFqz+rMEjnobW0K5eHfRLqkJRJJwKzgFdrRZqfxat8nQtMzW9Ri8wrKDTy7RPeMkA8zCaGan6bcg70IPTX0WUGWXkmz/Cah1OqRhG5nHj5Hm9TQPbglsw08MW3aEk9eymIWi7MlHJNdNK1/sozdtEuZ1bwH3HmM+GxbzoY4FpdagfCLq917S+gbWd2aEp6nG/PnqrZhPz300EG9DBRrKWaXpD6uyiX36U2/nB0R1J2Cnjyq0VduxsVRdxLYcfz/bOmybiEag14TFAfRxfU4mwbLnClzV8HTtbCptDLaNwOlYtfue8V2EVYhwXphrigmNMIJkop+KeTk0LSthDvnW4FRfXYghnzhnIeL+x7ck1/zRhlFw3syogkXWuBDJckAMLhc3gwpGkFrNZNMfTufm6fBM6+NkDMy9fBsurXWvR/RP6U9XCtTeyEI7wEK6m4wvjAvEiFYLKdOsZ5O/qxMtE3gL88SbWq6dW3cqhmy2ZGQ4rOJl eAgqAkbz UhAhz4lvkD/3jma7crhNy25tVhZr0kw8AkKhM06fCI16O4BnJnnutEIO+n2Of2hE0kVA4WRnlZ9cj3ID1+36IMgfc4ZQzGRRFkBSecMjnTHEmDx0zatHlPk/aA8GI8L+iB9N7ic/APVOoUMDKlnH7LTO8op0Fz25oMc4LGoXyZwNvJcqQofqcmm5RLdIElhfHFdp2I9jvTPCEYyGFvHAtPhGp+g== 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 Factor out the 'replace_stock_objcg' function to make the code more cohesive. Signed-off-by: Chen Ridong Reviewed-by: Roman Gushchin Acked-by: Shakeel Butt Acked-by: Johannes Weiner --- 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, int order) obj_cgroup_put(objcg); } +/* Replace the stock objcg with objcg, return the old objcg */ +static struct obj_cgroup *replace_stock_objcg(struct memcg_stock_pcp *stock, + struct obj_cgroup *objcg) +{ + struct obj_cgroup *old = NULL; + + old = drain_obj_stock(stock); + obj_cgroup_get(objcg); + stock->nr_bytes = 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) != objcg) { - old = drain_obj_stock(stock); - obj_cgroup_get(objcg); - stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; - WRITE_ONCE(stock->cached_objcg, objcg); + old = replace_stock_objcg(stock, objcg); stock->cached_pgdat = pgdat; } else if (stock->cached_pgdat != pgdat) { /* Flush the existing cached vmstat data */ @@ -2866,11 +2876,7 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes, stock = this_cpu_ptr(&memcg_stock); if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */ - old = drain_obj_stock(stock); - obj_cgroup_get(objcg); - WRITE_ONCE(stock->cached_objcg, objcg); - stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes) - ? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0; + old = replace_stock_objcg(stock, objcg); allow_uncharge = true; /* Allow uncharge when objcg changes */ } stock->nr_bytes += nr_bytes;