Commit 26ba4e57 authored by Jiri Slaby's avatar Jiri Slaby Committed by Borislav Petkov
Browse files

x86/asm: Use SYM_INNER_LABEL instead of GLOBAL 



The GLOBAL macro had several meanings and is going away. Convert all the
inner function labels marked with GLOBAL to use SYM_INNER_LABEL instead.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-arch@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191011115108.12392-18-jslaby@suse.cz
parent 37818afd

arch/x86/entry/entry_64.S

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ ENTRY(entry_SYSCALL_64) 
	pushq	%r11					/* pt_regs->flags */

	pushq	$__USER_CS				/* pt_regs->cs */

	pushq	%rcx					/* pt_regs->ip */

GLOBAL(entry_SYSCALL_64_after_hwframe)

SYM_INNER_LABEL(entry_SYSCALL_64_after_hwframe, SYM_L_GLOBAL)

	pushq	%rax					/* pt_regs->orig_ax */



	PUSH_AND_CLEAR_REGS rax=$-ENOSYS
@@ -621,7 +621,7 @@ ret_from_intr: 
	call	prepare_exit_to_usermode

	TRACE_IRQS_IRETQ



GLOBAL(swapgs_restore_regs_and_return_to_usermode)

SYM_INNER_LABEL(swapgs_restore_regs_and_return_to_usermode, SYM_L_GLOBAL)

#ifdef CONFIG_DEBUG_ENTRY

	/* Assert that pt_regs indicates user mode. */

	testb	$3, CS(%rsp)
@@ -679,7 +679,7 @@ retint_kernel: 
	 */

	TRACE_IRQS_IRETQ



GLOBAL(restore_regs_and_return_to_kernel)

SYM_INNER_LABEL(restore_regs_and_return_to_kernel, SYM_L_GLOBAL)

#ifdef CONFIG_DEBUG_ENTRY

	/* Assert that pt_regs indicates kernel mode. */

	testb	$3, CS(%rsp)

arch/x86/entry/entry_64_compat.S

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ ENTRY(entry_SYSENTER_compat) 
	pushq	$X86_EFLAGS_FIXED

	popfq

	jmp	.Lsysenter_flags_fixed

GLOBAL(__end_entry_SYSENTER_compat)

SYM_INNER_LABEL(__end_entry_SYSENTER_compat, SYM_L_GLOBAL)

ENDPROC(entry_SYSENTER_compat)



/*
@@ -215,7 +215,7 @@ ENTRY(entry_SYSCALL_compat) 
	pushq	%r11			/* pt_regs->flags */

	pushq	$__USER32_CS		/* pt_regs->cs */

	pushq	%rcx			/* pt_regs->ip */

GLOBAL(entry_SYSCALL_compat_after_hwframe)

SYM_INNER_LABEL(entry_SYSCALL_compat_after_hwframe, SYM_L_GLOBAL)

	movl	%eax, %eax		/* discard orig_ax high bits */

	pushq	%rax			/* pt_regs->orig_ax */

	pushq	%rdi			/* pt_regs->di */

arch/x86/entry/vdso/vdso32/system_call.S

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ __kernel_vsyscall: 


	/* Enter using int $0x80 */

	int	$0x80

GLOBAL(int80_landing_pad)

SYM_INNER_LABEL(int80_landing_pad, SYM_L_GLOBAL)



	/*

	 * Restore EDX and ECX in case they were clobbered.  EBP is not

arch/x86/kernel/ftrace_32.S

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ ENTRY(ftrace_regs_caller) 
	movl	function_trace_op, %ecx	# 3rd argument: ftrace_pos

	pushl	%esp			# 4th argument: pt_regs



GLOBAL(ftrace_regs_call)

SYM_INNER_LABEL(ftrace_regs_call, SYM_L_GLOBAL)

	call	ftrace_stub



	addl	$4, %esp		# skip 4th argument

arch/x86/kernel/ftrace_64.S

+8 −8
Original line number Diff line number Diff line
@@ -140,14 +140,14 @@ ENTRY(ftrace_caller) 
	/* save_mcount_regs fills in first two parameters */

	save_mcount_regs



GLOBAL(ftrace_caller_op_ptr)

SYM_INNER_LABEL(ftrace_caller_op_ptr, SYM_L_GLOBAL)

	/* Load the ftrace_ops into the 3rd parameter */

	movq function_trace_op(%rip), %rdx



	/* regs go into 4th parameter (but make it NULL) */

	movq $0, %rcx



GLOBAL(ftrace_call)

SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL)

	call ftrace_stub



	restore_mcount_regs
@@ -157,10 +157,10 @@ GLOBAL(ftrace_call) 
	 * think twice before adding any new code or changing the

	 * layout here.

	 */

GLOBAL(ftrace_epilogue)

SYM_INNER_LABEL(ftrace_epilogue, SYM_L_GLOBAL)



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

GLOBAL(ftrace_graph_call)

SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)

	jmp ftrace_stub

#endif
@@ -180,7 +180,7 @@ ENTRY(ftrace_regs_caller) 
	save_mcount_regs 8

	/* save_mcount_regs fills in first two parameters */



GLOBAL(ftrace_regs_caller_op_ptr)

SYM_INNER_LABEL(ftrace_regs_caller_op_ptr, SYM_L_GLOBAL)

	/* Load the ftrace_ops into the 3rd parameter */

	movq function_trace_op(%rip), %rdx
@@ -209,7 +209,7 @@ GLOBAL(ftrace_regs_caller_op_ptr) 
	/* regs go into 4th parameter */

	leaq (%rsp), %rcx



GLOBAL(ftrace_regs_call)

SYM_INNER_LABEL(ftrace_regs_call, SYM_L_GLOBAL)

	call ftrace_stub



	/* Copy flags back to SS, to restore them */
@@ -239,7 +239,7 @@ GLOBAL(ftrace_regs_call) 
	 * The trampoline will add the code to jump

	 * to the return.

	 */

GLOBAL(ftrace_regs_caller_end)

SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL)



	jmp ftrace_epilogue
@@ -261,7 +261,7 @@ fgraph_trace: 
	jnz ftrace_graph_caller

#endif



GLOBAL(ftrace_stub)

SYM_INNER_LABEL(ftrace_stub, SYM_L_GLOBAL)

	retq



trace:

CRA Git | Maintained and supported by SUSTech CRA and CCSE