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

x86: remove custom definition of mk_pte() 

Move the shadow stack check to pfn_pte() which lets us use the common
definition of mk_pte().

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


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.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: David Hildenbrand <david@redhat.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 aec44171

arch/x86/include/asm/pgtable.h

+3 −16
Original line number Diff line number Diff line
@@ -784,6 +784,9 @@ static inline pgprotval_t check_pgprot(pgprot_t pgprot) 
static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot)

{

	phys_addr_t pfn = (phys_addr_t)page_nr << PAGE_SHIFT;

	/* This bit combination is used to mark shadow stacks */

	WARN_ON_ONCE((pgprot_val(pgprot) & (_PAGE_DIRTY | _PAGE_RW)) ==

			_PAGE_DIRTY);

	pfn ^= protnone_mask(pgprot_val(pgprot));

	pfn &= PTE_PFN_MASK;

	return __pte(pfn | check_pgprot(pgprot));
@@ -1080,22 +1083,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) 
 */

#define pmd_page(pmd)	pfn_to_page(pmd_pfn(pmd))



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

 *

 * (Currently stuck as a macro because of indirect forward reference

 * to linux/mm.h:page_to_nid())

 */

#define mk_pte(page, pgprot)						  \

({									  \

	pgprot_t __pgprot = pgprot;					  \

									  \

	WARN_ON_ONCE((pgprot_val(__pgprot) & (_PAGE_DIRTY | _PAGE_RW)) == \

		    _PAGE_DIRTY);					  \

	pfn_pte(page_to_pfn(page), __pgprot);				  \

})



static inline int pmd_bad(pmd_t pmd)

{

	return (pmd_flags(pmd) & ~(_PAGE_USER | _PAGE_ACCESSED)) !=