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

Commit 01ea4439 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:
 "This is bigger than usual - the reason is partly a pent-up stream of
  fixes after the merge window and partly accidental.  The fixes are:

   - five patches to fix a boot failure on Andy Lutomirsky's laptop
   - four SGI UV platform fixes
   - KASAN fix
   - warning fix
   - documentation update
   - swap entry definition fix
   - pkeys fix
   - irq stats fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/x2apic, smp/hotplug: Don't use before alloc in x2apic_cluster_probe()
  x86/efi: Allocate a trampoline if needed in efi_free_boot_services()
  x86/boot: Rework reserve_real_mode() to allow multiple tries
  x86/boot: Defer setup_real_mode() to early_initcall time
  x86/boot: Synchronize trampoline_cr4_features and mmu_cr4_features directly
  x86/boot: Run reserve_bios_regions() after we initialize the memory map
  x86/irq: Do not substract irq_tlb_count from irq_call_count
  x86/mm: Fix swap entry comment and macro
  x86/mm/kaslr: Fix -Wformat-security warning
  x86/mm/pkeys: Fix compact mode by removing protection keys' XSAVE buffer manipulation
  x86/build: Reduce the W=1 warnings noise when compiling x86 syscall tables
  x86/platform/UV: Fix kernel panic running RHEL kdump kernel on UV systems
  x86/platform/UV: Fix problem with UV4 BIOS providing incorrect PXM values
  x86/platform/UV: Fix bug with iounmap() of the UV4 EFI System Table causing a crash
  x86/platform/UV: Fix problem with UV4 Socket IDs not being contiguous
  x86/entry: Clarify the RF saving/restoring situation with SYSCALL/SYSRET
  x86/mm: Disable preemption during CR3 read+write
  x86/mm/KASLR: Increase BRK pages for KASLR memory randomization
  x86/mm/KASLR: Fix physical memory calculation on KASLR memory randomization
  x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text
parents 3bc6d8c1 d52c0569

arch/x86/entry/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
OBJECT_FILES_NON_STANDARD_entry_$(BITS).o   := y

OBJECT_FILES_NON_STANDARD_entry_64_compat.o := y



CFLAGS_syscall_64.o		+= -Wno-override-init

CFLAGS_syscall_32.o		+= -Wno-override-init

obj-y				:= entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o

obj-y				+= common.o

arch/x86/entry/entry_64.S

+20 −5
Original line number Diff line number Diff line
@@ -288,11 +288,15 @@ return_from_SYSCALL_64: 
	jne	opportunistic_sysret_failed



	/*

	 * SYSRET can't restore RF.  SYSRET can restore TF, but unlike IRET,

	 * restoring TF results in a trap from userspace immediately after

	 * SYSRET.  This would cause an infinite loop whenever #DB happens

	 * with register state that satisfies the opportunistic SYSRET

	 * conditions.  For example, single-stepping this user code:

	 * SYSCALL clears RF when it saves RFLAGS in R11 and SYSRET cannot

	 * restore RF properly. If the slowpath sets it for whatever reason, we

	 * need to restore it correctly.

	 *

	 * SYSRET can restore TF, but unlike IRET, restoring TF results in a

	 * trap from userspace immediately after SYSRET.  This would cause an

	 * infinite loop whenever #DB happens with register state that satisfies

	 * the opportunistic SYSRET conditions.  For example, single-stepping

	 * this user code:

	 *

	 *           movq	$stuck_here, %rcx

	 *           pushfq
@@ -601,9 +605,20 @@ apicinterrupt3 \num trace(\sym) smp_trace(\sym) 
.endm

#endif



/* Make sure APIC interrupt handlers end up in the irqentry section: */

#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)

# define PUSH_SECTION_IRQENTRY	.pushsection .irqentry.text, "ax"

# define POP_SECTION_IRQENTRY	.popsection

#else

# define PUSH_SECTION_IRQENTRY

# define POP_SECTION_IRQENTRY

#endif



.macro apicinterrupt num sym do_sym

PUSH_SECTION_IRQENTRY

apicinterrupt3 \num \sym \do_sym

trace_apicinterrupt \num \sym

POP_SECTION_IRQENTRY

.endm



#ifdef CONFIG_SMP

arch/x86/include/asm/hardirq.h

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ typedef struct { 
#ifdef CONFIG_SMP

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

	/*

	 * irq_tlb_count is double-counted in irq_call_count, so it must be

	 * subtracted from irq_call_count when displaying irq_call_count

	 */

	unsigned int irq_tlb_count;

#endif

#ifdef CONFIG_X86_THERMAL_VECTOR

arch/x86/include/asm/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 
 *

 * |     ...            | 11| 10|  9|8|7|6|5| 4| 3|2|1|0| <- bit number

 * |     ...            |SW3|SW2|SW1|G|L|D|A|CD|WT|U|W|P| <- bit names

 * | OFFSET (14->63) | TYPE (10-13) |0|X|X|X| X| X|X|X|0| <- swp entry

 * | OFFSET (14->63) | TYPE (9-13)  |0|X|X|X| X| X|X|X|0| <- swp entry

 *

 * G (8) is aliased and used as a PROT_NONE indicator for

 * !present ptes.  We need to start storing swap entries above
@@ -156,7 +156,7 @@ static inline int pgd_large(pgd_t pgd) { return 0; } 
#define SWP_TYPE_FIRST_BIT (_PAGE_BIT_PROTNONE + 1)

#define SWP_TYPE_BITS 5

/* Place the offset above the type: */

#define SWP_OFFSET_FIRST_BIT (SWP_TYPE_FIRST_BIT + SWP_TYPE_BITS + 1)

#define SWP_OFFSET_FIRST_BIT (SWP_TYPE_FIRST_BIT + SWP_TYPE_BITS)



#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS)

arch/x86/include/asm/realmode.h

+9 −1
Original line number Diff line number Diff line
@@ -58,7 +58,15 @@ extern unsigned char boot_gdt[]; 
extern unsigned char secondary_startup_64[];

#endif



static inline size_t real_mode_size_needed(void)

{

	if (real_mode_header)

		return 0;	/* already allocated. */



	return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE);

}



void set_real_mode_mem(phys_addr_t mem, size_t size);

void reserve_real_mode(void);

void setup_real_mode(void);



#endif /* _ARCH_X86_REALMODE_H */