Commit 28e3ace7 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/mm: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 



Using static_cpu_has() is pointless on those paths, convert them to the
boot_cpu_has() variant.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190330112022.28888-5-bp@alien8.de
parent 67e87d43

arch/x86/mm/dump_pagetables.c

+2 −2
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd) 
void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	if (user && static_cpu_has(X86_FEATURE_PTI))

	if (user && boot_cpu_has(X86_FEATURE_PTI))

		pgd = kernel_to_user_pgdp(pgd);

#endif

	ptdump_walk_pgd_level_core(m, pgd, false, false);
@@ -590,7 +590,7 @@ void ptdump_walk_user_pgd_level_checkwx(void) 
	pgd_t *pgd = INIT_PGD;



	if (!(__supported_pte_mask & _PAGE_NX) ||

	    !static_cpu_has(X86_FEATURE_PTI))

	    !boot_cpu_has(X86_FEATURE_PTI))

		return;



	pr_info("x86/mm: Checking user space page tables\n");

arch/x86/mm/pgtable.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd) 
 * when PTI is enabled. We need them to map the per-process LDT into the

 * user-space page-table.

 */

#define PREALLOCATED_USER_PMDS	 (static_cpu_has(X86_FEATURE_PTI) ? \

#define PREALLOCATED_USER_PMDS	 (boot_cpu_has(X86_FEATURE_PTI) ? \

					KERNEL_PGD_PTRS : 0)

#define MAX_PREALLOCATED_USER_PMDS KERNEL_PGD_PTRS
@@ -292,7 +292,7 @@ static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp) 


#ifdef CONFIG_PAGE_TABLE_ISOLATION



	if (!static_cpu_has(X86_FEATURE_PTI))

	if (!boot_cpu_has(X86_FEATURE_PTI))

		return;



	pgdp = kernel_to_user_pgdp(pgdp);

arch/x86/mm/pti.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ void pti_set_kernel_image_nonglobal(void) 
 */

void __init pti_init(void)

{

	if (!static_cpu_has(X86_FEATURE_PTI))

	if (!boot_cpu_has(X86_FEATURE_PTI))

		return;



	pr_info("enabled\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE