From patchwork Tue Mar 30 10:15:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12172199 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.6 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 9B08EC433C1 for ; Tue, 30 Mar 2021 10:21:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1CDE7619AD for ; Tue, 30 Mar 2021 10:21:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CDE7619AD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A43536B0087; Tue, 30 Mar 2021 06:21:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F2556B0088; Tue, 30 Mar 2021 06:21:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 845856B0089; Tue, 30 Mar 2021 06:21:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0207.hostedemail.com [216.40.44.207]) by kanga.kvack.org (Postfix) with ESMTP id 6483B6B0087 for ; Tue, 30 Mar 2021 06:21:05 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 194AC34A3 for ; Tue, 30 Mar 2021 10:21:05 +0000 (UTC) X-FDA: 77976147690.24.FDC404E Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf30.hostedemail.com (Postfix) with ESMTP id C0ACBE0001AF for ; Tue, 30 Mar 2021 10:20:58 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id m11so11811651pfc.11 for ; Tue, 30 Mar 2021 03:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yzxvMRbUYa1GwcLB1wkQ6og1cTIvOHumZQ5rSMOWVXI=; b=f7HdTGTmy0fm4hATTZMFmFD5ccXmrfkBsfyEPWwsNzDwvP9dOHC7wIt0VOuiGmkyL7 ckh8rAjqdUQB3qRSLvRJ1heoVAZYQlQgODYXFQNolXRSv1E9rOL4Q++JpTfdg+hS1W7d q7wODDo/0n8AbE931c6XZGxJUtymxBoNEbcKtJcWhcxu6roEexQWF3+VLWT+9ZZ5b2/P 3GJV4+K47FjTLiNBp+WAeQc2B4b9M7yRpyASFVbmRlQH74bhcuU1utwnQtj+cPnOnZj9 IKcrc1489ws/5Fi429Q1oV4627gS0Kih1k+PblrGObqf+JExcItvOVseUVMlm55rLR6g IcwQ== 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=yzxvMRbUYa1GwcLB1wkQ6og1cTIvOHumZQ5rSMOWVXI=; b=Q/DFtby64C8HmAYrXU1nTLS/1sG6AxhuERCCKwFNxvcaXftNJCNN/m9rC7Vqi6FrVt PFNLRzyhUe495YW9hJh66yLLFonlbnh5ronnGct48+Eo7ugrfETUaLT9PqaY0fKLDWZJ +34qrej6xnj+t3QeQsueXkL7H3Gju3u9fPrU7pNLYvgGe6atTFAPcMorzx4xml6HqEiw bUN1Qn1H9dAiPK6/hHQ7YdT80JOKcdh3NiKLspqEgkRvNu84QL64atUelR1D8LGA58Ue IhvKF17oqd6Cm5qmShvRHV9vvZb8eiWUE9tIUXmBVKgR7yIjnIqQj5ii9Gy5+JfoSi2T 6C6Q== X-Gm-Message-State: AOAM532npHtAFoQUWTduUfy206l8bQp6OLncxZfiHmFDBChWepQprfWt 3A3ZZ+Smv3UVYVyIPcvkJKwatZrRHr30bOSeqms= X-Google-Smtp-Source: ABdhPJzxrphcnc3CBE3GFoJWSIJlIgixHfhNQtJGsS8OadTn0HoshWWR4jjjF0odWFA7PnllC5nneQ== X-Received: by 2002:a62:5e05:0:b029:20b:241e:4e18 with SMTP id s5-20020a625e050000b029020b241e4e18mr29529352pfb.1.1617099663738; Tue, 30 Mar 2021 03:21:03 -0700 (PDT) Received: from localhost.localdomain ([2408:8445:ad30:68d8:c87f:ca1b:dc00:4730]) by smtp.gmail.com with ESMTPSA id k10sm202259pfk.205.2021.03.30.03.20.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Mar 2021 03:21:03 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song Subject: [RFC PATCH 03/15] mm: memcontrol: remove the pgdata parameter of mem_cgroup_page_lruvec Date: Tue, 30 Mar 2021 18:15:19 +0800 Message-Id: <20210330101531.82752-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210330101531.82752-1-songmuchun@bytedance.com> References: <20210330101531.82752-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: 1hq3okj1uoojjd97t5edgt7jpzbbtrg5 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C0ACBE0001AF Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf30; identity=mailfrom; envelope-from=""; helo=mail-pf1-f181.google.com; client-ip=209.85.210.181 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617099658-475575 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: All the callers of mem_cgroup_page_lruvec() just pass page_pgdat(page) as the 2nd parameter to it (except isolate_migratepages_block()). But for isolate_migratepages_block(), the page_pgdat(page) is also equal to the local variable of @pgdat. So mem_cgroup_page_lruvec() do not need the pgdat parameter. Just remove it to simplify the code. Signed-off-by: Muchun Song Acked-by: Johannes Weiner --- include/linux/memcontrol.h | 10 +++++----- mm/compaction.c | 2 +- mm/memcontrol.c | 9 +++------ mm/page-writeback.c | 2 +- mm/swap.c | 2 +- mm/workingset.c | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7fdc92e1983e..a35a22994cf7 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -732,13 +732,12 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, /** * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page * @page: the page - * @pgdat: pgdat of the page * * This function relies on page->mem_cgroup being stable. */ -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, - struct pglist_data *pgdat) +static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page) { + pg_data_t *pgdat = page_pgdat(page); struct mem_cgroup *memcg = page_memcg(page); VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page); @@ -1232,9 +1231,10 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, return &pgdat->__lruvec; } -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, - struct pglist_data *pgdat) +static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page) { + pg_data_t *pgdat = page_pgdat(page); + return &pgdat->__lruvec; } diff --git a/mm/compaction.c b/mm/compaction.c index e04f4476e68e..8b8fc279766e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -994,7 +994,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (!TestClearPageLRU(page)) goto isolate_fail_put; - lruvec = mem_cgroup_page_lruvec(page, pgdat); + lruvec = mem_cgroup_page_lruvec(page); /* If we already hold the lock, we can skip some rechecking */ if (lruvec != locked) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 48e4c20bf115..405c9642aac0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1305,9 +1305,8 @@ void lruvec_memcg_debug(struct lruvec *lruvec, struct page *page) struct lruvec *lock_page_lruvec(struct page *page) { struct lruvec *lruvec; - struct pglist_data *pgdat = page_pgdat(page); - lruvec = mem_cgroup_page_lruvec(page, pgdat); + lruvec = mem_cgroup_page_lruvec(page); spin_lock(&lruvec->lru_lock); lruvec_memcg_debug(lruvec, page); @@ -1318,9 +1317,8 @@ struct lruvec *lock_page_lruvec(struct page *page) struct lruvec *lock_page_lruvec_irq(struct page *page) { struct lruvec *lruvec; - struct pglist_data *pgdat = page_pgdat(page); - lruvec = mem_cgroup_page_lruvec(page, pgdat); + lruvec = mem_cgroup_page_lruvec(page); spin_lock_irq(&lruvec->lru_lock); lruvec_memcg_debug(lruvec, page); @@ -1331,9 +1329,8 @@ struct lruvec *lock_page_lruvec_irq(struct page *page) struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags) { struct lruvec *lruvec; - struct pglist_data *pgdat = page_pgdat(page); - lruvec = mem_cgroup_page_lruvec(page, pgdat); + lruvec = mem_cgroup_page_lruvec(page); spin_lock_irqsave(&lruvec->lru_lock, *flags); lruvec_memcg_debug(lruvec, page); diff --git a/mm/page-writeback.c b/mm/page-writeback.c index eb34d204d4ee..f517e0669924 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2727,7 +2727,7 @@ int test_clear_page_writeback(struct page *page) int ret; memcg = lock_page_memcg(page); - lruvec = mem_cgroup_page_lruvec(page, page_pgdat(page)); + lruvec = mem_cgroup_page_lruvec(page); if (mapping && mapping_use_writeback_tags(mapping)) { struct inode *inode = mapping->host; struct backing_dev_info *bdi = inode_to_bdi(inode); diff --git a/mm/swap.c b/mm/swap.c index 31b844d4ed94..af695acb7413 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -300,7 +300,7 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) void lru_note_cost_page(struct page *page) { - lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)), + lru_note_cost(mem_cgroup_page_lruvec(page), page_is_file_lru(page), thp_nr_pages(page)); } diff --git a/mm/workingset.c b/mm/workingset.c index cd39902c1062..1ab5784c9e25 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -408,7 +408,7 @@ void workingset_activation(struct page *page) memcg = page_memcg_rcu(page); if (!mem_cgroup_disabled() && !memcg) goto out; - lruvec = mem_cgroup_page_lruvec(page, page_pgdat(page)); + lruvec = mem_cgroup_page_lruvec(page); workingset_age_nonresident(lruvec, thp_nr_pages(page)); out: rcu_read_unlock();