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 2B252C4332F for ; Sat, 31 Dec 2022 21:46:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1CAAE8E0002; Sat, 31 Dec 2022 16:46:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 153668E0001; Sat, 31 Dec 2022 16:46:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F36158E0002; Sat, 31 Dec 2022 16:46:09 -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 E04658E0001 for ; Sat, 31 Dec 2022 16:46:09 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AA4F140182 for ; Sat, 31 Dec 2022 21:46:09 +0000 (UTC) X-FDA: 80303934858.10.C543A05 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 70436C0010 for ; Sat, 31 Dec 2022 21:46:06 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eq9D5ElZ; 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; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672523167; 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=46PTN6VCfOALWMcndrNvySFnC/1jvl7w4rPJMnjeBsE=; b=UMxQmslH9vJ3/JazVD86N6n7FFgKzgzzKNaEfPiO8JYuz6tGspVbNr2Tk9PosqBl+jlckM GUnEjxynvr7sRUCyae82ZBNrQk3B9RTx9yjQY0jcL5Dy+l05Jn3Kczj1diHIyoLojvkbFm NsCKb8PpypHNqNLu+E0U36l1ibhPWOw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eq9D5ElZ; 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; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672523167; a=rsa-sha256; cv=none; b=qpNvuua1ec4J9C8yCkTJ88R20/eRVxKIvBqRT0yHoson3UGuTbaHHw7eMgQnXQ829lpDNC XMt5X2F8gC9zorQdWLhBe5GaoNXcMC6VhEyvL+LEINK+v83BZLzCIDwZTOpPWDAg9p02fL PAwnG5PS1A8f9N/RKId67Y0H3KGMx1U= 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=46PTN6VCfOALWMcndrNvySFnC/1jvl7w4rPJMnjeBsE=; b=eq9D5ElZ4H1Po8lHL8GAgJgZ+D ST/EkWYWOeq9pQozNSuSSy6sjRNM6aapCvgNE502mcom6ebwLNF84rOL+YMYzuJJQuTbUEohbDdc0 3jVS9d6C7B5ctmyIAeZTOMKWr1KLPITPSuT07bGtBx/MqkSxupW3lRQeTfZWQdJiDvCYNXwUMRZK+ cDFAtFrugw2RxRrtPcKpv/9+CQ/AyoUcTrqavzXoye/YRN8NQ6sLEziqHqoYFsxjcKvoZGZgb/I9a gE4HW6dTVEMGdSwYAvBtNyqy8kLTcobokZXcehOq7Hi+dO7whddjtqHqbaKChf5LS0LRU0xcIw/mr w4jFY92Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkab-3O; Sat, 31 Dec 2022 21:46:13 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 05/22] mm: Convert page_remove_rmap() to use a folio internally Date: Sat, 31 Dec 2022 21:45:53 +0000 Message-Id: <20221231214610.2800682-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221231214610.2800682-1-willy@infradead.org> References: <20221231214610.2800682-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: m5bp1rb9j9i5c4zqroznbntkxhzcmhr1 X-Rspam-User: X-Rspamd-Queue-Id: 70436C0010 X-Rspamd-Server: rspam06 X-HE-Tag: 1672523166-84471 X-HE-Meta: U2FsdGVkX1/K5hP+J3uKL8zxv2t8cFeE0rGF4FRjspmY+llGrC/cb3iMCX/YP1xck0DvIxz7g3tIQb2ZKbWkX8qkhjDurgNniKFB7QoyKYL4XZEv9hHW33Zrowizs1dTS2tUP2Pf03ES306RHSLjZsIFK3TZK9ZFl3KYnCzgXYo+9hqyz9mmNsDKYrMLhrQtAI27sxl7k84buNgPXI9+qB3pQXO4FCM38p82mhrn9hD01Tq52ofcuiZn1sY6JfsoD31QP4gu6WnupdgePSGpYkJZPqnwYZdASER0+smpnKtvzTsoKMROqpm8Pt114QL6jRXi/NVoV4eP6MN2qY3KOOyiQoJVZwkv5WRyMiT5do3xKL334nUVU7sN/1iQVhaFLeMUYFcTJDSNlyLSSUkhA5p1LsHv2gL9pFqCk5xEeUyxFj45uh9Rgk6hJX8KuMUCFWy4Bk4cABwTRPIr4mU5RcvkaO+eqCbrMjBGB573tT/Ld+gdPgDWAkprNrP+G9eEtyl+K/vOzXTd+oNJmZMa6hkLLLxR9oKDQzER10wHicP7FsXpsGNQKt2qJMxXIRpHOvm1LXxRJHqowAPp/CQ4pKY0e1wFOmt3t9DElTnv22NaIgUk5C69nQmGynyE5/JUX3cx0ECtzIccHQwcQw9aRa2XgtQpna4f+5Dsd2enjlAXgVif4lqBR1I1/M8zLPRGBnxf8WLEgSnZHD8Gi6/JS7P18xfOHsEzYyQ3OnARp+gYmrLoE+PwpA83O7o8/Cn4JRytvLA1cXtOtdeir91DKSK49a1WCrl1qGyluU51kJbTQxXABA1L/zX90XGasw5rIX8rLhCgzYaHU36SE+k7wuCQhBVdNTilCbNcj/AXsO+GCL+wilzqAUgraxXP00EkkxkpkFfcwkf0+0bJZDOMrSIOT9Ao+j89lV0IvOMCgkJGtEQZyqjD5Q== 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 | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 17984eb9f990..7d51ed49ee9f 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1378,42 +1378,42 @@ 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; } - lock_page_memcg(page); + folio_memcg_lock(folio); /* Is page being unmapped by PTE? Is this its last map to be removed? */ 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_large(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)) @@ -1426,21 +1426,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, but at least one + * page is still mapped. */ - if (PageTransCompound(page) && PageAnon(page)) + if (folio_test_large(folio) && folio_test_anon(folio)) if (!compound || nr < nr_pmdmapped) - deferred_split_huge_page(compound_head(page)); + deferred_split_huge_page(&folio->page); } /* @@ -1451,7 +1456,7 @@ void page_remove_rmap(struct page *page, * and remember that it's only reliable while mapped. */ - unlock_page_memcg(page); + folio_memcg_unlock(folio); munlock_vma_page(page, vma, compound); } -- 2.35.1