| Message ID | 20190913125550.7053-1-mark.rutland@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ce87de45b3243d7023e8a4a76ba004002a7ec087 |
| Headers | show |
| Series | arm64: simplify syscall wrapper ifdeffery | expand |
On Fri, Sep 13, 2019 at 01:55:50PM +0100, Mark Rutland wrote: > Back in commit: > > 4378a7d4be30ec69 ("arm64: implement syscall wrappers") > > ... I implemented the arm64 syscall wrapper glue following the approach > taken on x86. While doing so, I also copied across some ifdeffery that > isn't necessary on arm64. > > On arm64 we don't share any of the native wrappers with compat tasks, > and unlike x86 we don't have alternative implementations of > SYSCALL_DEFINE0(), COND_SYSCALL(), or SYS_NI() defined when AArch32 > compat support is enabled. > > Thus we don't need to prevent multiple definitions of these macros, and > can remove the #ifndef ... #endif guards protecting them. If any of > these had been previously defined elsewhere, syscalls are unlikely to > work correctly, and we'd want the compiler to warn about the multiple > definitions. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > --- > arch/arm64/include/asm/syscall_wrapper.h | 6 ------ > 1 file changed, 6 deletions(-) Acked-by: Will Deacon <will@kernel.org> Will
On Fri, Sep 13, 2019 at 01:55:50PM +0100, Mark Rutland wrote: > Back in commit: > > 4378a7d4be30ec69 ("arm64: implement syscall wrappers") > > ... I implemented the arm64 syscall wrapper glue following the approach > taken on x86. While doing so, I also copied across some ifdeffery that > isn't necessary on arm64. > > On arm64 we don't share any of the native wrappers with compat tasks, > and unlike x86 we don't have alternative implementations of > SYSCALL_DEFINE0(), COND_SYSCALL(), or SYS_NI() defined when AArch32 > compat support is enabled. > > Thus we don't need to prevent multiple definitions of these macros, and > can remove the #ifndef ... #endif guards protecting them. If any of > these had been previously defined elsewhere, syscalls are unlikely to > work correctly, and we'd want the compiler to warn about the multiple > definitions. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> Queued for 5.5. Thanks.
diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h index 06d880b3526c..b383b4802a7b 100644 --- a/arch/arm64/include/asm/syscall_wrapper.h +++ b/arch/arm64/include/asm/syscall_wrapper.h @@ -66,24 +66,18 @@ struct pt_regs; } \ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) -#ifndef SYSCALL_DEFINE0 #define SYSCALL_DEFINE0(sname) \ SYSCALL_METADATA(_##sname, 0); \ asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \ ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused) -#endif -#ifndef COND_SYSCALL #define COND_SYSCALL(name) \ asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs) \ { \ return sys_ni_syscall(); \ } -#endif -#ifndef SYS_NI #define SYS_NI(name) SYSCALL_ALIAS(__arm64_sys_##name, sys_ni_posix_timers); -#endif #endif /* __ASM_SYSCALL_WRAPPER_H */
Back in commit: 4378a7d4be30ec69 ("arm64: implement syscall wrappers") ... I implemented the arm64 syscall wrapper glue following the approach taken on x86. While doing so, I also copied across some ifdeffery that isn't necessary on arm64. On arm64 we don't share any of the native wrappers with compat tasks, and unlike x86 we don't have alternative implementations of SYSCALL_DEFINE0(), COND_SYSCALL(), or SYS_NI() defined when AArch32 compat support is enabled. Thus we don't need to prevent multiple definitions of these macros, and can remove the #ifndef ... #endif guards protecting them. If any of these had been previously defined elsewhere, syscalls are unlikely to work correctly, and we'd want the compiler to warn about the multiple definitions. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> --- arch/arm64/include/asm/syscall_wrapper.h | 6 ------ 1 file changed, 6 deletions(-) Hi Will, Catalin, This is based on Sami's patch [1] implementing a type-safe COND_SYSCALL on arm64. I've given both a spin atop of today's arm64 for-next/core branch. Mark. [1] https://lore.kernel.org/r/20190910224044.100388-1-samitolvanen@google.com