Commit a0e2dab4 authored by Pawan Gupta's avatar Pawan Gupta Committed by Dave Hansen
Browse files

x86/entry_32: Add VERW just before userspace transition 



As done for entry_64, add support for executing VERW late in exit to
user path for 32-bit mode.

Signed-off-by: default avatarPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240213-delay-verw-v8-3-a6216d83edb7%40linux.intel.com
parent 3c750172

arch/x86/entry/entry_32.S

+3 −0
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ SYM_FUNC_START(entry_SYSENTER_32) 
	BUG_IF_WRONG_CR3 no_user_check=1

	popfl

	popl	%eax

	CLEAR_CPU_BUFFERS



	/*

	 * Return back to the vDSO, which will pop ecx and edx.
@@ -954,6 +955,7 @@ restore_all_switch_stack: 


	/* Restore user state */

	RESTORE_REGS pop=4			# skip orig_eax/error_code

	CLEAR_CPU_BUFFERS

.Lirq_return:

	/*

	 * ARCH_HAS_MEMBARRIER_SYNC_CORE rely on IRET core serialization
@@ -1146,6 +1148,7 @@ SYM_CODE_START(asm_exc_nmi) 


	/* Not on SYSENTER stack. */

	call	exc_nmi

	CLEAR_CPU_BUFFERS

	jmp	.Lnmi_return



.Lnmi_from_sysenter_stack: