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 A15FCC07E99 for ; Mon, 12 Jul 2021 19:51:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 52F6561245 for ; Mon, 12 Jul 2021 19:51:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52F6561245 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 847BC6B0095; Mon, 12 Jul 2021 15:51:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7F7DD6B0098; Mon, 12 Jul 2021 15:51:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 698A66B0099; Mon, 12 Jul 2021 15:51:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0151.hostedemail.com [216.40.44.151]) by kanga.kvack.org (Postfix) with ESMTP id 4330E6B0095 for ; Mon, 12 Jul 2021 15:51:27 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5362E235D7 for ; Mon, 12 Jul 2021 19:51:26 +0000 (UTC) X-FDA: 78354980172.28.9D48C0E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 0FE4BB0000A8 for ; Mon, 12 Jul 2021 19:51:25 +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=3GvyyjM48baLTpa97ADBxL023rhcXs1ZJlneYXhdyQc=; b=YDn5Z88uJzK4LM97xAsMCrRxDi GuAF3Qt0lVvAViN72kNdt5wb6EKMYl51Ia/tQ2YTsS45bE8vMtjyq29T+NfmI7gfSMEljDp41EF++ ekdr8hIF7oacwAd6bUVfUZ1y7hf+4/G5T3oaEKq6hANTxE8/yPdodvWrJ5cHD7xGZyxNfvUnf5Tzs qIPRxpWwCFLB5KpypBLcM/uwScYpHiu2NAk6FVnlm5JR7K0lNOoNcGT/lBXi0eGuAluSZyoRMewCr jg2GWKXjp542PryUcT02+8AhV3yQKf6OBnw/5xotoovplwCK6HhktPng6TvCsYFqVXi9XSObYPwEG 2wnFCiUA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m31wf-000OH1-QB; Mon, 12 Jul 2021 19:50:33 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linux-foundation.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Christoph Hellwig Subject: [PATCH v13 09/18] mm/memcg: Convert uncharge_page() to uncharge_folio() Date: Mon, 12 Jul 2021 20:45:42 +0100 Message-Id: <20210712194551.91920-10-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712194551.91920-1-willy@infradead.org> References: <20210712194551.91920-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0FE4BB0000A8 X-Stat-Signature: wsj5d885ikk3gih5ubj4ubeqo9tkc3ch Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YDn5Z88u; spf=none (imf24.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: 1626119485-679502 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: Use a folio rather than a page to ensure that we're only operating on base or head pages, and not tail pages. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- mm/memcontrol.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ebad42c55f76..2436ad3841d8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6832,24 +6832,23 @@ static void uncharge_batch(const struct uncharge_= gather *ug) memcg_check_events(ug->memcg, ug->nid); local_irq_restore(flags); =20 - /* drop reference from uncharge_page */ + /* drop reference from uncharge_folio */ css_put(&ug->memcg->css); } =20 -static void uncharge_page(struct page *page, struct uncharge_gather *ug) +static void uncharge_folio(struct folio *folio, struct uncharge_gather *= ug) { - struct folio *folio =3D page_folio(page); unsigned long nr_pages; struct mem_cgroup *memcg; struct obj_cgroup *objcg; - bool use_objcg =3D PageMemcgKmem(page); + bool use_objcg =3D folio_memcg_kmem(folio); =20 - VM_BUG_ON_PAGE(PageLRU(page), page); + VM_BUG_ON_FOLIO(folio_lru(folio), folio); =20 /* * Nobody should be changing or seriously looking at - * page memcg or objcg at this point, we have fully - * exclusive access to the page. + * folio memcg or objcg at this point, we have fully + * exclusive access to the folio. */ if (use_objcg) { objcg =3D __folio_objcg(folio); @@ -6871,19 +6870,19 @@ static void uncharge_page(struct page *page, stru= ct uncharge_gather *ug) uncharge_gather_clear(ug); } ug->memcg =3D memcg; - ug->nid =3D page_to_nid(page); + ug->nid =3D folio_nid(folio); =20 /* pairs with css_put in uncharge_batch */ css_get(&memcg->css); } =20 - nr_pages =3D compound_nr(page); + nr_pages =3D folio_nr_pages(folio); =20 if (use_objcg) { ug->nr_memory +=3D nr_pages; ug->nr_kmem +=3D nr_pages; =20 - page->memcg_data =3D 0; + folio->memcg_data =3D 0; obj_cgroup_put(objcg); } else { /* LRU pages aren't accounted at the root level */ @@ -6891,7 +6890,7 @@ static void uncharge_page(struct page *page, struct= uncharge_gather *ug) ug->nr_memory +=3D nr_pages; ug->pgpgout++; =20 - page->memcg_data =3D 0; + folio->memcg_data =3D 0; } =20 css_put(&memcg->css); @@ -6915,7 +6914,7 @@ void mem_cgroup_uncharge(struct page *page) return; =20 uncharge_gather_clear(&ug); - uncharge_page(page, &ug); + uncharge_folio(page_folio(page), &ug); uncharge_batch(&ug); } =20 @@ -6929,14 +6928,14 @@ void mem_cgroup_uncharge(struct page *page) void mem_cgroup_uncharge_list(struct list_head *page_list) { struct uncharge_gather ug; - struct page *page; + struct folio *folio; =20 if (mem_cgroup_disabled()) return; =20 uncharge_gather_clear(&ug); - list_for_each_entry(page, page_list, lru) - uncharge_page(page, &ug); + list_for_each_entry(folio, page_list, lru) + uncharge_folio(folio, &ug); if (ug.memcg) uncharge_batch(&ug); } --=20 2.30.2