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.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,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 555B4C07E96 for ; Thu, 15 Jul 2021 04:16:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ED4A561289 for ; Thu, 15 Jul 2021 04:16:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED4A561289 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4BBF08D002C; Thu, 15 Jul 2021 00:16:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46C186B0136; Thu, 15 Jul 2021 00:16:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3336E8D002C; Thu, 15 Jul 2021 00:16:35 -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 0BDBB6B0135 for ; Thu, 15 Jul 2021 00:16:35 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EB4FA180A2F70 for ; Thu, 15 Jul 2021 04:16:33 +0000 (UTC) X-FDA: 78363510666.33.7799DE3 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id AE6F2E00181B for ; Thu, 15 Jul 2021 04:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=uUR18RhmJaxye44Jc3cuyF0IusRkdQv8pQzStDPWSSc=; b=SsjzMEhsSUfNPMdPdVr1Rv00WL iblExqXCV2471LMCh3TsJF9Jvb9IyROFwL8b112MdO4Usn2MxF6ank0hRqvbejBBNiU8+U09OXzcV V61YzM7nbqlHIJS3QganRgrwohtxTcYS4PkvbYoyuOay3KW2jYF7dqW5J1eVxKKGYouBcpxQSVGtN p6dqBucHiHHWpHvdYh1JlZv49jDqw6hnzR3KZ+SjFG7esiW1e500Mh42F+hktx15bBxeY1/GlldC7 +kIRb1mhD0tbUE+3FJ7E3LgeDjmAcKlqqQGkZ97IIpn1YoZt/zB6p52fVBheKvAlY6VtlzZEWUSey vzEpOIsQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3slN-002wVE-TY; Thu, 15 Jul 2021 04:14:42 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig Subject: [PATCH v14 047/138] mm/memcg: Add folio_lruvec() Date: Thu, 15 Jul 2021 04:35:33 +0100 Message-Id: <20210715033704.692967-48-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AE6F2E00181B X-Stat-Signature: zy3hi5k616yoepipacs1uq7d3q419193 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SsjzMEhs; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1626322593-231386 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: This replaces mem_cgroup_page_lruvec(). All callers converted. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- include/linux/memcontrol.h | 20 +++++++++----------- mm/compaction.c | 2 +- mm/memcontrol.c | 9 ++++++--- mm/swap.c | 3 ++- mm/workingset.c | 3 ++- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 4b79dd6b3a9c..4eb329b5d183 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -751,18 +751,17 @@ static inline struct lruvec *mem_cgroup_lruvec(stru= ct mem_cgroup *memcg, } =20 /** - * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU p= age - * @page: the page + * folio_lruvec - return lruvec for isolating/putting an LRU folio + * @folio: Pointer to the folio. * - * This function relies on page->mem_cgroup being stable. + * This function relies on folio->mem_cgroup being stable. */ -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page) +static inline struct lruvec *folio_lruvec(struct folio *folio) { - pg_data_t *pgdat =3D page_pgdat(page); - struct mem_cgroup *memcg =3D page_memcg(page); + struct mem_cgroup *memcg =3D folio_memcg(folio); =20 - VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page); - return mem_cgroup_lruvec(memcg, pgdat); + VM_WARN_ON_ONCE_FOLIO(!memcg && !mem_cgroup_disabled(), folio); + return mem_cgroup_lruvec(memcg, folio_pgdat(folio)); } =20 struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); @@ -1226,10 +1225,9 @@ 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) +static inline struct lruvec *folio_lruvec(struct folio *folio) { - pg_data_t *pgdat =3D page_pgdat(page); - + struct pglist_data *pgdat =3D folio_pgdat(folio); return &pgdat->__lruvec; } =20 diff --git a/mm/compaction.c b/mm/compaction.c index 621508e0ecd5..a88f7b893f80 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1028,7 +1028,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); + lruvec =3D folio_lruvec(page_folio(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 96d6e6c0a65d..fd578d70b579 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1186,9 +1186,10 @@ void lruvec_memcg_debug(struct lruvec *lruvec, str= uct page *page) */ struct lruvec *lock_page_lruvec(struct page *page) { + struct folio *folio =3D page_folio(page); struct lruvec *lruvec; =20 - lruvec =3D mem_cgroup_page_lruvec(page); + lruvec =3D folio_lruvec(folio); spin_lock(&lruvec->lru_lock); =20 lruvec_memcg_debug(lruvec, page); @@ -1198,9 +1199,10 @@ struct lruvec *lock_page_lruvec(struct page *page) =20 struct lruvec *lock_page_lruvec_irq(struct page *page) { + struct folio *folio =3D page_folio(page); struct lruvec *lruvec; =20 - lruvec =3D mem_cgroup_page_lruvec(page); + lruvec =3D folio_lruvec(folio); spin_lock_irq(&lruvec->lru_lock); =20 lruvec_memcg_debug(lruvec, page); @@ -1210,9 +1212,10 @@ struct lruvec *lock_page_lruvec_irq(struct page *p= age) =20 struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long= *flags) { + struct folio *folio =3D page_folio(page); struct lruvec *lruvec; =20 - lruvec =3D mem_cgroup_page_lruvec(page); + lruvec =3D folio_lruvec(folio); spin_lock_irqsave(&lruvec->lru_lock, *flags); =20 lruvec_memcg_debug(lruvec, page); diff --git a/mm/swap.c b/mm/swap.c index 11ff40104a2c..4ba77fc8da4f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -315,7 +315,8 @@ 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), + struct folio *folio =3D page_folio(page); + lru_note_cost(folio_lruvec(folio), page_is_file_lru(page), thp_nr_pages(page)); } =20 diff --git a/mm/workingset.c b/mm/workingset.c index 5ba3e42446fa..e62c0f2084a2 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -396,6 +396,7 @@ void workingset_refault(struct page *page, void *shad= ow) */ void workingset_activation(struct page *page) { + struct folio *folio =3D page_folio(page); struct mem_cgroup *memcg; struct lruvec *lruvec; =20 @@ -410,7 +411,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); + lruvec =3D folio_lruvec(folio); workingset_age_nonresident(lruvec, thp_nr_pages(page)); out: rcu_read_unlock(); --=20 2.30.2