Commit a568b412 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

userfault; expand folio use in mfill_atomic_install_pte() 

Call page_folio() a little earlier so we can use folio_mapping()
instead of page_mapping(), saving a call to compound_head().

Link: https://lkml.kernel.org/r/20240423225552.4113447-6-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e18a9faf

mm/userfaultfd.c

+2 −3
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, 
	pte_t _dst_pte, *dst_pte;

	bool writable = dst_vma->vm_flags & VM_WRITE;

	bool vm_shared = dst_vma->vm_flags & VM_SHARED;

	bool page_in_cache = page_mapping(page);

	spinlock_t *ptl;

	struct folio *folio;

	struct folio *folio = page_folio(page);

	bool page_in_cache = folio_mapping(folio);



	_dst_pte = mk_pte(page, dst_vma->vm_page_prot);

	_dst_pte = pte_mkdirty(_dst_pte);
@@ -212,7 +212,6 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, 
	if (!pte_none_mostly(ptep_get(dst_pte)))

		goto out_unlock;



	folio = page_folio(page);

	if (page_in_cache) {

		/* Usually, cache pages are already added to LRU */

		if (newly_allocated)