Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76846bf3 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

x86/asm: Add unwind hint annotations to sync_core() 



This enables objtool to grok the iret in the middle of a C function.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: live-patching@vger.kernel.org
Link: http://lkml.kernel.org/r/b057be26193c11d2ed3337b2107bc7adcba42c99.1499786555.git.jpoimboe@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8c1f7558

arch/x86/include/asm/processor.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ struct vm86; 
#include <asm/nops.h>

#include <asm/nops.h>

#include <asm/special_insns.h>

#include <asm/special_insns.h>

#include <asm/fpu/types.h>

#include <asm/fpu/types.h>

#include <asm/unwind_hints.h>





#include <linux/personality.h>

#include <linux/personality.h>

#include <linux/cache.h>

#include <linux/cache.h>
@@ -684,6 +685,7 @@ static inline void sync_core(void) 
	unsigned int tmp;

	unsigned int tmp;





	asm volatile (

	asm volatile (

		UNWIND_HINT_SAVE

		"mov %%ss, %0\n\t"

		"mov %%ss, %0\n\t"

		"pushq %q0\n\t"

		"pushq %q0\n\t"

		"pushq %%rsp\n\t"

		"pushq %%rsp\n\t"
@@ -693,6 +695,7 @@ static inline void sync_core(void) 
		"pushq %q0\n\t"

		"pushq %q0\n\t"

		"pushq $1f\n\t"

		"pushq $1f\n\t"

		"iretq\n\t"

		"iretq\n\t"

		UNWIND_HINT_RESTORE

		"1:"

		"1:"

		: "=&r" (tmp), "+r" (__sp) : : "cc", "memory");

		: "=&r" (tmp), "+r" (__sp) : : "cc", "memory");

#endif

#endif