Commit 631aa744 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-misc-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 updates from Thomas Gleixner:
 "Updates for miscellaneous x86 areas:

   - Reserve a new boot loader type for barebox which is usally used on
     ARM and MIPS, but can also be utilized as EFI payload on x86 to
     provide watchdog-supervised boot up.

   - Consolidate the native and compat 32bit signal handling code and
     split the 64bit version out into a separate source file

   - Switch the ESPFIX random usage to get_random_long()"

* tag 'x86-misc-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/espfix: Use get_random_long() rather than archrandom
  x86/signal/64: Move 64-bit signal code to its own file
  x86/signal/32: Merge native and compat 32-bit signal code
  x86/signal: Add ABI prefixes to frame setup functions
  x86/signal: Merge get_sigframe()
  x86: Remove __USER32_DS
  signal/compat: Remove compat_sigset_t override
  x86/signal: Remove sigset_t parameter from frame setup functions
  x86/signal: Remove sig parameter from frame setup functions
  Documentation/x86/boot: Reserve type_of_loader=13 for barebox
parents 0a1d4434 00ed1eab

Documentation/x86/boot.rst

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ Protocol: 2.00+ 
	11 Minimal Linux Bootloader

	   <http://sebastian-plotz.blogspot.de>

	12 OVMF UEFI virtualization stack

	13 barebox

	== =======================================



  Please contact <hpa@zytor.com> if you need a bootloader ID value assigned.

arch/x86/entry/entry_64_compat.S

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ SYM_CODE_START(entry_SYSENTER_compat) 
	movq	PER_CPU_VAR(cpu_current_top_of_stack), %rsp



	/* Construct struct pt_regs on stack */

	pushq	$__USER32_DS		/* pt_regs->ss */

	pushq	$__USER_DS		/* pt_regs->ss */

	pushq	$0			/* pt_regs->sp = 0 (placeholder) */



	/*
@@ -197,7 +197,7 @@ SYM_INNER_LABEL(entry_SYSCALL_compat_safe_stack, SYM_L_GLOBAL) 
	ANNOTATE_NOENDBR



	/* Construct struct pt_regs on stack */

	pushq	$__USER32_DS		/* pt_regs->ss */

	pushq	$__USER_DS		/* pt_regs->ss */

	pushq	%r8			/* pt_regs->sp */

	pushq	%r11			/* pt_regs->flags */

	pushq	$__USER32_CS		/* pt_regs->cs */

arch/x86/ia32/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,5 @@ 
# Makefile for the ia32 kernel emulation subsystem.

#



obj-$(CONFIG_IA32_EMULATION) := ia32_signal.o



audit-class-$(CONFIG_AUDIT) := audit.o

obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)

arch/x86/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -152,10 +152,6 @@ do { \ 
	(elf_check_arch_ia32(x) ||					\

	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))



#if __USER32_DS != __USER_DS

# error "The following code assumes __USER32_DS == __USER_DS"

#endif



static inline void elf_common_init(struct thread_struct *t,

				   struct pt_regs *regs, const u16 ds)

{

arch/x86/include/asm/fpu/signal.h

+0 −7
Original line number Diff line number Diff line
@@ -13,16 +13,9 @@ 
#ifdef CONFIG_X86_64

# include <uapi/asm/sigcontext.h>

# include <asm/user32.h>

struct ksignal;

int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

			compat_sigset_t *set, struct pt_regs *regs);

int ia32_setup_frame(int sig, struct ksignal *ksig,

		     compat_sigset_t *set, struct pt_regs *regs);

#else

# define user_i387_ia32_struct	user_i387_struct

# define user32_fxsr_struct	user_fxsr_struct

# define ia32_setup_frame	__setup_frame

# define ia32_setup_rt_frame	__setup_rt_frame

#endif



extern void convert_from_fxsr(struct user_i387_ia32_struct *env,