Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fbc4aea authored Jun 30, 2018 by Linus Torvalds

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

Pull x86 fixes from Ingo Molnar:
 "The biggest diffstat comes from self-test updates, plus there's entry
  code fixes, 5-level paging related fixes, console debug output fixes,
  and misc fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Clean up the printk()s in show_fault_oops()
  x86/mm: Drop unneeded __always_inline for p4d page table helpers
  x86/efi: Fix efi_call_phys_epilog() with CONFIG_X86_5LEVEL=y
  selftests/x86/sigreturn: Do minor cleanups
  selftests/x86/sigreturn/64: Fix spurious failures on AMD CPUs
  x86/entry/64/compat: Fix "x86/entry/64/compat: Preserve r8-r11 in int $0x80"
  x86/mm: Don't free P4D table when it is folded at runtime
  x86/entry/32: Add explicit 'l' instruction suffix
  x86/mm: Get rid of KERN_CONT in show_fault_oops()

parents d7d53886 d79d0d8a

arch/x86/entry/entry_32.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ ENTRY(entry_SYSENTER_32)
		* whereas POPF does not.)
		*/
		addl $PT_EFLAGS-PT_DS, %esp /* point esp at pt_regs->flags */
		btr $X86_EFLAGS_IF_BIT, (%esp)
		btrl $X86_EFLAGS_IF_BIT, (%esp)
		popfl

		/*

arch/x86/entry/entry_64_compat.S

+8 −8

Original line number	Diff line number	Diff line
		@@ -84,13 +84,13 @@ ENTRY(entry_SYSENTER_compat)
		pushq %rdx /* pt_regs->dx */
		pushq %rcx /* pt_regs->cx */
		pushq $-ENOSYS /* pt_regs->ax */
		pushq %r8 /* pt_regs->r8 */
		pushq $0 /* pt_regs->r8 = 0 */
		xorl %r8d, %r8d /* nospec r8 */
		pushq %r9 /* pt_regs->r9 */
		pushq $0 /* pt_regs->r9 = 0 */
		xorl %r9d, %r9d /* nospec r9 */
		pushq %r10 /* pt_regs->r10 */
		pushq $0 /* pt_regs->r10 = 0 */
		xorl %r10d, %r10d /* nospec r10 */
		pushq %r11 /* pt_regs->r11 */
		pushq $0 /* pt_regs->r11 = 0 */
		xorl %r11d, %r11d /* nospec r11 */
		pushq %rbx /* pt_regs->rbx */
		xorl %ebx, %ebx /* nospec rbx */
		@@ -374,13 +374,13 @@ ENTRY(entry_INT80_compat)
		pushq %rcx /* pt_regs->cx */
		xorl %ecx, %ecx /* nospec cx */
		pushq $-ENOSYS /* pt_regs->ax */
		pushq $0 /* pt_regs->r8 = 0 */
		pushq %r8 /* pt_regs->r8 */
		xorl %r8d, %r8d /* nospec r8 */
		pushq $0 /* pt_regs->r9 = 0 */
		pushq %r9 /* pt_regs->r9 */
		xorl %r9d, %r9d /* nospec r9 */
		pushq $0 /* pt_regs->r10 = 0 */
		pushq %r10 /* pt_regs->r10*/
		xorl %r10d, %r10d /* nospec r10 */
		pushq $0 /* pt_regs->r11 = 0 */
		pushq %r11 /* pt_regs->r11 */
		xorl %r11d, %r11d /* nospec r11 */
		pushq %rbx /* pt_regs->rbx */
		xorl %ebx, %ebx /* nospec rbx */

arch/x86/include/asm/pgalloc.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,9 @@ static inline p4d_t p4d_alloc_one(struct mm_struct mm, unsigned long addr)

		static inline void p4d_free(struct mm_struct mm, p4d_t p4d)
		{
		if (!pgtable_l5_enabled())
		return;

		BUG_ON((unsigned long)p4d & (PAGE_SIZE-1));
		free_page((unsigned long)p4d);
		}

arch/x86/include/asm/pgtable.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -898,7 +898,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
		#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd))

		/* to find an entry in a page-table-directory. */
		static __always_inline p4d_t p4d_offset(pgd_t pgd, unsigned long address)
		static inline p4d_t p4d_offset(pgd_t pgd, unsigned long address)
		{
		if (!pgtable_l5_enabled())
		return (p4d_t *)pgd;

arch/x86/include/asm/pgtable_64.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ static inline pgd_t pti_set_user_pgd(pgd_t *pgdp, pgd_t pgd)
		}
		#endif

		static __always_inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)
		static inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)
		{
		pgd_t pgd;

		@@ -230,7 +230,7 @@ static __always_inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d)
		*p4dp = native_make_p4d(native_pgd_val(pgd));
		}

		static __always_inline void native_p4d_clear(p4d_t *p4d)
		static inline void native_p4d_clear(p4d_t *p4d)
		{
		native_set_p4d(p4d, native_make_p4d(0));
		}