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 CFC76C1B08C for ; Thu, 15 Jul 2021 04:14:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6373F6109E for ; Thu, 15 Jul 2021 04:14:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6373F6109E 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 B754A6B0117; Thu, 15 Jul 2021 00:14:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4C196B0118; Thu, 15 Jul 2021 00:14:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9ED4E6B0119; Thu, 15 Jul 2021 00:14:52 -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 7C6EC6B0117 for ; Thu, 15 Jul 2021 00:14:52 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 6C5118248047 for ; Thu, 15 Jul 2021 04:14:51 +0000 (UTC) X-FDA: 78363506382.28.CB817DE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id 2D3631917 for ; Thu, 15 Jul 2021 04:14:51 +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=5j2X8nBiTF1CrIxwWHedWUAM3oUKCMvVlZFvZear/v0=; b=nQgqCL3M6qTgq6k0o7ut2tLqLF hH+PfA6JrVnEIHHtnbjJr0HBTE1SHmMtQ8TTzgiIKT306JFp9jk0zgdodcDF25u2siajORCpPkFdi PE+lHbB2QMJY0vZlZyUDpIgeNaiBvAU5Ug7v1xOsV0XUzXwos7hLoHSaX+SEOXDjmhm9S8lBJ6cQO GpQxddk1pPGyz5dkdhbqoTyOjunx3tNMFkRiJiTu7MKO6kpCNsqCP5+gMzXQX0wwAqAIq4vSqvlff TSDOvei9UPx9rf9bJBO7bX0no7SclplfF+bMQCN2BPIv63eJ0sY7Kq4Lqusa5MZ+x10ysZT/3iQnR DzWfg68A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3skN-002wQz-S6; Thu, 15 Jul 2021 04:13:23 +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 046/138] mm/memcg: Convert mem_cgroup_move_account() to use a folio Date: Thu, 15 Jul 2021 04:35:32 +0100 Message-Id: <20210715033704.692967-47-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 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nQgqCL3M; spf=none (imf22.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-Rspamd-Server: rspam02 X-Stat-Signature: hcez7g7hwzb6haa78795zh1ai4g9fbxa X-Rspamd-Queue-Id: 2D3631917 X-HE-Tag: 1626322491-702616 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 saves dozens of bytes of text by eliminating a lot of calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- mm/memcontrol.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0dd40ea67a90..96d6e6c0a65d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5590,38 +5590,39 @@ static int mem_cgroup_move_account(struct page *p= age, struct mem_cgroup *from, struct mem_cgroup *to) { + struct folio *folio =3D page_folio(page); struct lruvec *from_vec, *to_vec; struct pglist_data *pgdat; - unsigned int nr_pages =3D compound ? thp_nr_pages(page) : 1; + unsigned int nr_pages =3D compound ? folio_nr_pages(folio) : 1; int nid, ret; =20 VM_BUG_ON(from =3D=3D to); - VM_BUG_ON_PAGE(PageLRU(page), page); - VM_BUG_ON(compound && !PageTransHuge(page)); + VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); + VM_BUG_ON(compound && !folio_multi(folio)); =20 /* * Prevent mem_cgroup_migrate() from looking at * page's memory cgroup of its source page while we change it. */ ret =3D -EBUSY; - if (!trylock_page(page)) + if (!folio_trylock(folio)) goto out; =20 ret =3D -EINVAL; - if (page_memcg(page) !=3D from) + if (folio_memcg(folio) !=3D from) goto out_unlock; =20 - pgdat =3D page_pgdat(page); + pgdat =3D folio_pgdat(folio); from_vec =3D mem_cgroup_lruvec(from, pgdat); to_vec =3D mem_cgroup_lruvec(to, pgdat); =20 - lock_page_memcg(page); + folio_memcg_lock(folio); =20 - if (PageAnon(page)) { - if (page_mapped(page)) { + if (folio_test_anon(folio)) { + if (folio_mapped(folio)) { __mod_lruvec_state(from_vec, NR_ANON_MAPPED, -nr_pages); __mod_lruvec_state(to_vec, NR_ANON_MAPPED, nr_pages); - if (PageTransHuge(page)) { + if (folio_test_transhuge(folio)) { __mod_lruvec_state(from_vec, NR_ANON_THPS, -nr_pages); __mod_lruvec_state(to_vec, NR_ANON_THPS, @@ -5632,18 +5633,18 @@ static int mem_cgroup_move_account(struct page *p= age, __mod_lruvec_state(from_vec, NR_FILE_PAGES, -nr_pages); __mod_lruvec_state(to_vec, NR_FILE_PAGES, nr_pages); =20 - if (PageSwapBacked(page)) { + if (folio_test_swapbacked(folio)) { __mod_lruvec_state(from_vec, NR_SHMEM, -nr_pages); __mod_lruvec_state(to_vec, NR_SHMEM, nr_pages); } =20 - if (page_mapped(page)) { + if (folio_mapped(folio)) { __mod_lruvec_state(from_vec, NR_FILE_MAPPED, -nr_pages); __mod_lruvec_state(to_vec, NR_FILE_MAPPED, nr_pages); } =20 - if (PageDirty(page)) { - struct address_space *mapping =3D page_mapping(page); + if (folio_test_dirty(folio)) { + struct address_space *mapping =3D folio_mapping(folio); =20 if (mapping_can_writeback(mapping)) { __mod_lruvec_state(from_vec, NR_FILE_DIRTY, @@ -5654,7 +5655,7 @@ static int mem_cgroup_move_account(struct page *pag= e, } } =20 - if (PageWriteback(page)) { + if (folio_test_writeback(folio)) { __mod_lruvec_state(from_vec, NR_WRITEBACK, -nr_pages); __mod_lruvec_state(to_vec, NR_WRITEBACK, nr_pages); } @@ -5677,12 +5678,12 @@ static int mem_cgroup_move_account(struct page *p= age, css_get(&to->css); css_put(&from->css); =20 - page->memcg_data =3D (unsigned long)to; + folio->memcg_data =3D (unsigned long)to; =20 __folio_memcg_unlock(from); =20 ret =3D 0; - nid =3D page_to_nid(page); + nid =3D folio_nid(folio); =20 local_irq_disable(); mem_cgroup_charge_statistics(to, nr_pages); @@ -5691,7 +5692,7 @@ static int mem_cgroup_move_account(struct page *pag= e, memcg_check_events(from, nid); local_irq_enable(); out_unlock: - unlock_page(page); + folio_unlock(folio); out: return ret; } --=20 2.30.2