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

x86/asm: Remove the last GLOBAL user and remove the macro 



Convert the remaining 32bit users and remove the GLOBAL macro finally.
In particular, this means to use SYM_ENTRY for the singlestepping hack
region.

Exclude the global definition of GLOBAL from x86 too.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-arch@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191011115108.12392-20-jslaby@suse.cz
parent 78f44330

arch/x86/entry/entry_32.S

+2 −2
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ SYM_INNER_LABEL_ALIGN(resume_userspace, SYM_L_LOCAL) 
	jmp	restore_all

SYM_CODE_END(ret_from_exception)



GLOBAL(__begin_SYSENTER_singlestep_region)

SYM_ENTRY(__begin_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE)

/*

 * All code from here through __end_SYSENTER_singlestep_region is subject

 * to being single-stepped if a user program sets TF and executes SYSENTER.
@@ -1011,7 +1011,7 @@ ENTRY(entry_SYSENTER_32) 
	pushl	$X86_EFLAGS_FIXED

	popfl

	jmp	.Lsysenter_flags_fixed

GLOBAL(__end_SYSENTER_singlestep_region)

SYM_ENTRY(__end_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE)

ENDPROC(entry_SYSENTER_32)



/*

arch/x86/include/asm/linkage.h

+0 −8
Original line number Diff line number Diff line
@@ -13,14 +13,6 @@ 


#ifdef __ASSEMBLY__



/*

 * GLOBAL is DEPRECATED

 *

 * use SYM_DATA_START, SYM_FUNC_START, SYM_INNER_LABEL, SYM_CODE_START, or

 * similar

 */

#define GLOBAL(name)	SYM_ENTRY(name, SYM_L_GLOBAL, SYM_A_NONE)



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)

#define __ALIGN		.p2align 4, 0x90

#define __ALIGN_STR	__stringify(__ALIGN)

include/linux/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -105,12 +105,14 @@ 


/* === DEPRECATED annotations === */



#ifndef CONFIG_X86

#ifndef GLOBAL

/* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */

#define GLOBAL(name) \

	.globl name ASM_NL \

	name:

#endif

#endif



#ifndef ENTRY

/* deprecated, use SYM_FUNC_START */

CRA Git | Maintained and supported by SUSTech CRA and CCSE