Commit e5a55401 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: page_table_check: move pxx_user_accessible_page into x86 

The pxx_user_accessible_page() checks the PTE bit, it's
architecture-specific code, move them into x86's pgtable.h.

These helpers are being moved out to make the page table check framework
platform independent.

Link: https://lkml.kernel.org/r/20220507110114.4128854-3-tongtiangen@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Acked-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 92fb0524

arch/x86/include/asm/pgtable.h

+17 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,23 @@ static inline bool arch_faults_on_old_pte(void) 
	return false;

}



#ifdef CONFIG_PAGE_TABLE_CHECK

static inline bool pte_user_accessible_page(pte_t pte)

{

	return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER);

}



static inline bool pmd_user_accessible_page(pmd_t pmd)

{

	return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) && (pmd_val(pmd) & _PAGE_USER);

}



static inline bool pud_user_accessible_page(pud_t pud)

{

	return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) && (pud_val(pud) & _PAGE_USER);

}

#endif



#endif	/* __ASSEMBLY__ */



#endif /* _ASM_X86_PGTABLE_H */

mm/page_table_check.c

+0 −17
Original line number Diff line number Diff line
@@ -52,23 +52,6 @@ static struct page_table_check *get_page_table_check(struct page_ext *page_ext) 
	return (void *)(page_ext) + page_table_check_ops.offset;

}



static inline bool pte_user_accessible_page(pte_t pte)

{

	return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER);

}



static inline bool pmd_user_accessible_page(pmd_t pmd)

{

	return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) &&

		(pmd_val(pmd) & _PAGE_USER);

}



static inline bool pud_user_accessible_page(pud_t pud)

{

	return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) &&

		(pud_val(pud) & _PAGE_USER);

}



/*

 * An enty is removed from the page table, decrement the counters for that page

 * verify that it is of correct type and counters do not become negative.