linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, will.deacon@arm.com
Cc: catalin.marinas@arm.com, dave.martin@arm.com, hch@infradead.org,
	james.morse@arm.com, linux@dominikbrodowski.net,
	linux-fsdevel@vger.kernel.org, marc.zyngier@arm.com,
	mark.rutland@arm.com, viro@zeniv.linux.org.uk
Subject: [PATCHv5 07/21] arm64: introduce syscall_fn_t
Date: Wed, 11 Jul 2018 14:56:42 +0100	[thread overview]
Message-ID: <20180711135656.20670-8-mark.rutland@arm.com> (raw)
In-Reply-To: <20180711135656.20670-1-mark.rutland@arm.com>

In preparation for invoking arbitrary syscalls from C code, let's define
a type for an arbitrary syscall, matching the parameter passing rules of
the AAPCS.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/syscall.h | 6 +++++-
 arch/arm64/kernel/sys.c          | 8 +++++---
 arch/arm64/kernel/sys32.c        | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index 709a574468f0..50841cb1bfa9 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -20,7 +20,11 @@
 #include <linux/compat.h>
 #include <linux/err.h>
 
-extern const void *sys_call_table[];
+typedef long (*syscall_fn_t)(unsigned long, unsigned long,
+			     unsigned long, unsigned long,
+			     unsigned long, unsigned long);
+
+extern const syscall_fn_t sys_call_table[];
 
 static inline int syscall_get_nr(struct task_struct *task,
 				 struct pt_regs *regs)
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index 31045f3fed92..7f0907261269 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -25,7 +25,9 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/syscalls.h>
+
 #include <asm/cpufeature.h>
+#include <asm/syscall.h>
 
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
 			 unsigned long prot, unsigned long flags,
@@ -52,13 +54,13 @@ asmlinkage long sys_rt_sigreturn(void);
 #define sys_personality		sys_arm64_personality
 
 #undef __SYSCALL
-#define __SYSCALL(nr, sym)	[nr] = sym,
+#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)sym,
 
 /*
  * The sys_call_table array must be 4K aligned to be accessible from
  * kernel/entry.S.
  */
-void * const sys_call_table[__NR_syscalls] __aligned(4096) = {
-	[0 ... __NR_syscalls - 1] = sys_ni_syscall,
+const syscall_fn_t sys_call_table[__NR_syscalls] __aligned(4096) = {
+	[0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
 #include <asm/unistd.h>
 };
diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c
index 1ef103c95410..d993214118aa 100644
--- a/arch/arm64/kernel/sys32.c
+++ b/arch/arm64/kernel/sys32.c
@@ -25,6 +25,8 @@
 #include <linux/compiler.h>
 #include <linux/syscalls.h>
 
+#include <asm/syscall.h>
+
 asmlinkage long compat_sys_sigreturn(void);
 asmlinkage long compat_sys_rt_sigreturn(void);
 asmlinkage long compat_sys_statfs64_wrapper(void);
@@ -40,13 +42,13 @@ asmlinkage long compat_sys_fallocate_wrapper(void);
 asmlinkage long compat_sys_mmap2_wrapper(void);
 
 #undef __SYSCALL
-#define __SYSCALL(nr, sym)	[nr] = sym,
+#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)sym,
 
 /*
  * The sys_call_table array must be 4K aligned to be accessible from
  * kernel/entry.S.
  */
-void * const compat_sys_call_table[__NR_compat_syscalls] __aligned(4096) = {
-	[0 ... __NR_compat_syscalls - 1] = sys_ni_syscall,
+const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] __aligned(4096) = {
+	[0 ... __NR_compat_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
 #include <asm/unistd32.h>
 };
-- 
2.11.0

  parent reply	other threads:[~2018-07-11 14:01 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-11 13:56 [PATCHv5 00/21] arm64: invoke syscalls with pt_regs Mark Rutland
2018-07-11 13:56 ` [PATCHv5 01/21] arm64: consistently use unsigned long for thread flags Mark Rutland
2018-07-11 13:56 ` [PATCHv5 02/21] arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> Mark Rutland
2018-07-11 13:56 ` [PATCHv5 03/21] arm64: kill config_sctlr_el1() Mark Rutland
2018-07-11 13:56 ` [PATCHv5 04/21] arm64: kill change_cpacr() Mark Rutland
2018-07-11 13:56 ` [PATCHv5 05/21] arm64: move sve_user_{enable,disable} to <asm/fpsimd.h> Mark Rutland
2018-07-11 13:56 ` [PATCHv5 06/21] arm64: remove sigreturn wrappers Mark Rutland
2018-07-11 13:56 ` Mark Rutland [this message]
2018-07-11 13:56 ` [PATCHv5 08/21] arm64: convert raw syscall invocation to C Mark Rutland
2018-07-11 13:56 ` [PATCHv5 09/21] arm64: convert syscall trace logic " Mark Rutland
2018-07-11 13:56 ` [PATCHv5 10/21] arm64: convert native/compat syscall entry " Mark Rutland
2018-07-11 13:56 ` [PATCHv5 11/21] arm64: don't restore GPRs when context tracking Mark Rutland
2018-07-11 13:56 ` [PATCHv5 12/21] arm64: don't reload GPRs after apply_ssbd Mark Rutland
2018-07-11 13:56 ` [PATCHv5 13/21] arm64: zero GPRs upon entry from EL0 Mark Rutland
2018-07-11 13:56 ` [PATCHv5 14/21] arm64: drop alignment from syscall tables Mark Rutland
2018-07-11 13:56 ` [PATCHv5 15/21] kernel: add ksys_personality() Mark Rutland
2018-07-11 13:56 ` [PATCHv5 16/21] kernel: add kcompat_sys_{f,}statfs64() Mark Rutland
2018-07-11 13:56 ` [PATCHv5 17/21] arm64: remove in-kernel call to sys_personality() Mark Rutland
2018-07-11 13:56 ` [PATCHv5 18/21] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Mark Rutland
2018-07-11 13:56 ` [PATCHv5 19/21] arm64: use SYSCALL_DEFINE6() for mmap Mark Rutland
2018-07-11 13:56 ` [PATCHv5 20/21] arm64: convert compat wrappers to C Mark Rutland
2018-07-11 13:56 ` [PATCHv5 21/21] arm64: implement syscall wrappers Mark Rutland

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=20180711135656.20670-8-mark.rutland@arm.com \
    --to=mark.rutland@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=dave.martin@arm.com \
    --cc=hch@infradead.org \
    --cc=james.morse@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    --cc=marc.zyngier@arm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will.deacon@arm.com \
    /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;
as well as URLs for NNTP newsgroup(s).