Commit 40f2bbf7 authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

mm/rmap: drop "compound" parameter from page_add_new_anon_rmap() 

New anonymous pages are always mapped natively: only THP/khugepaged code
maps a new compound anonymous page and passes "true".  Otherwise, we're
just dealing with simple, non-compound pages.

Let's give the interface clearer semantics and document these.  Remove the
PageTransCompound() sanity check from page_add_new_anon_rmap().

Link: https://lkml.kernel.org/r/20220428083441.37290-9-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Don Dutile <ddutile@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Khalid Aziz <khalid.aziz@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Liang Zhang <zhangliang5@huawei.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Pedro Demarchi Gomes <pedrodemargomes@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 28c5209d

include/linux/rmap.h

+2 −1
Original line number Diff line number Diff line
@@ -185,11 +185,12 @@ void page_move_anon_rmap(struct page *, struct vm_area_struct *); 
void page_add_anon_rmap(struct page *, struct vm_area_struct *,

		unsigned long address, rmap_t flags);

void page_add_new_anon_rmap(struct page *, struct vm_area_struct *,

		unsigned long address, bool compound);

		unsigned long address);

void page_add_file_rmap(struct page *, struct vm_area_struct *,

		bool compound);

void page_remove_rmap(struct page *, struct vm_area_struct *,

		bool compound);



void hugepage_add_anon_rmap(struct page *, struct vm_area_struct *,

		unsigned long address, rmap_t flags);

void hugepage_add_new_anon_rmap(struct page *, struct vm_area_struct *,

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 


	if (new_page) {

		get_page(new_page);

		page_add_new_anon_rmap(new_page, vma, addr, false);

		page_add_new_anon_rmap(new_page, vma, addr);

		lru_cache_add_inactive_or_unevictable(new_page, vma);

	} else

		/* no new page, just dec_mm_counter for old_page */

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, 


		entry = mk_huge_pmd(page, vma->vm_page_prot);

		entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);

		page_add_new_anon_rmap(page, vma, haddr, true);

		page_add_new_anon_rmap(page, vma, haddr);

		lru_cache_add_inactive_or_unevictable(page, vma);

		pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable);

		set_pmd_at(vma->vm_mm, haddr, vmf->pmd, entry);

mm/khugepaged.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static void collapse_huge_page(struct mm_struct *mm, 


	spin_lock(pmd_ptl);

	BUG_ON(!pmd_none(*pmd));

	page_add_new_anon_rmap(new_page, vma, address, true);

	page_add_new_anon_rmap(new_page, vma, address);

	lru_cache_add_inactive_or_unevictable(new_page, vma);

	pgtable_trans_huge_deposit(mm, pmd, pgtable);

	set_pmd_at(mm, address, pmd, _pmd);

mm/memory.c

+5 −5
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ copy_present_page(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma 
	*prealloc = NULL;

	copy_user_highpage(new_page, page, addr, src_vma);

	__SetPageUptodate(new_page);

	page_add_new_anon_rmap(new_page, dst_vma, addr, false);

	page_add_new_anon_rmap(new_page, dst_vma, addr);

	lru_cache_add_inactive_or_unevictable(new_page, dst_vma);

	rss[mm_counter(new_page)]++;
@@ -3058,7 +3058,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
		 * some TLBs while the old PTE remains in others.

		 */

		ptep_clear_flush_notify(vma, vmf->address, vmf->pte);

		page_add_new_anon_rmap(new_page, vma, vmf->address, false);

		page_add_new_anon_rmap(new_page, vma, vmf->address);

		lru_cache_add_inactive_or_unevictable(new_page, vma);

		/*

		 * We call the notify macro here because, when using secondary
@@ -3702,7 +3702,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) 


	/* ksm created a completely new copy */

	if (unlikely(page != swapcache && swapcache)) {

		page_add_new_anon_rmap(page, vma, vmf->address, false);

		page_add_new_anon_rmap(page, vma, vmf->address);

		lru_cache_add_inactive_or_unevictable(page, vma);

	} else {

		page_add_anon_rmap(page, vma, vmf->address, rmap_flags);
@@ -3852,7 +3852,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) 
	}



	inc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);

	page_add_new_anon_rmap(page, vma, vmf->address, false);

	page_add_new_anon_rmap(page, vma, vmf->address);

	lru_cache_add_inactive_or_unevictable(page, vma);

setpte:

	set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);
@@ -4039,7 +4039,7 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) 
	/* copy-on-write page */

	if (write && !(vma->vm_flags & VM_SHARED)) {

		inc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);

		page_add_new_anon_rmap(page, vma, addr, false);

		page_add_new_anon_rmap(page, vma, addr);

		lru_cache_add_inactive_or_unevictable(page, vma);

	} else {

		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));