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

mm: add folio_mk_pte() 

Remove a cast from folio to page in four callers of mk_pte().

Link: https://lkml.kernel.org/r/20250402181709.2386022-8-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Richard Weinberger <richard@nod.at>
Cc: <x86@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4ec492a6

include/linux/mm.h

+15 −0
Original line number Diff line number Diff line
@@ -2009,6 +2009,21 @@ static inline pte_t mk_pte(struct page *page, pgprot_t pgprot) 
{

	return pfn_pte(page_to_pfn(page), pgprot);

}



/**

 * folio_mk_pte - Create a PTE for this folio

 * @folio: The folio to create a PTE for

 * @pgprot: The page protection bits to use

 *

 * Create a page table entry for the first page of this folio.

 * This is suitable for passing to set_ptes().

 *

 * Return: A page table entry suitable for mapping this folio.

 */

static inline pte_t folio_mk_pte(struct folio *folio, pgprot_t pgprot)

{

	return pfn_pte(folio_pfn(folio), pgprot);

}

#endif



static inline bool folio_has_pincount(const struct folio *folio)

mm/memory.c

+3 −3
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ copy_present_page(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma 
	rss[MM_ANONPAGES]++;



	/* All done, just insert the new page copy in the child */

	pte = mk_pte(&new_folio->page, dst_vma->vm_page_prot);

	pte = folio_mk_pte(new_folio, dst_vma->vm_page_prot);

	pte = maybe_mkwrite(pte_mkdirty(pte), dst_vma);

	if (userfaultfd_pte_wp(dst_vma, ptep_get(src_pte)))

		/* Uffd-wp needs to be delivered to dest pte as well */
@@ -3523,7 +3523,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
			inc_mm_counter(mm, MM_ANONPAGES);

		}

		flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte));

		entry = mk_pte(&new_folio->page, vma->vm_page_prot);

		entry = folio_mk_pte(new_folio, vma->vm_page_prot);

		entry = pte_sw_mkyoung(entry);

		if (unlikely(unshare)) {

			if (pte_soft_dirty(vmf->orig_pte))
@@ -5013,7 +5013,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) 
	 */

	__folio_mark_uptodate(folio);



	entry = mk_pte(&folio->page, vma->vm_page_prot);

	entry = folio_mk_pte(folio, vma->vm_page_prot);

	entry = pte_sw_mkyoung(entry);

	if (vma->vm_flags & VM_WRITE)

		entry = pte_mkwrite(pte_mkdirty(entry), vma);

mm/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ static int move_present_pte(struct mm_struct *mm, 
	folio_move_anon_rmap(src_folio, dst_vma);

	src_folio->index = linear_page_index(dst_vma, dst_addr);



	orig_dst_pte = mk_pte(&src_folio->page, dst_vma->vm_page_prot);

	orig_dst_pte = folio_mk_pte(src_folio, dst_vma->vm_page_prot);

	/* Set soft dirty bit so userspace can notice the pte was moved */

#ifdef CONFIG_MEM_SOFT_DIRTY

	orig_dst_pte = pte_mksoft_dirty(orig_dst_pte);