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

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

Pull x86 asm updates from Ingo Molnar:
 "Misc updates:

   - Remove last remaining calls to exception_enter/exception_exit() and
     simplify the entry code some more.

   - Remove force_iret()

   - Add support for "Fast Short Rep Mov", which is available starting
     with Ice Lake Intel CPUs - and make the x86 assembly version of
     memmove() use REP MOV for all sizes when FSRM is available.

   - Micro-optimize/simplify the 32-bit boot code a bit.

   - Use a more future-proof SYSRET instruction mnemonic"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Simplify calculation of output address
  x86/entry/64: Add instruction suffix to SYSRET
  x86: Remove force_iret()
  x86/cpufeatures: Add support for fast short REP; MOVSB
  x86/context-tracking: Remove exception_enter/exit() from KVM_PV_REASON_PAGE_NOT_PRESENT async page fault
  x86/context-tracking: Remove exception_enter/exit() from do_page_fault()
parents 435dd727 183ef7ad

arch/x86/boot/compressed/head_32.S

+3 −5
Original line number Diff line number Diff line
@@ -189,11 +189,9 @@ SYM_FUNC_START_LOCAL_NOALIGN(.Lrelocated) 
				/* push arguments for extract_kernel: */

	pushl	$z_output_len	/* decompressed length, end of relocs */



	movl    BP_init_size(%esi), %eax

	subl    $_end, %eax

	movl    %ebx, %ebp

	subl    %eax, %ebp

	pushl	%ebp		/* output address */

	leal	_end(%ebx), %eax

	subl    BP_init_size(%esi), %eax

	pushl	%eax		/* output address */



	pushl	$z_input_len	/* input_len */

	leal	input_data(%ebx), %eax

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ SYM_CODE_END(nmi) 
SYM_CODE_START(ignore_sysret)

	UNWIND_HINT_EMPTY

	mov	$-ENOSYS, %eax

	sysret

	sysretl

SYM_CODE_END(ignore_sysret)

#endif

arch/x86/ia32/ia32_signal.c

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, 


	err |= fpu__restore_sig(buf, 1);



	force_iret();



	return err;

}

arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ 
/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */

#define X86_FEATURE_AVX512_4VNNIW	(18*32+ 2) /* AVX-512 Neural Network Instructions */

#define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */

#define X86_FEATURE_FSRM		(18*32+ 4) /* Fast Short Rep Mov */

#define X86_FEATURE_AVX512_VP2INTERSECT (18*32+ 8) /* AVX-512 Intersect for D/Q */

#define X86_FEATURE_MD_CLEAR		(18*32+10) /* VERW clears CPU buffers */

#define X86_FEATURE_TSX_FORCE_ABORT	(18*32+13) /* "" TSX_FORCE_ABORT */

arch/x86/include/asm/ptrace.h

+0 −16
Original line number Diff line number Diff line
@@ -339,22 +339,6 @@ static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs, 


#define ARCH_HAS_USER_SINGLE_STEP_REPORT



/*

 * When hitting ptrace_stop(), we cannot return using SYSRET because

 * that does not restore the full CPU state, only a minimal set.  The

 * ptracer can change arbitrary register values, which is usually okay

 * because the usual ptrace stops run off the signal delivery path which

 * forces IRET; however, ptrace_event() stops happen in arbitrary places

 * in the kernel and don't force IRET path.

 *

 * So force IRET path after a ptrace stop.

 */

#define arch_ptrace_stop_needed(code, info)				\

({									\

	force_iret();							\

	false;								\

})



struct user_desc;

extern int do_get_thread_area(struct task_struct *p, int idx,

			      struct user_desc __user *info);

CRA Git | Maintained and supported by SUSTech CRA and CCSE