From: Brian Gerst <brgerst@gmail.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Dominik Brodowski <linux@dominikbrodowski.net>,
Brian Gerst <brgerst@gmail.com>
Subject: [PATCH v2 1/8] x86, syscalls: Refactor SYSCALL_DEFINEx macros
Date: Mon, 24 Feb 2020 13:17:50 -0500 [thread overview]
Message-ID: <20200224181757.724961-2-brgerst@gmail.com> (raw)
In-Reply-To: <20200224181757.724961-1-brgerst@gmail.com>
Pull the common code out from the SYSCALL_DEFINEx macros into a new
__SYS_STUBx macro. Also conditionalize the X64 version in preparation for
enabling syscall wrappers on 32-bit native kernels.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/syscall_wrapper.h | 86 ++++++++++++++------------
1 file changed, 45 insertions(+), 41 deletions(-)
diff --git a/arch/x86/include/asm/syscall_wrapper.h b/arch/x86/include/asm/syscall_wrapper.h
index e2389ce9bf58..44ed358a2e3c 100644
--- a/arch/x86/include/asm/syscall_wrapper.h
+++ b/arch/x86/include/asm/syscall_wrapper.h
@@ -21,6 +21,22 @@ struct pt_regs;
,,(unsigned int)regs->dx,,(unsigned int)regs->si \
,,(unsigned int)regs->di,,(unsigned int)regs->bp)
+#define __SYS_STUBx(abi, name, ...) \
+ asmlinkage long __##abi##_##name(const struct pt_regs *regs); \
+ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \
+ asmlinkage long __##abi##_##name(const struct pt_regs *regs) \
+ { \
+ return __se_##name(__VA_ARGS__); \
+ }
+
+#ifdef CONFIG_X86_64
+#define __X64_SYS_STUBx(x, sys_name, ...) \
+ __SYS_STUBx(x64, sys_name, \
+ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))
+#else /* CONFIG_X86_64 */
+#define __X64_SYS_STUBx(x, sys_name, ...)
+#endif /* CONFIG_X86_64 */
+
#ifdef CONFIG_IA32_EMULATION
/*
* For IA32 emulation, we need to handle "compat" syscalls *and* create
@@ -38,21 +54,13 @@ struct pt_regs;
return __se_compat_sys_##name(); \
}
-#define __IA32_COMPAT_SYS_STUBx(x, name, ...) \
- asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs);\
- ALLOW_ERROR_INJECTION(__ia32_compat_sys##name, ERRNO); \
- asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs)\
- { \
- return __se_compat_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\
- }
+#define __IA32_COMPAT_SYS_STUBx(x, compat_sys_name, ...) \
+ __SYS_STUBx(ia32, compat_sys_name, \
+ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))
-#define __IA32_SYS_STUBx(x, name, ...) \
- asmlinkage long __ia32_sys##name(const struct pt_regs *regs); \
- ALLOW_ERROR_INJECTION(__ia32_sys##name, ERRNO); \
- asmlinkage long __ia32_sys##name(const struct pt_regs *regs) \
- { \
- return __se_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\
- }
+#define __IA32_SYS_STUBx(x, sys_name, ...) \
+ __SYS_STUBx(ia32, sys_name, \
+ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))
/*
* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
@@ -81,8 +89,8 @@ struct pt_regs;
SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)
#else /* CONFIG_IA32_EMULATION */
-#define __IA32_COMPAT_SYS_STUBx(x, name, ...)
-#define __IA32_SYS_STUBx(x, fullname, name, ...)
+#define __IA32_COMPAT_SYS_STUBx(x, compat_sys_name, ...)
+#define __IA32_SYS_STUBx(x, sys_name, ...)
#endif /* CONFIG_IA32_EMULATION */
@@ -100,17 +108,13 @@ struct pt_regs;
return __se_compat_sys_##name();\
}
-#define __X32_COMPAT_SYS_STUBx(x, name, ...) \
- asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs);\
- ALLOW_ERROR_INJECTION(__x32_compat_sys##name, ERRNO); \
- asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs)\
- { \
- return __se_compat_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\
- }
+#define __X32_COMPAT_SYS_STUBx(x, compat_sys_name, ...) \
+ __SYS_STUBx(x32, compat_sys_name, \
+ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))
#else /* CONFIG_X86_X32 */
#define __X32_COMPAT_SYS_STUB0(x, name)
-#define __X32_COMPAT_SYS_STUBx(x, name, ...)
+#define __X32_COMPAT_SYS_STUBx(x, compat_sys_name, ...)
#endif /* CONFIG_X86_X32 */
@@ -131,16 +135,21 @@ struct pt_regs;
} \
static inline long __do_compat_sys_##name(void)
-#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
- static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
- static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
- __IA32_COMPAT_SYS_STUBx(x, name, __VA_ARGS__) \
- __X32_COMPAT_SYS_STUBx(x, name, __VA_ARGS__) \
- static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
- { \
- return __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__));\
- } \
- static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
+ static long \
+ __se_compat_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)); \
+ static inline long \
+ __do_compat_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__)); \
+ __IA32_COMPAT_SYS_STUBx(x, compat_sys##name, __VA_ARGS__) \
+ __X32_COMPAT_SYS_STUBx(x, compat_sys##name, __VA_ARGS__) \
+ static long \
+ __se_compat_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)) \
+ { \
+ return __do_compat_sys##name( \
+ __MAP(x, __SC_DELOUSE, __VA_ARGS__)); \
+ } \
+ static inline long \
+ __do_compat_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__))
/*
* As some compat syscalls may not be implemented, we need to expand
@@ -192,15 +201,10 @@ struct pt_regs;
* to the i386 calling convention (bx, cx, dx, si, di, bp).
*/
#define __SYSCALL_DEFINEx(x, name, ...) \
- asmlinkage long __x64_sys##name(const struct pt_regs *regs); \
- ALLOW_ERROR_INJECTION(__x64_sys##name, ERRNO); \
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
- asmlinkage long __x64_sys##name(const struct pt_regs *regs) \
- { \
- return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\
- } \
- __IA32_SYS_STUBx(x, name, __VA_ARGS__) \
+ __X64_SYS_STUBx(x, sys##name, __VA_ARGS__) \
+ __IA32_SYS_STUBx(x, sys##name, __VA_ARGS__) \
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
{ \
long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));\
--
2.24.1
next prev parent reply other threads:[~2020-02-24 18:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 18:17 [PATCH v2 0/8] Enable pt_regs based syscalls for x86-32 native Brian Gerst
2020-02-24 18:17 ` Brian Gerst [this message]
2020-02-25 19:42 ` [PATCH v2 1/8] x86, syscalls: Refactor SYSCALL_DEFINEx macros Dominik Brodowski
2020-02-24 18:17 ` [PATCH v2 2/8] x86, syscalls: Refactor SYSCALL_DEFINE0 macros Brian Gerst
2020-02-25 19:47 ` Dominik Brodowski
2020-02-24 18:17 ` [PATCH v2 3/8] x86, syscalls: Refactor COND_SYSCALL macros Brian Gerst
2020-02-25 19:49 ` Dominik Brodowski
2020-02-24 18:17 ` [PATCH v2 4/8] x86, syscalls: Refactor SYS_NI macros Brian Gerst
2020-02-25 21:11 ` Dominik Brodowski
2020-02-24 18:17 ` [PATCH v2 5/8] x86: Move 32-bit compat syscalls to common location Brian Gerst
2020-02-25 21:18 ` Dominik Brodowski
2020-02-24 18:17 ` [PATCH v2 6/8] x86-32: Enable syscall wrappers Brian Gerst
2020-02-24 18:17 ` [PATCH v2 7/8] x86-64: Use syscall wrappers for x32_rt_sigreturn Brian Gerst
2020-02-24 18:17 ` [PATCH v2 8/8] x86: Drop asmlinkage from syscalls Brian Gerst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224181757.724961-2-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome