Commit cc0356d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 core updates from Borislav Petkov:

 - Do not #GP on userspace use of CLI/STI but pretend it was a NOP to
   keep old userspace from breaking. Adjust the corresponding iopl
   selftest to that.

 - Improve stack overflow warnings to say which stack got overflowed and
   raise the exception stack sizes to 2 pages since overflowing the
   single page of exception stack is very easy to do nowadays with all
   the tracing machinery enabled. With that, rip out the custom mapping
   of AMD SEV's too.

 - A bunch of changes in preparation for FGKASLR like supporting more
   than 64K section headers in the relocs tool, correct ORC lookup table
   size to cover the whole kernel .text and other adjustments.

* tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage
  vmlinux.lds.h: Have ORC lookup cover entire _etext - _stext
  x86/boot/compressed: Avoid duplicate malloc() implementations
  x86/boot: Allow a "silent" kaslr random byte fetch
  x86/tools/relocs: Support >64K section headers
  x86/sev: Make the #VC exception stacks part of the default stacks storage
  x86: Increase exception stack sizes
  x86/mm/64: Improve stack overflow warnings
  x86/iopl: Fake iopl(3) CLI/STI usage
parents fc02cb2b a72fdfd2

arch/x86/boot/compressed/kaslr.c

+0 −4
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ 
#include <generated/utsrelease.h>

#include <asm/efi.h>



/* Macros used by the included decompressor code below. */

#define STATIC

#include <linux/decompress/mm.h>



#define _SETUP

#include <asm/setup.h>	/* For COMMAND_LINE_SIZE */

#undef _SETUP

arch/x86/boot/compressed/misc.c

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 


/* Macros used by the included decompressor code below. */

#define STATIC		static

/* Define an externally visible malloc()/free(). */

#define MALLOC_VISIBLE

#include <linux/decompress/mm.h>



/*

 * Provide definitions of memzero and memmove as some of the decompressors will

arch/x86/boot/compressed/misc.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ extern char _head[], _end[]; 
/* misc.c */

extern memptr free_mem_ptr;

extern memptr free_mem_end_ptr;

void *malloc(int size);

void free(void *where);

extern struct boot_params *boot_params;

void __putstr(const char *s);

void __puthex(unsigned long value);

arch/x86/include/asm/cpu_entry_area.h

+7 −1
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ 


#ifdef CONFIG_X86_64



#ifdef CONFIG_AMD_MEM_ENCRYPT

#define VC_EXCEPTION_STKSZ	EXCEPTION_STKSZ

#else

#define VC_EXCEPTION_STKSZ	0

#endif



/* Macro to enforce the same ordering and stack sizes */

#define ESTACKS_MEMBERS(guardsize, optional_stack_size)		\

	char	DF_stack_guard[guardsize];			\
@@ -28,7 +34,7 @@ 


/* The exception stacks' physical storage. No guard pages required */

struct exception_stacks {

	ESTACKS_MEMBERS(0, 0)

	ESTACKS_MEMBERS(0, VC_EXCEPTION_STKSZ)

};



/* The effective cpu entry area mapping with guard pages. */

arch/x86/include/asm/insn-eval.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ int insn_get_modrm_rm_off(struct insn *insn, struct pt_regs *regs); 
int insn_get_modrm_reg_off(struct insn *insn, struct pt_regs *regs);

unsigned long insn_get_seg_base(struct pt_regs *regs, int seg_reg_idx);

int insn_get_code_seg_params(struct pt_regs *regs);

int insn_get_effective_ip(struct pt_regs *regs, unsigned long *ip);

int insn_fetch_from_user(struct pt_regs *regs,

			 unsigned char buf[MAX_INSN_SIZE]);

int insn_fetch_from_user_inatomic(struct pt_regs *regs,