Commit 81a68455 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "x86/extable: Macrofy inline assembly code to work around GCC inlining bugs" 



This reverts commit 0474d5d9.

See this commit for details about the revert:

  e769742d ("Revert "x86/jump-labels: Macrofy inline assembly code to work around GCC inlining bugs"")

Reported-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Richard Biener <rguenther@suse.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c3462ba9

arch/x86/include/asm/asm.h

+33 −20
Original line number Diff line number Diff line
@@ -120,25 +120,12 @@ 
/* Exception table entry */

#ifdef __ASSEMBLY__

# define _ASM_EXTABLE_HANDLE(from, to, handler)			\

	ASM_EXTABLE_HANDLE from to handler



.macro ASM_EXTABLE_HANDLE from:req to:req handler:req

	.pushsection "__ex_table","a"

	.balign 4

	.long (\from) - .

	.long (\to) - .

	.long (\handler) - .

	.pushsection "__ex_table","a" ;				\

	.balign 4 ;						\

	.long (from) - . ;					\

	.long (to) - . ;					\

	.long (handler) - . ;					\

	.popsection

.endm

#else /* __ASSEMBLY__ */



# define _ASM_EXTABLE_HANDLE(from, to, handler)			\

	"ASM_EXTABLE_HANDLE from=" #from " to=" #to		\

	" handler=\"" #handler "\"\n\t"



/* For C file, we already have NOKPROBE_SYMBOL macro */



#endif /* __ASSEMBLY__ */



# define _ASM_EXTABLE(from, to)					\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_default)
@@ -161,7 +148,6 @@ 
	_ASM_PTR (entry);					\

	.popsection



#ifdef __ASSEMBLY__

.macro ALIGN_DESTINATION

	/* check for bad alignment of destination */

	movl %edi,%ecx
@@ -185,7 +171,34 @@ 
	_ASM_EXTABLE_UA(100b, 103b)

	_ASM_EXTABLE_UA(101b, 103b)

	.endm

#endif /* __ASSEMBLY__ */



#else

# define _EXPAND_EXTABLE_HANDLE(x) #x

# define _ASM_EXTABLE_HANDLE(from, to, handler)			\

	" .pushsection \"__ex_table\",\"a\"\n"			\

	" .balign 4\n"						\

	" .long (" #from ") - .\n"				\

	" .long (" #to ") - .\n"				\

	" .long (" _EXPAND_EXTABLE_HANDLE(handler) ") - .\n"	\

	" .popsection\n"



# define _ASM_EXTABLE(from, to)					\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_default)



# define _ASM_EXTABLE_UA(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_uaccess)



# define _ASM_EXTABLE_FAULT(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_fault)



# define _ASM_EXTABLE_EX(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_ext)



# define _ASM_EXTABLE_REFCOUNT(from, to)			\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_refcount)



/* For C file, we already have NOKPROBE_SYMBOL macro */

#endif



#ifndef __ASSEMBLY__

/*

arch/x86/kernel/macros.S

+0 −1
Original line number Diff line number Diff line
@@ -11,4 +11,3 @@ 
#include <asm/alternative-asm.h>

#include <asm/bug.h>

#include <asm/paravirt.h>
 
#include <asm/asm.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE