Skip to contentSkip to conversation

x86/syscalls: shrink entry/syscall_64.i via IWYU

PATCH In review Tanzir Hasan 2 participants 3 messages Jan 4, 2024 – Jan 5, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/syscalls: shrink entry/syscall_64.i via IWYU

This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.

This change to entry/syscall_64.c resulted in a preprocessed size of entry/syscall_64.i from 64003 lines to 24509 lines (-62%) for the x86 defconfig.

---
 arch/x86/entry/syscall_64.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
arch/x86/entry/syscall_64.c +14 -4
index be120eec1fc9..9e4a3d8957f3 100644
@@ -1,12 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0
 /* System call table for x86-64. */
 
-#include <linux/linkage.h>
-#include <linux/sys.h>
-#include <linux/cache.h>
-#include <linux/syscalls.h>
 #include <asm/syscall.h>
 
+struct pt_regs;
+typedef long (*sys_call_ptr_t)(const struct pt_regs *);
+extern const sys_call_ptr_t sys_call_table[];
+#if defined(CONFIG_X86_32)
+#define ia32_sys_call_table sys_call_table
+#else
+/*
+ * These may not exist, but still put the prototypes in so we
+ * can use IS_ENABLED().
+ */
+extern const sys_call_ptr_t ia32_sys_call_table[];
+extern const sys_call_ptr_t x32_sys_call_table[];
+#endif
+
 #define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);
 #include <asm/syscalls_64.h>
 #undef __SYSCALL

---
base-commit: f5837722ffecbbedf1b1dbab072a063565f0dad1
change-id: 20231228-syscall_64-30ba68440a85

Best regards,

Signature · 1 line
Tanzir Hasan <[email protected]>
#1 lore raw
Quoted 35 lines · Tanzir Hasan

This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.

This change to entry/syscall_64.c resulted in a preprocessed size of entry/syscall_64.i from 64003 lines to 24509 lines (-62%) for the x86 defconfig.

---
 arch/x86/entry/syscall_64.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
arch/x86/entry/syscall_64.c +4 -4
index be120eec1fc9..9e4a3d8957f3 100644
@@ -1,12 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0
 /* System call table for x86-64. */
 
-#include <linux/linkage.h>
-#include <linux/sys.h>
-#include <linux/cache.h>
-#include <linux/syscalls.h>
 #include <asm/syscall.h>
 
+struct pt_regs;
+typedef long (*sys_call_ptr_t)(const struct pt_regs *);
+extern const sys_call_ptr_t sys_call_table[];
+#if defined(CONFIG_X86_32)

arch/x86/entry/syscall_64.c line 19

Quoted 10 lines
arch/x86/entry/syscall_64.c +10 -0
+#define ia32_sys_call_table sys_call_table
+#else
+/*
+ * These may not exist, but still put the prototypes in so we
+ * can use IS_ENABLED().
+ */
+extern const sys_call_ptr_t ia32_sys_call_table[];
+extern const sys_call_ptr_t x32_sys_call_table[];
+#endif
+

arch/x86/include/asm/syscall.h (which you retained) already includes the typedef for sys_call_ptr_t, and the declaration of sys_call_table, and everything else.

Was there some additional refactoring that Al mentioned or intended for you to do here? Perhaps as part of a series so it's more obvious to reviewers? You can include a Link: tag (see git log for examples) in a commit message to link back to discussions on lore.kernel.org. Doing so can help provide more context to reviewers as to //why// or justification for a change.

Otherwise I'm not sure you need any of these additions (other than maybe pt_regs).

Quoted 12 lines
arch/x86/entry/syscall_64.c +0 -1
 #define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);
 #include <asm/syscalls_64.h>
 #undef __SYSCALL
 
---

base-commit: f5837722ffecbbedf1b1dbab072a063565f0dad1
change-id: 20231228-syscall_64-30ba68440a85

Best regards,
--
Tanzir Hasan <[email protected]>

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
In reply to Tanzir Hasan
Quoted 7 lines · Tanzir Hasan

This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.

Quoted 8 lines

This change to entry/syscall_64.c resulted in a preprocessed size of entry/syscall_64.i from 64003 lines to 24509 lines (-62%) for the x86 defconfig.

---
 arch/x86/entry/syscall_64.c | 18 ++++++++++++++----

Generally question to the CC list. Does anyone know //why// sys_call_table is defined as asmlinkage?

I don't see why extern "C" or __attribute__((regparm(0))) would be necessary here, but maybe I'm missing something?

I don't think that's necessary to refer to //data// defined in C from inline asm. Nothing in Documentation mentions this.

And honestly those two seem conflated IMO. UAPI headers make sense to use extern C.

assembler defined functions called from C should have regparm set so C callers know about the i386 calling convention change.

Those seem orthogonal to me; do we ever have cases where BOTH make sense?

Signature · 2 lines
Thanks,
~Nick Desaulniers