Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

um: Always inline stub functions

Browse Source 
The stub executable page is remapped to a different location in the
userland process. As these functions may be used by the stub, they
really need to be always inlined rather than permitting the compiler to
emit a function.

Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Benjamin Berg 2023-11-10 12:03:45 +01:00 committed by Richard Weinberger
parent 6d64095ea8
commit 7b84543cbd
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86/um/shared/sysdep/stub_32.h
View File

@ -12,7 +12,7 @@
#define STUB_MMAP_NR __NR_mmap2 #define STUB_MMAP_NR __NR_mmap2
#define MMAP_OFFSET(o) ((o) >> UM_KERN_PAGE_SHIFT) #define MMAP_OFFSET(o) ((o) >> UM_KERN_PAGE_SHIFT)
static inline long stub_syscall0(long syscall) static __always_inline long stub_syscall0(long syscall)
{ {
long ret; long ret;
@ -21,7 +21,7 @@ static inline long stub_syscall0(long syscall)
return ret; return ret;
} }
static inline long stub_syscall1(long syscall, long arg1) static __always_inline long stub_syscall1(long syscall, long arg1)
{ {
long ret; long ret;
@ -30,7 +30,7 @@ static inline long stub_syscall1(long syscall, long arg1)
return ret; return ret;
} }
static inline long stub_syscall2(long syscall, long arg1, long arg2) static __always_inline long stub_syscall2(long syscall, long arg1, long arg2)
{ {
long ret; long ret;
@ -40,7 +40,8 @@ static inline long stub_syscall2(long syscall, long arg1, long arg2)
return ret; return ret;
} }
static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3) static __always_inline long stub_syscall3(long syscall, long arg1, long arg2,
long arg3)
{ {
long ret; long ret;
@ -50,8 +51,8 @@ static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3)
return ret; return ret;
} }
static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3, static __always_inline long stub_syscall4(long syscall, long arg1, long arg2,
long arg4) long arg3, long arg4)
{ {
long ret; long ret;
@ -61,8 +62,8 @@ static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3,
return ret; return ret;
} }
static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3, static __always_inline long stub_syscall5(long syscall, long arg1, long arg2,
long arg4, long arg5) long arg3, long arg4, long arg5)
{ {
long ret; long ret;
@ -72,12 +73,12 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
return ret; return ret;
} }
static inline void trap_myself(void) static __always_inline void trap_myself(void)
{ {
__asm("int3"); __asm("int3");
} }
static inline void remap_stack_and_trap(void) static __always_inline void remap_stack_and_trap(void)
{ {
__asm__ volatile ( __asm__ volatile (
"movl %%esp,%%ebx ;" "movl %%esp,%%ebx ;"

17
arch/x86/um/shared/sysdep/stub_64.h
View File

@ -16,7 +16,7 @@
#define __syscall_clobber "r11","rcx","memory" #define __syscall_clobber "r11","rcx","memory"
#define __syscall "syscall" #define __syscall "syscall"
static inline long stub_syscall0(long syscall) static __always_inline long stub_syscall0(long syscall)
{ {
long ret; long ret;
@ -27,7 +27,7 @@ static inline long stub_syscall0(long syscall)
return ret; return ret;
} }
static inline long stub_syscall2(long syscall, long arg1, long arg2) static __always_inline long stub_syscall2(long syscall, long arg1, long arg2)
{ {
long ret; long ret;
@ -38,7 +38,8 @@ static inline long stub_syscall2(long syscall, long arg1, long arg2)
return ret; return ret;
} }
static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3) static __always_inline long stub_syscall3(long syscall, long arg1, long arg2,
long arg3)
{ {
long ret; long ret;
@ -50,7 +51,7 @@ static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3)
return ret; return ret;
} }
static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3, static __always_inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3,
long arg4) long arg4)
{ {
long ret; long ret;
@ -64,8 +65,8 @@ static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3,
return ret; return ret;
} }
static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3, static __always_inline long stub_syscall5(long syscall, long arg1, long arg2,
long arg4, long arg5) long arg3, long arg4, long arg5)
{ {
long ret; long ret;
@ -78,12 +79,12 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
return ret; return ret;
} }
static inline void trap_myself(void) static __always_inline void trap_myself(void)
{ {
__asm("int3"); __asm("int3");
} }
static inline void remap_stack_and_trap(void) static __always_inline void remap_stack_and_trap(void)
{ {
__asm__ volatile ( __asm__ volatile (
"movq %0,%%rax ;" "movq %0,%%rax ;"