From: Yu Watanabe Date: Mon, 3 Mar 2025 04:07:21 +0000 (+0900) Subject: missing_syscall: drop unnecessary syscall number definitions X-Git-Tag: v258-rc1~1195^2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a6e117ddbea0cc1371d765376bad4fd2acf558b;p=thirdparty%2Fsystemd.git missing_syscall: drop unnecessary syscall number definitions --- diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h index 264fe606fc8..8d4edaac162 100644 --- a/src/basic/missing_syscall_def.h +++ b/src/basic/missing_syscall_def.h @@ -42,74 +42,6 @@ # define missing_arch_template 1 # endif -#ifndef __IGNORE_bpf -# if defined(__aarch64__) -# define systemd_NR_bpf 280 -# elif defined(__alpha__) -# define systemd_NR_bpf 515 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_bpf 280 -# elif defined(__arm__) -# define systemd_NR_bpf 386 -# elif defined(__i386__) -# define systemd_NR_bpf 357 -# elif defined(__ia64__) -# define systemd_NR_bpf 1341 -# elif defined(__loongarch_lp64) -# define systemd_NR_bpf 280 -# elif defined(__m68k__) -# define systemd_NR_bpf 354 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_bpf 4355 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_bpf 6319 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_bpf 5315 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_bpf 341 -# elif defined(__powerpc__) -# define systemd_NR_bpf 361 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_bpf 280 -# elif __riscv_xlen == 64 -# define systemd_NR_bpf 280 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_bpf 351 -# elif defined(__sparc__) -# define systemd_NR_bpf 349 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_bpf (321 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_bpf 321 -# endif -# elif !defined(missing_arch_template) -# warning "bpf() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_bpf && __NR_bpf >= 0 -# if defined systemd_NR_bpf -assert_cc(__NR_bpf == systemd_NR_bpf); -# endif -# else -# if defined __NR_bpf -# undef __NR_bpf -# endif -# if defined systemd_NR_bpf && systemd_NR_bpf >= 0 -# define __NR_bpf systemd_NR_bpf -# endif -# endif -#endif - #ifndef __IGNORE_close_range # if defined(__aarch64__) # define systemd_NR_close_range 436 @@ -314,142 +246,6 @@ assert_cc(__NR_mount_setattr == systemd_NR_mount_setattr); # endif #endif -#ifndef __IGNORE_move_mount -# if defined(__aarch64__) -# define systemd_NR_move_mount 429 -# elif defined(__alpha__) -# define systemd_NR_move_mount 539 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_move_mount 429 -# elif defined(__arm__) -# define systemd_NR_move_mount 429 -# elif defined(__i386__) -# define systemd_NR_move_mount 429 -# elif defined(__ia64__) -# define systemd_NR_move_mount 1453 -# elif defined(__loongarch_lp64) -# define systemd_NR_move_mount 429 -# elif defined(__m68k__) -# define systemd_NR_move_mount 429 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_move_mount 4429 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_move_mount 6429 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_move_mount 5429 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_move_mount 429 -# elif defined(__powerpc__) -# define systemd_NR_move_mount 429 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_move_mount 429 -# elif __riscv_xlen == 64 -# define systemd_NR_move_mount 429 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_move_mount 429 -# elif defined(__sparc__) -# define systemd_NR_move_mount 429 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_move_mount (429 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_move_mount 429 -# endif -# elif !defined(missing_arch_template) -# warning "move_mount() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_move_mount && __NR_move_mount >= 0 -# if defined systemd_NR_move_mount -assert_cc(__NR_move_mount == systemd_NR_move_mount); -# endif -# else -# if defined __NR_move_mount -# undef __NR_move_mount -# endif -# if defined systemd_NR_move_mount && systemd_NR_move_mount >= 0 -# define __NR_move_mount systemd_NR_move_mount -# endif -# endif -#endif - -#ifndef __IGNORE_open_tree -# if defined(__aarch64__) -# define systemd_NR_open_tree 428 -# elif defined(__alpha__) -# define systemd_NR_open_tree 538 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_open_tree 428 -# elif defined(__arm__) -# define systemd_NR_open_tree 428 -# elif defined(__i386__) -# define systemd_NR_open_tree 428 -# elif defined(__ia64__) -# define systemd_NR_open_tree 1452 -# elif defined(__loongarch_lp64) -# define systemd_NR_open_tree 428 -# elif defined(__m68k__) -# define systemd_NR_open_tree 428 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_open_tree 4428 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_open_tree 6428 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_open_tree 5428 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_open_tree 428 -# elif defined(__powerpc__) -# define systemd_NR_open_tree 428 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_open_tree 428 -# elif __riscv_xlen == 64 -# define systemd_NR_open_tree 428 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_open_tree 428 -# elif defined(__sparc__) -# define systemd_NR_open_tree 428 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_open_tree (428 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_open_tree 428 -# endif -# elif !defined(missing_arch_template) -# warning "open_tree() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_open_tree && __NR_open_tree >= 0 -# if defined systemd_NR_open_tree -assert_cc(__NR_open_tree == systemd_NR_open_tree); -# endif -# else -# if defined __NR_open_tree -# undef __NR_open_tree -# endif -# if defined systemd_NR_open_tree && systemd_NR_open_tree >= 0 -# define __NR_open_tree systemd_NR_open_tree -# endif -# endif -#endif - #ifndef __IGNORE_openat2 # if defined(__aarch64__) # define systemd_NR_openat2 437 @@ -518,210 +314,6 @@ assert_cc(__NR_openat2 == systemd_NR_openat2); # endif #endif -#ifndef __IGNORE_pidfd_open -# if defined(__aarch64__) -# define systemd_NR_pidfd_open 434 -# elif defined(__alpha__) -# define systemd_NR_pidfd_open 544 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_pidfd_open 434 -# elif defined(__arm__) -# define systemd_NR_pidfd_open 434 -# elif defined(__i386__) -# define systemd_NR_pidfd_open 434 -# elif defined(__ia64__) -# define systemd_NR_pidfd_open 1458 -# elif defined(__loongarch_lp64) -# define systemd_NR_pidfd_open 434 -# elif defined(__m68k__) -# define systemd_NR_pidfd_open 434 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_pidfd_open 4434 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_pidfd_open 6434 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_pidfd_open 5434 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_pidfd_open 434 -# elif defined(__powerpc__) -# define systemd_NR_pidfd_open 434 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_pidfd_open 434 -# elif __riscv_xlen == 64 -# define systemd_NR_pidfd_open 434 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_pidfd_open 434 -# elif defined(__sparc__) -# define systemd_NR_pidfd_open 434 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_pidfd_open (434 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_pidfd_open 434 -# endif -# elif !defined(missing_arch_template) -# warning "pidfd_open() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_pidfd_open && __NR_pidfd_open >= 0 -# if defined systemd_NR_pidfd_open -assert_cc(__NR_pidfd_open == systemd_NR_pidfd_open); -# endif -# else -# if defined __NR_pidfd_open -# undef __NR_pidfd_open -# endif -# if defined systemd_NR_pidfd_open && systemd_NR_pidfd_open >= 0 -# define __NR_pidfd_open systemd_NR_pidfd_open -# endif -# endif -#endif - -#ifndef __IGNORE_pidfd_send_signal -# if defined(__aarch64__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__alpha__) -# define systemd_NR_pidfd_send_signal 534 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__arm__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__i386__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__ia64__) -# define systemd_NR_pidfd_send_signal 1448 -# elif defined(__loongarch_lp64) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__m68k__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_pidfd_send_signal 4424 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_pidfd_send_signal 6424 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_pidfd_send_signal 5424 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__powerpc__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_pidfd_send_signal 424 -# elif __riscv_xlen == 64 -# define systemd_NR_pidfd_send_signal 424 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__sparc__) -# define systemd_NR_pidfd_send_signal 424 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_pidfd_send_signal (424 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_pidfd_send_signal 424 -# endif -# elif !defined(missing_arch_template) -# warning "pidfd_send_signal() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_pidfd_send_signal && __NR_pidfd_send_signal >= 0 -# if defined systemd_NR_pidfd_send_signal -assert_cc(__NR_pidfd_send_signal == systemd_NR_pidfd_send_signal); -# endif -# else -# if defined __NR_pidfd_send_signal -# undef __NR_pidfd_send_signal -# endif -# if defined systemd_NR_pidfd_send_signal && systemd_NR_pidfd_send_signal >= 0 -# define __NR_pidfd_send_signal systemd_NR_pidfd_send_signal -# endif -# endif -#endif - -#ifndef __IGNORE_pkey_mprotect -# if defined(__aarch64__) -# define systemd_NR_pkey_mprotect 288 -# elif defined(__alpha__) -# define systemd_NR_pkey_mprotect 524 -# elif defined(__arc__) || defined(__tilegx__) -# define systemd_NR_pkey_mprotect 288 -# elif defined(__arm__) -# define systemd_NR_pkey_mprotect 394 -# elif defined(__i386__) -# define systemd_NR_pkey_mprotect 380 -# elif defined(__ia64__) -# define systemd_NR_pkey_mprotect 1354 -# elif defined(__loongarch_lp64) -# define systemd_NR_pkey_mprotect 288 -# elif defined(__m68k__) -# define systemd_NR_pkey_mprotect 381 -# elif defined(_MIPS_SIM) -# if _MIPS_SIM == _MIPS_SIM_ABI32 -# define systemd_NR_pkey_mprotect 4363 -# elif _MIPS_SIM == _MIPS_SIM_NABI32 -# define systemd_NR_pkey_mprotect 6327 -# elif _MIPS_SIM == _MIPS_SIM_ABI64 -# define systemd_NR_pkey_mprotect 5323 -# else -# error "Unknown MIPS ABI" -# endif -# elif defined(__hppa__) -# define systemd_NR_pkey_mprotect 351 -# elif defined(__powerpc__) -# define systemd_NR_pkey_mprotect 386 -# elif defined(__riscv) -# if __riscv_xlen == 32 -# define systemd_NR_pkey_mprotect 288 -# elif __riscv_xlen == 64 -# define systemd_NR_pkey_mprotect 288 -# else -# error "Unknown RISC-V ABI" -# endif -# elif defined(__s390__) -# define systemd_NR_pkey_mprotect 384 -# elif defined(__sparc__) -# define systemd_NR_pkey_mprotect 362 -# elif defined(__x86_64__) -# if defined(__ILP32__) -# define systemd_NR_pkey_mprotect (329 | /* __X32_SYSCALL_BIT */ 0x40000000) -# else -# define systemd_NR_pkey_mprotect 329 -# endif -# elif !defined(missing_arch_template) -# warning "pkey_mprotect() syscall number is unknown for your architecture" -# endif - -/* may be an (invalid) negative number due to libseccomp, see PR 13319 */ -# if defined __NR_pkey_mprotect && __NR_pkey_mprotect >= 0 -# if defined systemd_NR_pkey_mprotect -assert_cc(__NR_pkey_mprotect == systemd_NR_pkey_mprotect); -# endif -# else -# if defined __NR_pkey_mprotect -# undef __NR_pkey_mprotect -# endif -# if defined systemd_NR_pkey_mprotect && systemd_NR_pkey_mprotect >= 0 -# define __NR_pkey_mprotect systemd_NR_pkey_mprotect -# endif -# endif -#endif - #ifndef __IGNORE_quotactl_fd # if defined(__aarch64__) # define systemd_NR_quotactl_fd 443 diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py index 01b20b1ca83..0d351e322d9 100644 --- a/src/basic/missing_syscalls.py +++ b/src/basic/missing_syscalls.py @@ -6,17 +6,11 @@ import functools # We only generate numbers for a dozen or so syscalls SYSCALLS = [ - 'bpf', - 'close_range', - 'fchmodat2', - 'mount_setattr', - 'move_mount', - 'open_tree', - 'openat2', - 'pidfd_open', - 'pidfd_send_signal', - 'pkey_mprotect', - 'quotactl_fd', + 'close_range', # defined in glibc header since glibc-2.33 + 'fchmodat2', # defined in glibc header since glibc-2.39 + 'mount_setattr', # defined in glibc header since glibc-2.34 + 'openat2', # defined in glibc header since glibc-2.32 + 'quotactl_fd', # defined in glibc header since glibc-2.35 'removexattrat', 'setxattrat', ]