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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60801C433E9 for ; Tue, 2 Feb 2021 18:48:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EDBD264F4B for ; Tue, 2 Feb 2021 18:47:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDBD264F4B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8A86C6B0070; Tue, 2 Feb 2021 13:47:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F36E6B0071; Tue, 2 Feb 2021 13:47:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D0886B0072; Tue, 2 Feb 2021 13:47:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0031.hostedemail.com [216.40.44.31]) by kanga.kvack.org (Postfix) with ESMTP id 3A9DD6B0070 for ; Tue, 2 Feb 2021 13:47:58 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 02F6C181AEF1A for ; Tue, 2 Feb 2021 18:47:58 +0000 (UTC) X-FDA: 77774212236.14.mind39_340dd44275cd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id D8AF118229818 for ; Tue, 2 Feb 2021 18:47:57 +0000 (UTC) X-HE-Tag: mind39_340dd44275cd X-Filterd-Recvd-Size: 6279 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Tue, 2 Feb 2021 18:47:57 +0000 (UTC) Received: by mail-qk1-f181.google.com with SMTP id u20so20849281qku.7 for ; Tue, 02 Feb 2021 10:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mpanv+/+JrDOLKkhynshAPXe4Ve6rW0I2YibAc13/NE=; b=O6ja58PYqYoZvn6p3Ba4+2qoDJfPZb1STqRFQNHtToIEjSyj1BXxH6ycynJzuxomPV 9fl+x9JgJmfXvhv62NMyzN1ZD+/Buddm65nbmPOqK3iXg+jJ9NqA/wCMtFsY9aGRAVJi KTZk3QQsuUAQgka169LtM2V9I023EzNu1Kt4m8OB0Cw52000aJ3vTLT60nM1lA1DioZb ILdfgkvKbzGlqMLCcQWafrt71/KPfYqXBK0uxS0VzOmRtaPEq5CUAujti4DcSP8AABo1 p/I6pOucyVi/HFirs7ugdp8cwARsiQm+CcFgrfIHN5K2WXtPHEzwkxqpZMIPDGP+ZRxj Yjdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mpanv+/+JrDOLKkhynshAPXe4Ve6rW0I2YibAc13/NE=; b=W2Kw8783gWQ0qkLDSL+0MMYGKHomdMYOjVGzICzKKsviJtY+lym7Zzb+5wmMXYcsTL 9a9DAdNvJo9ynNco3w78e+1G2AEC+LbFbhBjYLDEaM8BvTG887cVBwx6LmTaggw426+8 hWElOnxuIxanTZVY3RiZuyQhh7LFSf98fqfRH08n2uucbk720o6TvwyBxKkbmP7M32Gx l2R/NXDyhu/AK93e7Em3EvBReVTo8ublXUQQKSYBC0ejn6cW5SSG286mLTH5XEdlOBOM fUBdXNySkEAZfeOe5usxKkdydgUWHcmX3bdXJ856q/DJ9SCAtB5Ff+R4CylTRa+DX8q0 B9cQ== X-Gm-Message-State: AOAM532NLd1/MtLCq7TaWV46EsDsSiyvkKuvymyj2BYxgeamWW1oir0u rvCxNusHqCymwpLDOdCTGIAKrw== X-Google-Smtp-Source: ABdhPJxK7OLtyLw44gKIZ9kPmlcX22umQXeXznlya2ca+opvuqTPoKzTzbj+MedVjmzxEJEkywMcRQ== X-Received: by 2002:a05:620a:12d7:: with SMTP id e23mr22344898qkl.58.1612291676855; Tue, 02 Feb 2021 10:47:56 -0800 (PST) Received: from localhost (70.44.39.90.res-cmts.bus.ptd.net. [70.44.39.90]) by smtp.gmail.com with ESMTPSA id e5sm17299659qtp.86.2021.02.02.10.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 10:47:56 -0800 (PST) From: Johannes Weiner To: Andrew Morton , Tejun Heo Cc: Michal Hocko , Roman Gushchin , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/7] mm: memcontrol: privatize memcg_page_state query functions Date: Tue, 2 Feb 2021 13:47:42 -0500 Message-Id: <20210202184746.119084-4-hannes@cmpxchg.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210202184746.119084-1-hannes@cmpxchg.org> References: <20210202184746.119084-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: There are no users outside of the memory controller itself. The rest of the kernel cares either about node or lruvec stats. Signed-off-by: Johannes Weiner --- include/linux/memcontrol.h | 44 -------------------------------------- mm/memcontrol.c | 32 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index c7f387a6233e..20ecdfae3289 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -867,39 +867,6 @@ struct mem_cgroup *lock_page_memcg(struct page *page= ); void __unlock_page_memcg(struct mem_cgroup *memcg); void unlock_page_memcg(struct page *page); =20 -/* - * idx can be of type enum memcg_stat_item or node_stat_item. - * Keep in sync with memcg_exact_page_state(). - */ -static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, i= nt idx) -{ - long x =3D atomic_long_read(&memcg->vmstats[idx]); -#ifdef CONFIG_SMP - if (x < 0) - x =3D 0; -#endif - return x; -} - -/* - * idx can be of type enum memcg_stat_item or node_stat_item. - * Keep in sync with memcg_exact_page_state(). - */ -static inline unsigned long memcg_page_state_local(struct mem_cgroup *me= mcg, - int idx) -{ - long x =3D 0; - int cpu; - - for_each_possible_cpu(cpu) - x +=3D per_cpu(memcg->vmstats_local->stat[idx], cpu); -#ifdef CONFIG_SMP - if (x < 0) - x =3D 0; -#endif - return x; -} - void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val); =20 /* idx can be of type enum memcg_stat_item or node_stat_item */ @@ -1337,17 +1304,6 @@ static inline void mem_cgroup_print_oom_group(stru= ct mem_cgroup *memcg) { } =20 -static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, i= nt idx) -{ - return 0; -} - -static inline unsigned long memcg_page_state_local(struct mem_cgroup *me= mcg, - int idx) -{ - return 0; -} - static inline void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int nr) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7e05a4ebf80f..2f97cb4cef6d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -789,6 +789,38 @@ void __mod_memcg_state(struct mem_cgroup *memcg, int= idx, int val) __this_cpu_write(memcg->vmstats_percpu->stat[idx], x); } =20 +/* + * idx can be of type enum memcg_stat_item or node_stat_item. + * Keep in sync with memcg_exact_page_state(). + */ +static unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx) +{ + long x =3D atomic_long_read(&memcg->vmstats[idx]); +#ifdef CONFIG_SMP + if (x < 0) + x =3D 0; +#endif + return x; +} + +/* + * idx can be of type enum memcg_stat_item or node_stat_item. + * Keep in sync with memcg_exact_page_state(). + */ +static unsigned long memcg_page_state_local(struct mem_cgroup *memcg, in= t idx) +{ + long x =3D 0; + int cpu; + + for_each_possible_cpu(cpu) + x +=3D per_cpu(memcg->vmstats_local->stat[idx], cpu); +#ifdef CONFIG_SMP + if (x < 0) + x =3D 0; +#endif + return x; +} + static struct mem_cgroup_per_node * parent_nodeinfo(struct mem_cgroup_per_node *pn, int nid) { --=20 2.30.0