xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav 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
This commit is contained in:
Jiri Slaby
2019-10-11 13:50:59 +02:00
committed by Borislav Petkov
parent 78f44330d8
commit b4edca1501
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/entry/entry_32.S
View File

@@ -832,7 +832,7 @@ SYM_INNER_LABEL_ALIGN(resume_userspace, SYM_L_LOCAL)
jmp restore_all jmp restore_all
SYM_CODE_END(ret_from_exception) 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 * All code from here through __end_SYSENTER_singlestep_region is subject
* to being single-stepped if a user program sets TF and executes SYSENTER. * 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 pushl $X86_EFLAGS_FIXED
popfl popfl
jmp .Lsysenter_flags_fixed 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) ENDPROC(entry_SYSENTER_32)
/* /*

8
arch/x86/include/asm/linkage.h
View File

@@ -13,14 +13,6 @@
#ifdef __ASSEMBLY__ #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) #if defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)
#define __ALIGN .p2align 4, 0x90 #define __ALIGN .p2align 4, 0x90
#define __ALIGN_STR __stringify(__ALIGN) #define __ALIGN_STR __stringify(__ALIGN)

2
include/linux/linkage.h
View File

@@ -105,12 +105,14 @@
/* === DEPRECATED annotations === */ /* === DEPRECATED annotations === */
#ifndef CONFIG_X86
#ifndef GLOBAL #ifndef GLOBAL
/* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */ /* deprecated, use SYM_DATA*, SYM_ENTRY, or similar */
#define GLOBAL(name) \ #define GLOBAL(name) \
.globl name ASM_NL \ .globl name ASM_NL \
name: name:
#endif #endif
#endif
#ifndef ENTRY #ifndef ENTRY
/* deprecated, use SYM_FUNC_START */ /* deprecated, use SYM_FUNC_START */