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,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 06923C433ED for ; Wed, 5 May 2021 16:09:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7C59E6121F for ; Wed, 5 May 2021 16:09:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C59E6121F 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 ED49F6B0071; Wed, 5 May 2021 12:09:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E84256B0074; Wed, 5 May 2021 12:09:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4BC96B0078; Wed, 5 May 2021 12:09:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id B66CB6B0071 for ; Wed, 5 May 2021 12:09:27 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 6D69A180AD81F for ; Wed, 5 May 2021 16:09:27 +0000 (UTC) X-FDA: 78107662374.18.551098F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id E6A0F200024E for ; Wed, 5 May 2021 16:09:26 +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=N3vydzOWjmmFG0R2cR1PHRr8tSeV8Ri5it/enNyGnko=; b=h2Ljs0CdxLLhk81NSb2HlkOV4l +rUWbc5CcPjWh8r+R3mPj7LtVCNJtWgVn6/f9UQLIHWbtzw3Jf/zgHS4W783TjRXjPdG3YJRlF/oV CzQp/HKFAqBjAn611jTAr8HYL+bS34QtgT7PEy3CrxCqDQBy1KyMJlykZyz645IBZlNlmtuPNlnj5 hpG3w7XKFY3TJpmYMOxaD3rc7sIW63LiBezaBdR6ifRdGjjtXYvIXnIAUrcq22FJIjqdEboxNFLUK e5OqgPhSXGquxJ9xsJSTGYD8b9oXME+TsraMSMxZ3+VSHB7lcwhqalBfkTZH19cW9JJAtBfBXeHUC nP22DjLg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1leK41-000Z9v-Fr; Wed, 05 May 2021 16:08:32 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v9 50/96] mm/memcg: Convert commit_charge to take a folio Date: Wed, 5 May 2021 16:05:42 +0100 Message-Id: <20210505150628.111735-51-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210505150628.111735-1-willy@infradead.org> References: <20210505150628.111735-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: E6A0F200024E Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=h2Ljs0Cd; dmarc=none; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam04 X-Stat-Signature: wuay7suzxf4frrfcdhequxfi4rqjtax8 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf28; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620230966-87817 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: The memcg_data is only set on the head page, so enforce that by typing it as a folio. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memcontrol.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7423cb11eb88..5493e094e9e9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2700,9 +2700,9 @@ static void cancel_charge(struct mem_cgroup *memcg,= unsigned int nr_pages) } #endif =20 -static void commit_charge(struct page *page, struct mem_cgroup *memcg) +static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) { - VM_BUG_ON_PAGE(page_memcg(page), page); + VM_BUG_ON_FOLIO(folio_memcg(folio), folio); /* * Any of the following ensures page's memcg stability: * @@ -2711,7 +2711,7 @@ static void commit_charge(struct page *page, struct= mem_cgroup *memcg) * - lock_page_memcg() * - exclusive reference */ - page->memcg_data =3D (unsigned long)memcg; + folio->memcg_data =3D (unsigned long)memcg; } =20 static struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *o= bjcg) @@ -6506,7 +6506,8 @@ void mem_cgroup_calculate_protection(struct mem_cgr= oup *root, static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *mem= cg, gfp_t gfp) { - unsigned int nr_pages =3D thp_nr_pages(page); + struct folio *folio =3D page_folio(page); + unsigned int nr_pages =3D folio_nr_pages(folio); int ret; =20 ret =3D try_charge(memcg, gfp, nr_pages); @@ -6514,7 +6515,7 @@ static int __mem_cgroup_charge(struct page *page, s= truct mem_cgroup *memcg, goto out; =20 css_get(&memcg->css); - commit_charge(page, memcg); + commit_charge(folio, memcg); =20 local_irq_disable(); mem_cgroup_charge_statistics(memcg, nr_pages); @@ -6771,21 +6772,22 @@ void mem_cgroup_uncharge_list(struct list_head *p= age_list) */ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) { + struct folio *newfolio =3D page_folio(newpage); struct mem_cgroup *memcg; - unsigned int nr_pages; + unsigned int nr_pages =3D folio_nr_pages(newfolio); unsigned long flags; =20 VM_BUG_ON_PAGE(!PageLocked(oldpage), oldpage); - VM_BUG_ON_PAGE(!PageLocked(newpage), newpage); - VM_BUG_ON_PAGE(PageAnon(oldpage) !=3D PageAnon(newpage), newpage); - VM_BUG_ON_PAGE(PageTransHuge(oldpage) !=3D PageTransHuge(newpage), - newpage); + VM_BUG_ON_FOLIO(!folio_locked(newfolio), newfolio); + VM_BUG_ON_FOLIO(PageAnon(oldpage) !=3D folio_anon(newfolio), newfolio); + VM_BUG_ON_FOLIO(compound_nr(oldpage) !=3D folio_nr_pages(newfolio), + newfolio); =20 if (mem_cgroup_disabled()) return; =20 /* Page cache replacement: new page already charged? */ - if (page_memcg(newpage)) + if (folio_memcg(newfolio)) return; =20 memcg =3D page_memcg(oldpage); @@ -6794,14 +6796,12 @@ void mem_cgroup_migrate(struct page *oldpage, str= uct page *newpage) return; =20 /* Force-charge the new page. The old one will be freed soon */ - nr_pages =3D thp_nr_pages(newpage); - page_counter_charge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_charge(&memcg->memsw, nr_pages); =20 css_get(&memcg->css); - commit_charge(newpage, memcg); + commit_charge(newfolio, memcg); =20 local_irq_save(flags); mem_cgroup_charge_statistics(memcg, nr_pages); --=20 2.30.2