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 D1729C46467 for ; Wed, 11 Jan 2023 14:29:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FE7C8E0009; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 222C78E0002; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09DCA8E0005; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E91DA8E0001 for ; Wed, 11 Jan 2023 09:29:08 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C2DE21C6342 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) X-FDA: 80342750376.12.BB73B62 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id F11DB140004 for ; Wed, 11 Jan 2023 14:29:06 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rVMUVJDd; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=+M9PYetxBWVQcE/WzZKSgATAyynY7Xkz/FsMlEYD1jw=; b=WgJEtSZz1tELaHHGSfA6Rj0Mxr4vJE8a9r1EaLD/Eh44ZBzc7QuJIruTF5hSWzgGwTFz5B I7FoqCGxrbYLm0tpmBG1SSunyBsAmEMFxSfRe0YSRGq1zFS9AdaeoimwymM1lc6X8pgyJ5 vygqmu1unMjLMuWqaVxWP6v/hC7Lq8w= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rVMUVJDd; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447347; a=rsa-sha256; cv=none; b=FNneasn89ULNy93q18dyPeuZT5/9JKm17REjhSRVEeuClFrKqzE2xFSDRzZgLx4dtYtn/l iPL3d8M+6vGvQEtiPzbpTGiL9hXdi0wvxj1nD1+WKgiV9p4o9fgGAtgF0ICtxKq3djT6y8 MJzdbJScsEhbLruHYxvy5RyfTygYzx4= 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=+M9PYetxBWVQcE/WzZKSgATAyynY7Xkz/FsMlEYD1jw=; b=rVMUVJDdW5xPOeYfbS5d0cShsD 5cLbkjfcH/32sd6DGZyRN7SjoAL6kzTH/atPlZejvJcdVGCFcO8Bsecd/ABDDpE80/gXBJnDFVIOG 5AMtK+927M0Bv7mQeBdgyzoD3amBSKmE/6h0u+n+f/4NB+KiG6HQLFje6pYJ9w6tlSy/rGVyU2bMv QeB7ykoxiaSiVkWnYKzLSZyBUh7y+rl8TpCggTOM5B9RRpCLTokdeaGh3vOjzKbyu+jG5nNtn0HUa 8/cFmRtQGjBZdrcUD5IgLP+6beRuB9ptYzKdYs4DaHw0MD1F0C2Pxz0zW4Nzimfmmb6txPT7QeE25 t8DcM8aw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6P-004CYH-Hl; 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 07/28] mm: Convert page_add_file_rmap() to use a folio internally Date: Wed, 11 Jan 2023 14:28:53 +0000 Message-Id: <20230111142915.1001531-8-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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: F11DB140004 X-Stat-Signature: n93f4ikxfybzwa83x7sao5dbk5xx8q97 X-Rspam-User: X-HE-Tag: 1673447346-492687 X-HE-Meta: U2FsdGVkX18y1zkzsvdsupgPXSPLbxztOqX1HkHCnbMseWfDWm9e48Xr3RqUI+7u5YpPH3Dqm3bAT1IwmveTJ9dQ6z1+KwB398HtCazDgGvTXu4DWZes/PXuBFVIFbtitexq5ve8xo3nohrRXqZ+Ln+NasaziYIhaGjiEwNYwG+CjvIbL11XMm3bAQabAEG3VImscsmOCNmX0BMdPQgfkhtlrZYyHhA/V5kZ7Xz+iLLNxZJ+7x1K1ipQm/z4lOwDK07g3bDB3KKv4H5fOwebdo5yS8vqWMNN0xDpYl0RXTWNMmfcIiWJIEH+hcVHtcTsKOBOn0Xwr7toRFzMGLhMJb/jo/7HaxXp2/9gu7DS1dJh/SGboN7wh2+o/uZg7+1lgWWhMYUvm4jHfpHbY9vKZE8qqsqONBTcNGOwpEvy4+GoFooEh9Z2Fwqg9tw6Gz4ZAvcO7V2ztC8dOOuFQiw5Sjr92UHF2gcTAT5ec3f81nvc94QSIwlIEi8V+k1M7Y/N/cWW/qc7ckyzVDelYvis3Vz+WUctGANeUljM3W1yq77k9OPJfGE4RVSRsdQKtxN/2beb4OFT9KOn1cgcicFNr7zyqlrRpBIw8iMtamPU3p7cMYPpU/0njwowrv7uoZJA0I6kQPd/M6eSTgzUy7L2LuSRbycZCqGV59o2iFy4hqScPojHr3Qd55t/X/69HMVQhILkGMWn8lshhTUfi5rKUJ1nRqT9iIKeXQg/U/ejlTlwkgqF4DfRBurjXXQ/M1vbnHMkJt4s2KNsqHbeR+/KYYwgFQtfKrrYwRGoj6FKqLBIjLM6mbAfz+8ap8Y9oUkV4t/+ETKLNFbYIiUvYojgCOYybuLGd3eaCGzx/LUgGXwq0gGHUWMN/TSsUBKryztbAxcNgvym+qHcDBrcMQxnCM7nDJNygWHQ3YSxCdbutHHP7d3DQY55cA== 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_file_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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 187c7c832111..7b83b56d5603 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1309,10 +1309,11 @@ void page_add_new_anon_rmap(struct page *page, * * The caller needs to hold the pte lock. */ -void page_add_file_rmap(struct page *page, - struct vm_area_struct *vma, bool compound) +void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) { - atomic_t *mapped; + struct folio *folio = page_folio(page); + atomic_t *mapped = &folio->_nr_pages_mapped; int nr = 0, nr_pmdmapped = 0; bool first; @@ -1322,20 +1323,18 @@ void page_add_file_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)) @@ -1348,10 +1347,10 @@ void page_add_file_rmap(struct page *page, } if (nr_pmdmapped) - __mod_lruvec_page_state(page, PageSwapBacked(page) ? + __lruvec_stat_mod_folio(folio, folio_test_swapbacked(folio) ? NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, nr_pmdmapped); if (nr) - __mod_lruvec_page_state(page, NR_FILE_MAPPED, nr); + __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr); mlock_vma_page(page, vma, compound); } -- 2.35.1