From patchwork Fri May 24 01:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13672597 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 33D45C25B75 for ; Fri, 24 May 2024 01:26:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B13F6B008C; Thu, 23 May 2024 21:26:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 960B26B0092; Thu, 23 May 2024 21:26:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 828896B0093; Thu, 23 May 2024 21:26:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 633C96B008C for ; Thu, 23 May 2024 21:26:03 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DE076A0766 for ; Fri, 24 May 2024 01:26:02 +0000 (UTC) X-FDA: 82151548164.18.5B12422 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf13.hostedemail.com (Postfix) with ESMTP id BFA0120009 for ; Fri, 24 May 2024 01:25:59 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716513960; a=rsa-sha256; cv=none; b=ZUtTpvYjBPzCBeNDtPN1UGCc18oai960rk3dLS9dA6NewQEdXkV0cPjb2HI3gJvjuNkc+U EtYlyMzVgFlU6wfbrL0nBUtsjzkDcod7eyzCQKINAIgCx0vvHWDTURNP+H4QgwGVXmGg6Y c1U0rWMpNmOcjTFea+pH2MTkS3RjSYs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716513960; 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: references; bh=u0k46m21AhFkQ2xkQiAR1KPr6Bel27SvGsbCyxqW68I=; b=ELtBhqePnTj709rMFUqdWpTcs6oUQieoDUFFQceLfvRCiiN5qdvEpyj63GjCARUm+nlI/7 gErPlr9a9LYJQUGc8S1gSpk3I8mhOKki2/Avwf8A0ZCM6E6490obCAl3VRJSsFOjBWoMQZ pS9fP1JiovEUbyfUm7hEmDb1rpyuP6k= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VlnLr5dNrzjZGp; Fri, 24 May 2024 09:21:40 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 34AFA140109; Fri, 24 May 2024 09:25:55 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Fri, 24 May 2024 09:25:54 +0800 From: Kefeng Wang To: Andrew Morton CC: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , , , Matthew Wilcox , Kefeng Wang , Michal Hocko Subject: [PATCH v2] mm: memcontrol: remove page_memcg() Date: Fri, 24 May 2024 09:49:50 +0800 Message-ID: <20240524014950.187805-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: BFA0120009 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: p7uqof5gdzabxmmg3d5uww1w6cs8ny4a X-HE-Tag: 1716513959-528886 X-HE-Meta: U2FsdGVkX1+AoDGi7E3gyNxdEURVvWH8k12aRuetfnocpaDJ+F+tzt5H/mBcFGq8PfmJpVELRjzR/7BCtFcguoJftpq+HOeI8OVEDiGskbjSCZ6q9BVgPHP9hMszNPurKxpwCfBhaVjgVCsK/28IFEKR+rEkaNbR3CNbDkfP6zWoisnCkXJwuYbMHmVqbASeJvVOWzCCJBYUWlt7k2tUFy4LWI+oKyhhi4V2wvheVIKKnk6hpwepimuBw9z/8W4YR8zY5faSYcgHGNTkMyO1pMCMFJwBvdNomIVHVm/Fom2zP92yWIXD3A2vC7I6nNwUFrHk/NGRc9fK8jHP5oDelPFcZ+/+PMkqUsQSPKuhNYr7JMbCc/iykWerZlcA2E/klikOoG9jm1RE9//00kOCiL09r71uQSf/gNEZctik+GF7TauLvXKBHhrJHBFiOxo0nrXRVGCMG9BPlocMUdK07/Ru67d+CnQKf9e1wwq/DBBQrdZsyoZVl2Dop7HSGCFnjDclsAnzWErcjpx8af+xKmuWk5tCMDoE6bccITIXyrETa0Z5NpWVLJBQ1qFCSITaxCi634yNs6q51aS0moMnaVkGzD6yfctmWYgvluyuJA2oHsLOL+g6jNjcLXhs8jpWYkxwAO59RPpFaei1tcO1Mo+PjweOvAHlzVdQ8wSF2879rzoQUaLh0cZjnG0C27dQ2Str1CiBdWWsZLbnmPepxguHKA8/7AhYPYejDPrGKLXBjZ9mQFbK2Zm35yP5bHC1MfK0pPuROf32ftfi8WE+r4yX0VxfuqH8phTl8dF/8tyIPZEtlhhajBfGbEv4AZcXmb6M/HRWv4lmy1TqQJF4T5ZbO/Ko5DvYJsDcDq0TrygDHkTDOnGAnH8rnxoURgsrGRS+ipGbRj58d7TdtlQGIpHbPvwtVSwbPZf3tUU9593jT70sNXccFK3CQxP35Wxz9YejeRs4m9eH12xWBeu Te3lv/jf GRArV3ziLj9BbnCvsMW5lJ4gWx0KRBsqCkMl0ccvt/gdyvsIaFy+co7RGS9rYIfiBAvRS7ChD8zGu9+H4rzGLTthPNODdo2y3r3Xsz2OssqXUVQZ6W+yvXLdpkGlTGJNxiui1sFlACdG90DKSMHHrYnzCNpqsz/lUHKQFIHpdnDNrAGByGxTFiZggDlVFozSebPBM07I/2qmj1P1mDzWWh0mBpT/tNAmitckD+3jO0iAQypHQv2SpxFMdLjlHwM2zg7QB 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: The page_memcg() only called by mod_memcg_page_state(), so squash it to cleanup page_memcg(). Acked-by: Michal Hocko Signed-off-by: Kefeng Wang --- v2: - add ack - update comment from page->memcg to folio->memcg, per Matthew. include/linux/memcontrol.h | 14 ++------------ mm/memcontrol.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 030d34e9d117..3d1599146afe 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -443,11 +443,6 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) return __folio_memcg(folio); } -static inline struct mem_cgroup *page_memcg(struct page *page) -{ - return folio_memcg(page_folio(page)); -} - /** * folio_memcg_rcu - Locklessly get the memory cgroup associated with a folio. * @folio: Pointer to the folio. @@ -1014,7 +1009,7 @@ static inline void mod_memcg_page_state(struct page *page, return; rcu_read_lock(); - memcg = page_memcg(page); + memcg = folio_memcg(page_folio(page)); if (memcg) mod_memcg_state(memcg, idx, val); rcu_read_unlock(); @@ -1133,11 +1128,6 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) return NULL; } -static inline struct mem_cgroup *page_memcg(struct page *page) -{ - return NULL; -} - static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio) { WARN_ON_ONCE(!rcu_read_lock_held()); @@ -1636,7 +1626,7 @@ static inline void unlock_page_lruvec_irqrestore(struct lruvec *lruvec, spin_unlock_irqrestore(&lruvec->lru_lock, flags); } -/* Test requires a stable page->memcg binding, see page_memcg() */ +/* Test requires a stable folio->memcg binding, see folio_memcg() */ static inline bool folio_matches_lruvec(struct folio *folio, struct lruvec *lruvec) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7268d734e7e0..0ce76e833114 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3811,7 +3811,7 @@ void __memcg_slab_free_hook(struct kmem_cache *s, struct slab *slab, #endif /* CONFIG_MEMCG_KMEM */ /* - * Because page_memcg(head) is not set on tails, set it now. + * Because folio_memcg(head) is not set on tails, set it now. */ void split_page_memcg(struct page *head, int old_order, int new_order) {