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 0C5A9C02180 for ; Thu, 16 Jan 2025 01:21:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 907766B007B; Wed, 15 Jan 2025 20:21:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B7A26B0082; Wed, 15 Jan 2025 20:21:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 77F32280001; Wed, 15 Jan 2025 20:21:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 530DF6B007B for ; Wed, 15 Jan 2025 20:21:54 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D40C21A0590 for ; Thu, 16 Jan 2025 01:21:53 +0000 (UTC) X-FDA: 83011563306.07.49188A3 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf26.hostedemail.com (Postfix) with ESMTP id D2681140007 for ; Thu, 16 Jan 2025 01:21:48 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.51 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=1736990512; 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=tPmvr19+EV/+HinORqXc5pGHvhlWsce8bVlkHGZckm8=; b=i8rQH/YGoTUnakt3S3caNC4WL1TZ1kRttHRlvSy/o7b6f/dqCC4h/SsaX0EV+RThLNaoAz axQuUmsT4a0lOD5ZHFFgk+gVegzBDSykSU7tSUpsj/BYL7wGYKQJbSkSC+k1Qrw3GasM9t E2+nDnxSnAmMeXNQLMWNOzuRS6W7Sik= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736990512; a=rsa-sha256; cv=none; b=1pUlDkKlbUFWAzROjaJ4dj1nsPuxmT10HN34h+Wjeclgt5rGm/LO6k4X5i3oSLXw6VGs2a ujR4m4Rgkch2yh/6Gq3eYsIrwrHh2YW8lpS3SY7MvceNrzVaAG0zeXIX1JE0414vRRQDxm aZ1JnByCfsg6FMRGck3acoEJ6hwGDUU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.hostedemail.com: domain of chenridong@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=chenridong@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YYQ7C5HfDz4f3jqC for ; Thu, 16 Jan 2025 09:21:27 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id F2E461A0F2E for ; Thu, 16 Jan 2025 09:21:42 +0800 (CST) Received: from [10.67.109.79] (unknown [10.67.109.79]) by APP2 (Coremail) with SMTP id Syh0CgDX4WQlX4hn8ntLBA--.58672S2; Thu, 16 Jan 2025 09:21:42 +0800 (CST) Message-ID: Date: Thu, 16 Jan 2025 09:21:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH -v2 next 4/4] memcg: factor out stat(event)/stat_local(event_local) reading functions To: Shakeel Butt , Roman Gushchin Cc: akpm@linux-foundation.org, mhocko@kernel.org, hannes@cmpxchg.org, yosryahmed@google.com, muchun.song@linux.dev, davidf@vimeo.com, vbabka@suse.cz, mkoutny@suse.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, chenridong@huawei.com, wangweiyang2@huawei.com References: <20250114122519.1404275-1-chenridong@huaweicloud.com> <20250114122519.1404275-5-chenridong@huaweicloud.com> Content-Language: en-US From: Chen Ridong In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CM-TRANSID:Syh0CgDX4WQlX4hn8ntLBA--.58672S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4fXrWDGr45GF1fXF1rCrg_yoW8uw43pF ZrJayakayUXrySgr9IqF4DZryYyF1xtr4UXrZrtrySqFnFva43K345KFy8uFWUZrWkZF12 va4jyrnrXw4jvrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUv0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcVAKI48JM4IIrI8v6xkF7I0E8cxan2IY04v7MxkF7I0En4kS 14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I 8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8 ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_ Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU1 7KsUUUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ X-Rspamd-Queue-Id: D2681140007 X-Stat-Signature: xwjch99g9wm846n7nm53oanbxwgomcog X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1736990508-920067 X-HE-Meta: U2FsdGVkX1+qTBtg1Ow27RHEHTM0qOODmzpJN6R3K9vvLzvtD1o3F/leyUEwrex91ZPOdO3nCgn88ZJYxbblHR71KKgXQxaNsaBWJzcEE3Uq2aFbVJkA5iSCM4+7+l1BlIXLOnTWsPdwBxeKEIalr9fnZjYVB5tga0rjzRh5wJXmVH3HME9+6eMMSiedbdVCq+o1ZAgSd1F/C8Ce3c1LPY/StQXc3k7bHlz6WSrKW9B+Qbq7IUu3pRs+J4dd6tsZOKYZ6BOXkiQdUXfhuEtDpYiSbDOu5C3Shqu4FQ6jToROyfxM2nYMzhv7uE8KjkJm8hcHBcM8D5jTz2nJi8cScGcEoAjFp1YvQrGzFC0TQDbUXk25O9zoIPbH9GvVhXFsNPm2K96l9KSpMpm1stqqGEFs952o4D1Lx0csgNGvCYNQ3A0wwqm1PCVZFkQw9kO1OuEu1uanQdQwmKhVzt4EkjPj4ViL9Lzihsf7A1OeN37UNl5ZSZTui3rj3EozsZgtVIv6Yc0MgGGovP3DKlsAsP4mZwlJE7GTa8vaSfXioxC1pLmvMmpoQVFcmVT9PXihY15RdvNUXxKJuz/6kRGfhOYR06EW4mfHJnbpMNaeUE7SPtkMwI0hu7o0rLILFDkGgOnwLBOm1qcliI8zPlondovPiraRbsYCRLApTjwDamPqZeTqy4FOBBlkxk0ONu+RX6q8i5gTBCbTeo/Ne6krQE3K0NHCOVmh0yUFkHb3bRIT/opbGRdgmyyus+YdIib/C/B8hB4AEVf19BWe8tS2wdEbaMoBwm8DKrimuvjNYWrAVcTme67VTDAHLEyUB5HQ0gFNewk2YaEyF5glDJkOC4m3m+aQ7ixWP4CxpcKt69TftIkV8x61w1UJO7zJ79N6BQRwrxBaGxrSrieDFwNQquKScy7a/Dik1o9WIZNy1uwWV3V3jgB5EtLahU8fljc4AA8FOxi9wVngI3ZEcUK mH0PL8Jp H0MsybKndkThKEefqGk3BDMUZfkvwYmKoan/IlUIAUdDoYNbgdMn9TnMVwhjI0+dh91nrx9B5fyerDZZbsvBvAb+Bh8bjmc8VN98mbtyZTsoh+ZFrvlC5mqR6d1ZRBcPEHwoOSNCrQsDUA9YJKheO5i5W8tlb2wlTzdBxUP8sf2mTSVhXxdc5VMto+/vcMaerUUUDHERHQaX5CXYsDUTHw+tcjNR2gPjf//6lVoOXJH1TgrY= 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 2025/1/16 8:57, Shakeel Butt wrote: > On Tue, Jan 14, 2025 at 06:45:20PM +0000, Roman Gushchin wrote: >> On Tue, Jan 14, 2025 at 12:25:19PM +0000, Chen Ridong wrote: >>> 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 >>> --- >>> mm/memcontrol.c | 72 +++++++++++++++++++++---------------------------- >>> 1 file changed, 30 insertions(+), 42 deletions(-) >>> >>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >>> index b10e0a8f3375..14541610cad0 100644 >>> --- a/mm/memcontrol.c >>> +++ b/mm/memcontrol.c >>> @@ -375,7 +375,8 @@ struct lruvec_stats { >>> long state_pending[NR_MEMCG_NODE_STAT_ITEMS]; >>> }; >>> >>> -unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx) >>> +static unsigned long __lruvec_page_state(struct lruvec *lruvec, >>> + enum node_stat_item idx, bool local) >>> { >>> struct mem_cgroup_per_node *pn; >>> long x; >>> @@ -389,7 +390,8 @@ unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx) >>> return 0; >>> >>> pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); >>> - x = READ_ONCE(pn->lruvec_stats->state[i]); >>> + x = local ? READ_ONCE(pn->lruvec_stats->state_local[i]) : >>> + READ_ONCE(pn->lruvec_stats->state[i]); >>> #ifdef CONFIG_SMP >>> if (x < 0) >>> x = 0; >>> @@ -397,27 +399,16 @@ unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx) >>> return x; >>> } >>> >>> + >>> +unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx) >>> +{ >>> + return __lruvec_page_state(lruvec, idx, false); >>> +} >> >> I'd move these wrapper function definitions to memcontrol.h and make them >> static inline. > > +1 > Thank you. Will update. Best regards, Ridong >> >> Other than that, lgtm. >> >> Thank you!