From: Rohan McLure <rmclure@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Rohan McLure <rmclure@linux.ibm.com>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v3 09/18] powerpc: Enable compile-time check for syscall handlers
Date: Fri, 19 Aug 2022 13:37:57 +1000 [thread overview]
Message-ID: <20220819033806.162054-10-rmclure@linux.ibm.com> (raw)
In-Reply-To: <20220819033806.162054-1-rmclure@linux.ibm.com>
The table of syscall handlers and registered compatibility syscall
handlers has in past been produced using assembly, with function
references resolved at link time. This moves link-time errors to
compile-time, by rewriting systbl.S in C, and including the
linux/syscalls.h, linux/compat.h and asm/syscalls.h headers for
prototypes.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rohan McLure <rmclure@linux.ibm.com>
---
V1 -> V2: New patch.
---
arch/powerpc/kernel/{systbl.S => systbl.c} | 27 ++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.c
similarity index 59%
rename from arch/powerpc/kernel/systbl.S
rename to arch/powerpc/kernel/systbl.c
index cb3358886203..99ffdfef6b9c 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.c
@@ -10,31 +10,32 @@
* PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)
*/
-#include <asm/ppc_asm.h>
+#include <linux/syscalls.h>
+#include <linux/compat.h>
+#include <asm/unistd.h>
+#include <asm/syscalls.h>
-.section .rodata,"a"
+#define __SYSCALL_WITH_COMPAT(nr, entry, compat) __SYSCALL(nr, entry)
-#ifdef CONFIG_PPC64
- .p2align 3
-#define __SYSCALL(nr, entry) .8byte entry
+#ifdef CONFIG_ARCH_HAS_SYSCALL_WRAPPER
+#define __SYSCALL(nr, entry) [nr] = __powerpc_##entry,
+#define __powerpc_sys_ni_syscall sys_ni_syscall
#else
-#define __SYSCALL(nr, entry) .long entry
+#define __SYSCALL(nr, entry) [nr] = entry,
#endif
-#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native)
-.globl sys_call_table
-sys_call_table:
+void *sys_call_table[] = {
#ifdef CONFIG_PPC64
#include <asm/syscall_table_64.h>
#else
#include <asm/syscall_table_32.h>
#endif
+};
#ifdef CONFIG_COMPAT
#undef __SYSCALL_WITH_COMPAT
#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, compat)
-.globl compat_sys_call_table
-compat_sys_call_table:
-#define compat_sys_sigsuspend sys_sigsuspend
+void *compat_sys_call_table[] = {
#include <asm/syscall_table_32.h>
-#endif
+};
+#endif /* CONFIG_COMPAT */
--
2.34.1
next prev parent reply other threads:[~2022-08-19 3:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 3:37 [PATCH v3 00/18] powerpc: Syscall wrapper and register clearing Rohan McLure
2022-08-19 3:37 ` [PATCH v3 01/18] powerpc: Remove asmlinkage from syscall handler definitions Rohan McLure
2022-08-19 3:37 ` [PATCH v3 02/18] powerpc: Use generic fallocate compatibility syscall Rohan McLure
2022-08-19 3:37 ` [PATCH v3 03/18] powerpc/32: Remove powerpc select specialisation Rohan McLure
2022-08-19 3:37 ` [PATCH v3 04/18] powerpc: Provide do_ppc64_personality helper Rohan McLure
2022-08-19 3:37 ` [PATCH v3 05/18] powerpc: Adopt SYSCALL_DEFINE for arch-specific syscall handlers Rohan McLure
2022-08-19 6:41 ` Christophe Leroy
2022-08-19 3:37 ` [PATCH v3 06/18] powerpc: Remove direct call to personality syscall handler Rohan McLure
2022-08-19 3:37 ` [PATCH v3 07/18] powerpc: Remove direct call to mmap2 syscall handlers Rohan McLure
2022-08-19 6:41 ` Christophe Leroy
2022-08-19 3:37 ` [PATCH v3 08/18] powerpc: Include all arch-specific syscall prototypes Rohan McLure
2022-08-19 3:37 ` Rohan McLure [this message]
2022-08-19 3:37 ` [PATCH v3 10/18] powerpc: Use common syscall handler type Rohan McLure
2022-08-19 3:37 ` [PATCH v3 11/18] powerpc: Add ZEROIZE_GPRS macros for register clears Rohan McLure
2022-08-19 6:45 ` Christophe Leroy
2022-08-19 3:38 ` [PATCH v3 12/18] Revert "powerpc/syscall: Save r3 in regs->orig_r3" Rohan McLure
2022-08-19 3:38 ` [PATCH v3 13/18] powerpc: Provide syscall wrapper Rohan McLure
2022-08-19 3:38 ` [PATCH v3 14/18] powerpc/64s: Clear/restore caller gprs in syscall interrupt/return Rohan McLure
2022-08-19 6:52 ` Christophe Leroy
2022-08-22 3:47 ` Rohan McLure
2022-08-19 3:38 ` [PATCH v3 15/18] powerpc/64s: Use {ZEROIZE,SAVE,REST}_GPRS macros in sc, scv 0 handlers Rohan McLure
2022-08-19 3:38 ` [PATCH v3 16/18] powerpc/32: Clarify interrupt restores with REST_GPR macro in entry_32.S Rohan McLure
2022-08-19 6:29 ` Christophe Leroy
2022-08-19 3:38 ` [PATCH v3 17/18] powerpc/64s: Fix comment on interrupt handler prologue Rohan McLure
2022-08-19 3:38 ` [PATCH v3 18/18] powerpc/64s: Clear gprs on interrupt routine entry Rohan McLure
2022-08-19 7:41 ` Christophe Leroy
2022-08-24 1:24 ` Rohan McLure
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=20220819033806.162054-10-rmclure@linux.ibm.com \
--to=rmclure@linux.ibm.com \
--cc=arnd@arndb.de \
--cc=linuxppc-dev@lists.ozlabs.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;
as well as URLs for NNTP newsgroup(s).