Commit 1fac1395 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/ibt: Fix hibernate



Todd reported, and Len confirmed, that commit 582077c9 ("x86/cfi:
Clean up linkage") broke S4 hiberate on a fair number of machines.

Turns out these machines trip #CP when trying to restore the image.

As it happens, the commit in question removes two ENDBR instructions
in the hibernate code, and clearly got it wrong.

Notably restore_image() does an indirect jump to
relocated_restore_code(), which is a relocated copy of
core_restore_code().

In turn, core_restore_code(), will at the end do an indirect jump to
restore_jump_address (r8), which is pointing at a relocated
restore_registers().

So both sites do indeed need to be ENDBR.

Fixes: 582077c9 ("x86/cfi: Clean up linkage")
Reported-by: default avatarTodd Brandt <todd.e.brandt@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarTodd Brandt <todd.e.brandt@intel.com>
Tested-by: default avatarLen Brown <len.brown@intel.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219998
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219998
parent f0df00eb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
	 /* code below belongs to the image kernel */
	.align PAGE_SIZE
SYM_FUNC_START(restore_registers)
	ANNOTATE_NOENDBR
	ENDBR
	/* go back to the original page tables */
	movq    %r9, %cr3

@@ -120,7 +120,7 @@ SYM_FUNC_END(restore_image)

	/* code below has been relocated to a safe page */
SYM_FUNC_START(core_restore_code)
	ANNOTATE_NOENDBR
	ENDBR
	/* switch to temporary page tables */
	movq	%rax, %cr3
	/* flush TLB */