[11/22] mm: Use entire_mapcount in __page_dup_rmap()

Message ID	20221231214610.2800682-12-willy@infradead.org (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, Hugh Dickins <hughd@google.com> Subject: [PATCH 11/22] mm: Use entire_mapcount in __page_dup_rmap() Date: Sat, 31 Dec 2022 21:45:59 +0000 Message-Id: <20221231214610.2800682-12-willy@infradead.org> In-Reply-To: <20221231214610.2800682-1-willy@infradead.org> References: <20221231214610.2800682-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Get rid of first tail page fields \| expand [00/22] Get rid of first tail page fields [01/22] mm: Remove folio_pincount_ptr() and head_compound_pincount() [02/22] mm: Convert head_subpages_mapcount() into folio_nr_pages_mapped() [03/22] doc: Clarify refcount section by referring to folios & pages [04/22] mm: Convert total_compound_mapcount() to folio_total_mapcount() [05/22] mm: Convert page_remove_rmap() to use a folio internally [06/22] mm: Convert page_add_anon_rmap() to use a folio internally [07/22] mm: Convert page_add_file_rmap() to use a folio internally [08/22] mm: Add folio_add_new_anon_rmap() [09/22] page_alloc: Use folio fields directly [10/22] mm: Use a folio in hugepage_add_anon_rmap() and hugepage_add_new_anon_rmap() [11/22] mm: Use entire_mapcount in __page_dup_rmap() [12/22] mm/debug: Remove call to head_compound_mapcount() [13/22] hugetlb: Remove uses of folio_mapcount_ptr [14/22] mm: Convert page_mapcount() to use folio_entire_mapcount() [15/22] mm: Remove head_compound_mapcount() and _ptr functions [16/22] mm: Reimplement compound_order() [17/22] mm: Reimplement compound_nr() [18/22] mm: Convert set_compound_page_dtor() and set_compound_order() to folios [19/22] mm: Convert is_transparent_hugepage() to use a folio [20/22] mm: Convert destroy_large_folio() to use folio_dtor [21/22] hugetlb: Remove uses of compound_dtor and compound_nr [22/22] mm: Remove 'First tail page' members from struct page

Message ID

20221231214610.2800682-12-willy@infradead.org (mailing list archive)

State

New

Headers

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-mm@kvack.org,
	Hugh Dickins <hughd@google.com>
Subject: [PATCH 11/22] mm: Use entire_mapcount in __page_dup_rmap()
Date: Sat, 31 Dec 2022 21:45:59 +0000
Message-Id: <20221231214610.2800682-12-willy@infradead.org>
In-Reply-To: <20221231214610.2800682-1-willy@infradead.org>
References: <20221231214610.2800682-1-willy@infradead.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

Get rid of first tail page fields | expand

Commit Message

Matthew Wilcox Dec. 31, 2022, 9:45 p.m. UTC

Remove the use of the compound_mapcount_ptr() wrapper, and add an
assertion that we're not passing a tail page if we're duplicating a PMD.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/linux/rmap.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index aa682a2a93ce..a6bd1f0a183d 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -208,7 +208,14 @@  void hugepage_add_new_anon_rmap(struct page *, struct vm_area_struct *,
 
 static inline void __page_dup_rmap(struct page *page, bool compound)
 {
-	atomic_inc(compound ? compound_mapcount_ptr(page) : &page->_mapcount);
+	if (compound) {
+		struct folio *folio = (struct folio *)page;
+
+		VM_BUG_ON_PAGE(compound && !PageHead(page), page);
+		atomic_inc(&folio->_entire_mapcount);
+	} else {
+		atomic_inc(&page->_mapcount);
+	}
 }
 
 static inline void page_dup_file_rmap(struct page *page, bool compound)

[11/22] mm: Use entire_mapcount in __page_dup_rmap()

Commit Message

Patch