From: "tip-bot2 for Brian Gerst" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Sohil Mehta <sohil.mehta@intel.com>,
Andy Lutomirski <luto@kernel.org>,
Juergen Gross <jgross@suse.com>, "H. Peter Anvin" <hpa@zytor.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cpu] x86/syscall/x32: Move the x32 syscall table to arch/x86/entry/syscall_64.c
Date: Fri, 14 Mar 2025 09:46:57 -0000 [thread overview]
Message-ID: <174194561771.14745.16285783829573376460.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250313182236.655724-5-brgerst@gmail.com>
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 8b24877200a8d3c01d67b968dfbe58228909cc1b
Gitweb: https://git.kernel.org/tip/8b24877200a8d3c01d67b968dfbe58228909cc1b
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Thu, 13 Mar 2025 14:22:35 -04:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 14 Mar 2025 10:32:51 +01:00
x86/syscall/x32: Move the x32 syscall table to arch/x86/entry/syscall_64.c
Since commit:
2e958a8a510d ("x86/entry/x32: Rename __x32_compat_sys_* to __x64_compat_sys_*")
the ABI prefix for x32 syscalls is the same as native 64-bit
syscalls. Move the x32 syscall table to syscall_64.c
No functional changes.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20250313182236.655724-5-brgerst@gmail.com
---
arch/x86/entry/Makefile | 1 -
arch/x86/entry/syscall_64.c | 13 +++++++++++++
arch/x86/entry/syscall_x32.c | 25 -------------------------
3 files changed, 13 insertions(+), 26 deletions(-)
delete mode 100644 arch/x86/entry/syscall_x32.c
diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index 5fd28ab..e870f8a 100644
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
@@ -27,4 +27,3 @@ CFLAGS_REMOVE_entry_fred.o += -pg $(CC_FLAGS_FTRACE)
obj-$(CONFIG_X86_FRED) += entry_64_fred.o entry_fred.o
obj-$(CONFIG_IA32_EMULATION) += entry_64_compat.o syscall_32.o
-obj-$(CONFIG_X86_X32_ABI) += syscall_x32.o
diff --git a/arch/x86/entry/syscall_64.c b/arch/x86/entry/syscall_64.c
index 9e0ba33..b96f562 100644
--- a/arch/x86/entry/syscall_64.c
+++ b/arch/x86/entry/syscall_64.c
@@ -19,6 +19,9 @@
#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);
#define __SYSCALL_NORETURN(nr, sym) extern long __noreturn __x64_##sym(const struct pt_regs *);
#include <asm/syscalls_64.h>
+#ifdef CONFIG_X86_X32_ABI
+#include <asm/syscalls_x32.h>
+#endif
#undef __SYSCALL
#undef __SYSCALL_NORETURN
@@ -44,6 +47,16 @@ long x64_sys_call(const struct pt_regs *regs, unsigned int nr)
}
};
+#ifdef CONFIG_X86_X32_ABI
+long x32_sys_call(const struct pt_regs *regs, unsigned int nr)
+{
+ switch (nr) {
+ #include <asm/syscalls_x32.h>
+ default: return __x64_sys_ni_syscall(regs);
+ }
+};
+#endif
+
static __always_inline bool do_syscall_x64(struct pt_regs *regs, int nr)
{
/*
diff --git a/arch/x86/entry/syscall_x32.c b/arch/x86/entry/syscall_x32.c
deleted file mode 100644
index fb77908..0000000
--- a/arch/x86/entry/syscall_x32.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* System call table for x32 ABI. */
-
-#include <linux/linkage.h>
-#include <linux/sys.h>
-#include <linux/cache.h>
-#include <linux/syscalls.h>
-#include <asm/syscall.h>
-
-#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);
-#define __SYSCALL_NORETURN(nr, sym) extern long __noreturn __x64_##sym(const struct pt_regs *);
-#include <asm/syscalls_x32.h>
-#undef __SYSCALL
-
-#undef __SYSCALL_NORETURN
-#define __SYSCALL_NORETURN __SYSCALL
-
-#define __SYSCALL(nr, sym) case nr: return __x64_##sym(regs);
-long x32_sys_call(const struct pt_regs *regs, unsigned int nr)
-{
- switch (nr) {
- #include <asm/syscalls_x32.h>
- default: return __x64_sys_ni_syscall(regs);
- }
-};
next prev parent reply other threads:[~2025-03-14 9:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 18:22 [PATCH 0/5] x86/entry: Break up common.c Brian Gerst
2025-03-13 18:22 ` [PATCH 1/5] x86/xen: Move Xen upcall handler Brian Gerst
2025-03-14 7:37 ` Juergen Gross
2025-03-14 9:47 ` [tip: x86/cpu] x86/xen: Move Xen upcall handler to Xen specific code files tip-bot2 for Brian Gerst
2025-03-14 9:53 ` Jürgen Groß
2025-03-14 10:08 ` Ingo Molnar
2025-03-14 10:14 ` Jürgen Groß
2025-03-13 18:22 ` [PATCH 2/5] x86/syscall/32: Move 32-bit syscall dispatch code Brian Gerst
2025-03-13 23:44 ` Sohil Mehta
2025-03-14 1:25 ` Brian Gerst
2025-03-14 9:27 ` Ingo Molnar
2025-03-14 9:46 ` [tip: x86/cpu] x86/syscall/32: Move the 32-bit syscall dispatch code to arch/x86/entry/syscall_32.c tip-bot2 for Brian Gerst
2025-03-13 18:22 ` [PATCH 3/5] x86/syscall/64: Move 64-bit syscall dispatch code Brian Gerst
2025-03-14 9:46 ` [tip: x86/cpu] x86/syscall/64: Move the 64-bit syscall dispatch code to arch/x86/entry/syscall_64.c tip-bot2 for Brian Gerst
2025-03-13 18:22 ` [PATCH 4/5] x86/syscall/x32: Move x32 syscall table Brian Gerst
2025-03-13 23:47 ` Sohil Mehta
2025-03-14 9:25 ` Ingo Molnar
2025-03-14 9:34 ` Ingo Molnar
2025-03-14 16:02 ` Sohil Mehta
2025-03-14 9:46 ` tip-bot2 for Brian Gerst [this message]
2025-03-13 18:22 ` [PATCH 5/5] x86/syscall: Move sys_ni_syscall() Brian Gerst
2025-03-14 9:46 ` [tip: x86/cpu] x86/syscall: Move sys_ni_syscall() to arch/x86/kernel/process.c tip-bot2 for 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=174194561771.14745.16285783829573376460.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=sohil.mehta@intel.com \
--cc=torvalds@linux-foundation.org \
--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
all inboxes | Powered by JetHome®