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=unavailable 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 EDC7AC433B4 for ; Sat, 17 Apr 2021 04:38:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 76822611AB for ; Sat, 17 Apr 2021 04:38:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76822611AB 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 155FF6B0071; Sat, 17 Apr 2021 00:38:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 12D486B0072; Sat, 17 Apr 2021 00:38:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F10AB8D0002; Sat, 17 Apr 2021 00:38:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0139.hostedemail.com [216.40.44.139]) by kanga.kvack.org (Postfix) with ESMTP id D6D926B0071 for ; Sat, 17 Apr 2021 00:38:15 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9485F18015CAC for ; Sat, 17 Apr 2021 04:38:15 +0000 (UTC) X-FDA: 78040602150.26.F217B0F Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf08.hostedemail.com (Postfix) with ESMTP id 7FC9880192C0 for ; Sat, 17 Apr 2021 04:37:59 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id e8-20020a17090a7288b029014e51f5a6baso10460264pjg.2 for ; Fri, 16 Apr 2021 21:38:15 -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=CUAxTMYGPKcXUKklEvyCvysOG+ZnpjCi0FGjCzotqSU=; b=rZV3Lx/DG+nk2yOJopVmLtWk63dUiCzC/kXZfxaop1AJ0FAZfmyf2w4SM/saLYzAK8 4Rj59/gtH6GGeuQl+ONJaMCilputqDh0R8QOjVdpKnHnxcsOJ7jS5D8uVqHnJfT2XbxK JqzKeKWfqOSMFt6ZQPnPw3RD+SQ4cYiF7thutI51Ck8Vso9AaDvxszCXA8GROWHHn92j IagTTI3d6dZsxbDqusXTDbBIOS5eCGGudc+aw1mS2SYKwLc/T3wp8Ntto3X/StjH6ZE6 JGw1vidb5iDt484PLTbmBeout5mXkw9GnEITsLtKRkltPYpq0MxEAK9U88jF/pwN7L2U a18w== 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=CUAxTMYGPKcXUKklEvyCvysOG+ZnpjCi0FGjCzotqSU=; b=kG6M7evy77aBxYfEyGF3XlRJ+M23RSCQBuxNCW1ANaEUvThEmtkQDC1l2JGD6nHEb/ 43fYOVkCmaN6dOr23TzO4pqdmbwvH/UU6KxLOj0RXIeaFhuomrDBBFeSbDON/NPyb8yM 82iRrN/rDLK0Y6wLx+/J/k3XD6yK2Epxn+Uk4x8v1n8UV8WX3wKQ+0ZS6HgBk2KtB0yn oiFCBrGCMD0ASg1XxIicz0HLPiH2DGSsHOCN1BGoVRLEZiHEu46GGVzHMxFw7bcGbVFv vDlLv/Vk1Fpsv//koYyS03JPR0Li8QXQK2ykg9PAGG/hpKbkgcL0A/swaLD49CHiVHa6 iTKA== X-Gm-Message-State: AOAM530ucu0el+6J6HfiAfyP9zHPk4l3zYeiaA7TXUS9cojbBkk9RQZb G5ZGjxBEwyIzk6RnA+eRq5TceQ== X-Google-Smtp-Source: ABdhPJx1urRpgkyMn0GN9kMp05vLR8ipUAEHnpuOQwNghNNxGjpdwtQ1A8eZT+trOPcx+kGUbKD7Zg== X-Received: by 2002:a17:90a:6396:: with SMTP id f22mr13217394pjj.91.1618634294427; Fri, 16 Apr 2021 21:38:14 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.228]) by smtp.gmail.com with ESMTPSA id w21sm7064775pjy.21.2021.04.16.21.38.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 21:38:14 -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 , Michal Hocko Subject: [PATCH v3 3/8] mm: memcontrol: remove the pgdata parameter of mem_cgroup_page_lruvec Date: Sat, 17 Apr 2021 12:35:33 +0800 Message-Id: <20210417043538.9793-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210417043538.9793-1-songmuchun@bytedance.com> References: <20210417043538.9793-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 7FC9880192C0 X-Stat-Signature: 8hxy8upyqm4cknopesb17wkjm43j3dc3 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf08; identity=mailfrom; envelope-from=""; helo=mail-pj1-f43.google.com; client-ip=209.85.216.43 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618634279-119373 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: 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 Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Michal Hocko --- include/linux/memcontrol.h | 10 +++++----- mm/compaction.c | 2 +- mm/memcontrol.c | 9 +++------ mm/swap.c | 2 +- mm/workingset.c | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index c193be760709..f2a5aaba3577 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -743,13 +743,12 @@ static inline struct lruvec *mem_cgroup_lruvec(stru= ct mem_cgroup *memcg, /** * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU p= age * @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 =3D page_pgdat(page); struct mem_cgroup *memcg =3D page_memcg(page); =20 VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page); @@ -1221,9 +1220,10 @@ static inline struct lruvec *mem_cgroup_lruvec(str= uct mem_cgroup *memcg, return &pgdat->__lruvec; } =20 -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 =3D page_pgdat(page); + return &pgdat->__lruvec; } =20 diff --git a/mm/compaction.c b/mm/compaction.c index 8c5028bfbd56..1c500e697c88 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; =20 - lruvec =3D mem_cgroup_page_lruvec(page, pgdat); + lruvec =3D mem_cgroup_page_lruvec(page); =20 /* If we already hold the lock, we can skip some rechecking */ if (lruvec !=3D locked) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 50e3cf1e263e..caf193088beb 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1181,9 +1181,8 @@ void lruvec_memcg_debug(struct lruvec *lruvec, stru= ct page *page) struct lruvec *lock_page_lruvec(struct page *page) { struct lruvec *lruvec; - struct pglist_data *pgdat =3D page_pgdat(page); =20 - lruvec =3D mem_cgroup_page_lruvec(page, pgdat); + lruvec =3D mem_cgroup_page_lruvec(page); spin_lock(&lruvec->lru_lock); =20 lruvec_memcg_debug(lruvec, page); @@ -1194,9 +1193,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 =3D page_pgdat(page); =20 - lruvec =3D mem_cgroup_page_lruvec(page, pgdat); + lruvec =3D mem_cgroup_page_lruvec(page); spin_lock_irq(&lruvec->lru_lock); =20 lruvec_memcg_debug(lruvec, page); @@ -1207,9 +1205,8 @@ struct lruvec *lock_page_lruvec_irq(struct page *pa= ge) struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long= *flags) { struct lruvec *lruvec; - struct pglist_data *pgdat =3D page_pgdat(page); =20 - lruvec =3D mem_cgroup_page_lruvec(page, pgdat); + lruvec =3D mem_cgroup_page_lruvec(page); spin_lock_irqsave(&lruvec->lru_lock, *flags); =20 lruvec_memcg_debug(lruvec, page); diff --git a/mm/swap.c b/mm/swap.c index a75a8265302b..e0d5699213cc 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -313,7 +313,7 @@ void lru_note_cost(struct lruvec *lruvec, bool file, = unsigned int nr_pages) =20 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)); } =20 diff --git a/mm/workingset.c b/mm/workingset.c index b7cdeca5a76d..4f7a306ce75a 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -408,7 +408,7 @@ void workingset_activation(struct page *page) memcg =3D page_memcg_rcu(page); if (!mem_cgroup_disabled() && !memcg) goto out; - lruvec =3D mem_cgroup_page_lruvec(page, page_pgdat(page)); + lruvec =3D mem_cgroup_page_lruvec(page); workingset_age_nonresident(lruvec, thp_nr_pages(page)); out: rcu_read_unlock(); --=20 2.11.0