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 304F7C54EBC for ; Wed, 11 Jan 2023 14:29:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 953BE940008; Wed, 11 Jan 2023 09:29:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49D1B90000E; Wed, 11 Jan 2023 09:29:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D970490000D; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DC2C6940007 for ; Wed, 11 Jan 2023 09:29:10 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AAE41140929 for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.23.276D99C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 19CA7A000C for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TgqfnK9N; spf=none (imf15.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=1673447349; a=rsa-sha256; cv=none; b=L+qbZ1Q8kJgntgDBR30J72RTN5DVdkww63ZTdxjhv6f2Bujf+ANHg2KCFKWK5RJX4i6fCq MhXvS2J8Ce2S4VXhNEmt0PLYIRvGIA3GI6MeRMAG7EtlD5frGTJiubO5LX859/7Lvo6l7N PSeI2cD0Vr/I1USTbP0XTiuIyFxptSo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TgqfnK9N; spf=none (imf15.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=1673447349; 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=k563aUCO0woe019PthIukGmZp4g+v5x7heD1X9jV3wA=; b=D2Lz7/vnonSddrW6q2Lzl52IKT9ZTgLAWE8jW8JVXjnPihtCIxv1yWH41o1eyAnEV/N+Fy Teg+rUtqXsLKLeHdL0CjLLWJnRv1yHppFf9tMbn29yBaRaCKWPc0dlKzS+GESLIReN/stH jq3o7y27qMuo3V1nGLTW6+9BRhhd+E8= 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=k563aUCO0woe019PthIukGmZp4g+v5x7heD1X9jV3wA=; b=TgqfnK9NYbf/dPaBd2igQnq4pc vjgKExtNpFgQpWSTWltsHdgkZhL05TP5BFTe4eSC6+6w1PtezM+4AtCWaVmUDLj7r6CVplAmDwKn9 PASQQuj5D1Gl5ghsFTGc6JvJ5eEkFl2HwvThS4kH8pwaKlw49daGOcYpigC1Y7Qo5lYIQNk8NmIil RsqH1zoFtXVb637N9z18XqxFV43iF8QCNuDNt0CR4rfOsAcRF9ScyTeNSvpAEUlEy40ag5/r9UdHN lsKrSiiTLmyXbtm42qmzXxWtaUql85HnD0mcmX50GNndWUWJE74dIUz7bS9BdPI61Au7J5AKpMFuR /lQnMxxA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6P-004CY2-1L; 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 05/28] mm: Convert page_remove_rmap() to use a folio internally Date: Wed, 11 Jan 2023 14:28:51 +0000 Message-Id: <20230111142915.1001531-6-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: rspam03 X-Rspamd-Queue-Id: 19CA7A000C X-Stat-Signature: atpxmtnnh6s9wfmy4c9stcb7ig6fx3m7 X-HE-Tag: 1673447348-49670 X-HE-Meta: U2FsdGVkX19E/uRSPuEteoKcZnNNwiDbe5doW5dDjukI+Jtkgaf1rbASqHs3t6Cgv7+XSkimHXfNUxs2axj37Dh8V/3tZYw51LbJTcXfKzYUAdH6oOGObBtpSxKd+dy6ELGLZSJOb4F9eu9sLYg7KaOmIMrvlFq5jS0izDJJ1yS4v8ySkhDoICWTWkXs+4SD831nlkX+PwBegBjX90zc00+hdbfWw8HQ0OwnLNun6smpqCCJuqVrwQLyRxT4ZYFuFUBI261G+VBQgc7uQf3V5xxeSbZyv2WYRLM+5TrfIp4WoeACuP+/qnPnhY7UJUlFaBW4pDvn1eGKaz+0QhUrewDImNMcxdxcjZ/UP7MKwrym2uQraGs4ayl/LuL/xdI/sX+h7JR0SexUBAfL4pflEdadImjMTkUzMX6O6yD9fEayTN5+6CP5lA0/+zH2qVzisdaEY5olQpr4AWADfNXm3L8CLJGZolEw/VAWnER81VIeYENLe7KVtJqgPaDtA8siYUwFrRhCM9vDqA00dX7iiYzqJ6qrPvh1IjoDygu4cfYtCl3kvowmDgez3JLh0G9bOgXT2kWlyATxGQEDSWIO6rc9zN4PCEbYBdQKdEnxN93rLUG0R83Zl16Pzr9a/YOKbLpLICdBertzDTQ1v1bHurhS1Q6SGdLYRZtanwmBXHL4CW/2phuZYVbQByaYu9/LFCNk5ABGJdhiFbgzEr9dmf/HrpLwzgWmi0dk5FvEJQ/XCXoIeT5danDWtHp6v6Rw3/eVPw+Moqw51/E32qPN3cqbGI/YbAABoFpVL11zIcIajnk9zAGn9UB3FvUGBsiue1UOrAvgcqABw/a8IPCEAqUaxHsjSaR7nwcJZeCjrFz/x7WJSKwvcH+mTB4ViAZpD9AunsMaVshk+r7XY9Nu6vZNYl97ary4kQD82eVK4VvZcEsOxMOZHA== 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_remove_rmap() needs to be page-based, because we can remove mappings of pages individually. 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 | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 675d8401c2da..d137bd8e5309 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1365,19 +1365,21 @@ void page_add_file_rmap(struct page *page, * * The caller needs to hold the pte lock. */ -void page_remove_rmap(struct page *page, - struct vm_area_struct *vma, bool compound) +void page_remove_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 last; + enum node_stat_item idx; VM_BUG_ON_PAGE(compound && !PageHead(page), page); /* Hugetlb pages are not counted in NR_*MAPPED */ - if (unlikely(PageHuge(page))) { + if (unlikely(folio_test_hugetlb(folio))) { /* hugetlb pages are always mapped with pmds */ - atomic_dec(compound_mapcount_ptr(page)); + atomic_dec(&folio->_entire_mapcount); return; } @@ -1385,20 +1387,18 @@ void page_remove_rmap(struct page *page, if (likely(!compound)) { last = atomic_add_negative(-1, &page->_mapcount); nr = last; - if (last && PageCompound(page)) { - mapped = subpages_mapcount_ptr(compound_head(page)); + if (last && folio_test_large(folio)) { nr = atomic_dec_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 */ - last = atomic_add_negative(-1, compound_mapcount_ptr(page)); + last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { - mapped = subpages_mapcount_ptr(page); nr = atomic_sub_return_relaxed(COMPOUND_MAPPED, mapped); if (likely(nr < COMPOUND_MAPPED)) { - nr_pmdmapped = thp_nr_pages(page); + nr_pmdmapped = folio_nr_pages(folio); nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of another remove and an add? */ if (unlikely(nr < 0)) @@ -1411,21 +1411,26 @@ void page_remove_rmap(struct page *page, } if (nr_pmdmapped) { - __mod_lruvec_page_state(page, PageAnon(page) ? NR_ANON_THPS : - (PageSwapBacked(page) ? NR_SHMEM_PMDMAPPED : - NR_FILE_PMDMAPPED), -nr_pmdmapped); + if (folio_test_anon(folio)) + idx = NR_ANON_THPS; + else if (folio_test_swapbacked(folio)) + idx = NR_SHMEM_PMDMAPPED; + else + idx = NR_FILE_PMDMAPPED; + __lruvec_stat_mod_folio(folio, idx, -nr_pmdmapped); } if (nr) { - __mod_lruvec_page_state(page, PageAnon(page) ? NR_ANON_MAPPED : - NR_FILE_MAPPED, -nr); + idx = folio_test_anon(folio) ? NR_ANON_MAPPED : NR_FILE_MAPPED; + __lruvec_stat_mod_folio(folio, idx, -nr); + /* - * Queue anon THP for deferred split if at least one small - * page of the compound page is unmapped, but at least one - * small page is still mapped. + * Queue anon THP for deferred split if at least one + * page of the folio is unmapped and at least one page + * is still mapped. */ - if (PageTransCompound(page) && PageAnon(page)) + if (folio_test_pmd_mappable(folio) && folio_test_anon(folio)) if (!compound || nr < nr_pmdmapped) - deferred_split_huge_page(compound_head(page)); + deferred_split_huge_page(&folio->page); } /* -- 2.35.1