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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 899B0C46467 for ; Wed, 11 Jan 2023 14:29:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88CA98E0011; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5583B8E0001; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7226900007; Wed, 11 Jan 2023 09:29:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D5E758E000A for ; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B42B11C6414 for ; Wed, 11 Jan 2023 14:29:09 +0000 (UTC) X-FDA: 80342750418.26.0547C59 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id D5C3E40004 for ; Wed, 11 Jan 2023 14:29:06 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TyPmpJkC; dmarc=none; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447347; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S5RQv/iHXB0LHnXKaLRNqyQBA4vTXTkj3jwk4WmiUds=; b=DgK5POXBuuEHeUbzXlSPgUbhIeWd2F7tKUiVuvbCLPX1+FH1PDcKTzvXZcfH0xAF/+NZv/ eQhecb1HhKQyyD4btM+2V1SiYiPkkidqEa+Okx9l9uT5HN0RlilKuW8iGnyJ+KEl2fQHJZ 70bKVyUbZAUhrvl0Hx4vcN3S5zrbOac= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TyPmpJkC; dmarc=none; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447347; a=rsa-sha256; cv=none; b=JyAWgRBW77qea4zVWUNyqJFQaFHU1u+t3XkOKushFED/Ka/ICe70zBFE/KLksiE39s0z/v AYC4kjLTHJVSqjtSAb4Z5cM8n8HMggmIIr3ILXWRPgr6O15AB/UH04IBvecM+83m/1Wqad 9h5AljxkA/Cd4qH8/vnYfzBMDlsxlkU= 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=S5RQv/iHXB0LHnXKaLRNqyQBA4vTXTkj3jwk4WmiUds=; b=TyPmpJkC0TCDVOH1Xf7hFGHEhF ljnBaA0NG4to6fCNil2897PRSAOn9gxuOgLUVUcr1cJvaZaW7cnU/HjGcit7ubSnb/IWfRAQgp/We fIx7eb04Vxi69wNs6VaG0bploau4bGuEi4a5QN+Zb1xksumYJeSKvYNtsKw/JBQKcrOEMexZnp6vP zpgnC8QqgB3e+pX4BaYKdrFbIfnNCdMRBnHW9XIlvs07vgnr6/ugJYGz4bW9IYUxK6ttGHXmiaYjz wx2WAcUvTupzQshPK7Yr7/5QSdJCLXyy4Nwu6SS+TFgU3epUBIOj6+7WPZOrlFiQbcP3Ps5XdL9CH b7nZ3Piw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6P-004CY4-44; Wed, 11 Jan 2023 14:29:17 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 06/28] mm: Convert page_add_anon_rmap() to use a folio internally Date: Wed, 11 Jan 2023 14:28:52 +0000 Message-Id: <20230111142915.1001531-7-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D5C3E40004 X-Stat-Signature: 9exg13j58mbydjj9fuj5qpj6p95kmk86 X-HE-Tag: 1673447346-68404 X-HE-Meta: U2FsdGVkX1+4K7AdfnoNSxtodcsL5g60UoKZx/H9ox+QR00EbaxCwHCKUxf6vHX187UJNFr9gtWDRSzCemD+dxo12ibPWb5txAWecHwwnUo7iyhyY4weqbk45Tnf+FPrZRQ5j/jahrnCJRzQMhbBfnn+rTbHD9s86RpIx2O5odUAciTggx2kW76avzPv5i1Nqhr1lmOv0G3C62dxhcSEdIQhtjenAuoC+tmq3d+ApdZ4yc+xFRolrP+5zj9zzlfpWzWV85kOyYFTuJatY1i55c4lP0wMvxnREv770noNwnhvcVbNNaj5rH8zrwLCGtmC0QXz4LTuAsxKVEmw4v7U08gThZg9cKBFLN2Wy+vcumHJAW8kqUpVKACbc0Gn96NmyLqlX2O5UTv0tlHQiw41WUUv4xaV2NkNNt+VXKquCYMOkWFAs4dhFS5Zm3CnxOy/P+yhp5SyStusYmE/WJG6dmZzTu/9NFOC8y4vvJoMBtZob1Erb+9cab5y9RjrlA/d/352MVYHAENRkrwk/0PjAbUfzjN4t3h/dVfPt6aO04WXtVL/e5MJoGyq9qWu97pmOzRl3UwIYs4hcSHYeitzHTcgyFC5SxLmU675Arv/svGrjCjAsd3KEEyxVM5eSDXtX5UcGycTF4k9WEdowJO+WdAAwvqSL+KQIKT7KIRSaR+WnCzLrZME6IeI9FPLya9i9vVyDFhUPVc476kOHpEIiJHhfRpIqlI7UAnEdFdSbnXhJCECgDOQbaj5FZy0Wjj3Mtxwjam64gnu8AXLEKQZ0dlnir+s5qNoRVl+Z6nyCCzHkUCj4xeAYifCc5AoH3WnmH9hWrckt6eY8N7ImrpoR0TbkTPw/ZGBWw1ibto9EScLHkrOxTq9nYoYbu88Co6MXl1C2CSX5TDiH9Skp/RsNZYywzvKnNSMiLz2cjk5Ax79OO1xK6DGew== 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 API for page_add_anon_rmap() needs to be page-based, because we can add mappings of individual pages. But inside the function, we want to only call compound_head() once and then use the folio APIs instead of the page APIs that each call compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/rmap.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index d137bd8e5309..187c7c832111 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1207,10 +1207,11 @@ static void __page_check_anon_rmap(struct page *page, * and to ensure that PageAnon is not being upgraded racily to PageKsm * (but PageKsm is never downgraded to PageAnon). */ -void page_add_anon_rmap(struct page *page, - struct vm_area_struct *vma, unsigned long address, rmap_t flags) +void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, + unsigned long address, rmap_t flags) { - atomic_t *mapped; + struct folio *folio = page_folio(page); + atomic_t *mapped = &folio->_nr_pages_mapped; int nr = 0, nr_pmdmapped = 0; bool compound = flags & RMAP_COMPOUND; bool first = true; @@ -1219,20 +1220,18 @@ void page_add_anon_rmap(struct page *page, if (likely(!compound)) { first = atomic_inc_and_test(&page->_mapcount); nr = first; - if (first && PageCompound(page)) { - mapped = subpages_mapcount_ptr(compound_head(page)); + if (first && folio_test_large(folio)) { nr = atomic_inc_return_relaxed(mapped); nr = (nr < COMPOUND_MAPPED); } - } else if (PageTransHuge(page)) { + } else if (folio_test_pmd_mappable(folio)) { /* That test is redundant: it's for safety or to optimize out */ - first = atomic_inc_and_test(compound_mapcount_ptr(page)); + first = atomic_inc_and_test(&folio->_entire_mapcount); if (first) { - mapped = subpages_mapcount_ptr(page); nr = atomic_add_return_relaxed(COMPOUND_MAPPED, mapped); if (likely(nr < COMPOUND_MAPPED + COMPOUND_MAPPED)) { - nr_pmdmapped = thp_nr_pages(page); + nr_pmdmapped = folio_nr_pages(folio); nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) @@ -1248,11 +1247,11 @@ void page_add_anon_rmap(struct page *page, VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page); if (nr_pmdmapped) - __mod_lruvec_page_state(page, NR_ANON_THPS, nr_pmdmapped); + __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr_pmdmapped); if (nr) - __mod_lruvec_page_state(page, NR_ANON_MAPPED, nr); + __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - if (likely(!PageKsm(page))) { + if (likely(!folio_test_ksm(folio))) { /* address might be in next vma when migration races vma_adjust */ if (first) __page_set_anon_rmap(page, vma, address, -- 2.35.1