Commit 7225a442 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/pti fixes from Thomas Gleixner:
 "Three fixes related to melted spectrum:

   - Sync the cpu_entry_area page table to initial_page_table on 32 bit.

     Otherwise suspend/resume fails because resume uses
     initial_page_table and triggers a triple fault when accessing the
     cpu entry area.

   - Zero the SPEC_CTL MRS on XEN before suspend to address a
     shortcoming in the hypervisor.

   - Fix another switch table detection issue in objtool"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table
  objtool: Fix another switch table detection issue
  x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend
parents 4c4ce302 945fd17a

arch/x86/include/asm/pgtable_32.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern pmd_t initial_pg_pmd[]; 
static inline void pgtable_cache_init(void) { }

static inline void check_pgt_cache(void) { }

void paging_init(void);

void sync_initial_page_table(void);



/*

 * Define this if things work differently on an i386 and an i486:

arch/x86/include/asm/pgtable_64.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ extern pgd_t init_top_pgt[]; 
#define swapper_pg_dir init_top_pgt



extern void paging_init(void);

static inline void sync_initial_page_table(void) { }



#define pte_ERROR(e)					\

	pr_err("%s:%d: bad pte %p(%016lx)\n",		\

arch/x86/kernel/setup.c

+5 −12
Original line number Diff line number Diff line
@@ -1204,20 +1204,13 @@ void __init setup_arch(char **cmdline_p) 


	kasan_init();



#ifdef CONFIG_X86_32

	/* sync back kernel address range */

	clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			KERNEL_PGD_PTRS);



	/*

	 * sync back low identity map too.  It is used for example

	 * in the 32-bit EFI stub.

	 * Sync back kernel address range.

	 *

	 * FIXME: Can the later sync in setup_cpu_entry_areas() replace

	 * this call?

	 */

	clone_pgd_range(initial_page_table,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			min(KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));

#endif

	sync_initial_page_table();



	tboot_probe();

arch/x86/kernel/setup_percpu.c

+4 −13
Original line number Diff line number Diff line
@@ -287,24 +287,15 @@ void __init setup_per_cpu_areas(void) 
	/* Setup cpu initialized, callin, callout masks */

	setup_cpu_local_masks();



#ifdef CONFIG_X86_32

	/*

	 * Sync back kernel address range again.  We already did this in

	 * setup_arch(), but percpu data also needs to be available in

	 * the smpboot asm.  We can't reliably pick up percpu mappings

	 * using vmalloc_fault(), because exception dispatch needs

	 * percpu data.

	 *

	 * FIXME: Can the later sync in setup_cpu_entry_areas() replace

	 * this call?

	 */

	clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			KERNEL_PGD_PTRS);



	/*

	 * sync back low identity map too.  It is used for example

	 * in the 32-bit EFI stub.

	 */

	clone_pgd_range(initial_page_table,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			min(KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));

#endif

	sync_initial_page_table();

}

arch/x86/mm/cpu_entry_area.c

+6 −0
Original line number Diff line number Diff line
@@ -163,4 +163,10 @@ void __init setup_cpu_entry_areas(void) 


	for_each_possible_cpu(cpu)

		setup_cpu_entry_area(cpu);



	/*

	 * This is the last essential update to swapper_pgdir which needs

	 * to be synchronized to initial_page_table on 32bit.

	 */

	sync_initial_page_table();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE