[PATCH OLK-6.6 v1 0/2] Reserve syscall entries for kabi compatibility
In this patch set, we: 1. Fix map_shadow_stack() syscall reserving issue 2. Reserve 15 syscall entries for kabi compatibility Sohil Mehta (1): arch: Reserve map_shadow_stack() syscall number for all architectures Wei Li (1): kabi: Reserve syscall entries for kabi compatibility arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 16 ++++++++ arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 32 ++++++++++++++++ arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 16 ++++++++ arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 16 ++++++++ arch/x86/entry/syscalls/syscall_64.tbl | 15 ++++++++ arch/xtensa/kernel/syscalls/syscall.tbl | 1 + include/uapi/asm-generic/unistd.h | 36 +++++++++++++++++- tools/include/uapi/asm-generic/unistd.h | 37 +++++++++++++++++-- .../arch/powerpc/entry/syscalls/syscall.tbl | 16 ++++++++ .../arch/x86/entry/syscalls/syscall_64.tbl | 15 ++++++++ 21 files changed, 207 insertions(+), 5 deletions(-) -- 2.25.1
From: Sohil Mehta <sohil.mehta@intel.com> mainline inclusion from mainline-v6.7-rc1 commit 2fd0ebad27bcd4c8fc61c61a98d4283c47054bcf category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8YHN7 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id... -------------------------------- commit c35559f94ebc ("x86/shstk: Introduce map_shadow_stack syscall") recently added support for map_shadow_stack() but it is limited to x86 only for now. There is a possibility that other architectures (namely, arm64 and RISC-V), that are implementing equivalent support for shadow stacks, might need to add support for it. Independent of that, reserving arch-specific syscall numbers in the syscall tables of all architectures is good practice and would help avoid future conflicts. map_shadow_stack() is marked as a conditional syscall in sys_ni.c. Adding it to the syscall tables of other architectures is harmless and would return ENOSYS when exercised. Note, map_shadow_stack() was assigned #453 during the merge process since #452 was taken by fchmodat2(). For Powerpc, map it to sys_ni_syscall() as is the norm for Powerpc syscall tables. For Alpha, map_shadow_stack() takes up #563 as Alpha still diverges from the common syscall numbering system in the other architectures. Link: https://lore.kernel.org/lkml/20230515212255.GA562920@debug.ba.rivosinc.com/ Link: https://lore.kernel.org/lkml/b402b80b-a7c6-4ef0-b977-c0f5f582b78a@sirena.org... Signed-off-by: Sohil Mehta <sohil.mehta@intel.com> Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> [liwei: Sync with tools/* as well.] Signed-off-by: Wei Li <liwei391@huawei.com> --- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 2 ++ arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + include/uapi/asm-generic/unistd.h | 5 ++++- tools/include/uapi/asm-generic/unistd.h | 6 +++--- tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 1 + 19 files changed, 25 insertions(+), 5 deletions(-) diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl index ad37569d0507..6e8479c96e65 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -492,3 +492,4 @@ 560 common set_mempolicy_home_node sys_ni_syscall 561 common cachestat sys_cachestat 562 common fchmodat2 sys_fchmodat2 +563 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index c572d6c3dee0..6d494dfbf5e4 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -466,3 +466,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index d98414a0d01e..5e8f788265a2 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -44,7 +44,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) -#define __NR_compat_syscalls 453 +#define __NR_compat_syscalls 454 #endif #define __ARCH_WANT_SYS_CLONE diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 78b68311ec81..a201d842ec82 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -911,6 +911,8 @@ __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) __SYSCALL(__NR_cachestat, sys_cachestat) #define __NR_fchmodat2 452 __SYSCALL(__NR_fchmodat2, sys_fchmodat2) +#define __NR_map_shadow_stack 453 +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) /* * Please add new compat syscalls above this comment and update diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl index 259ceb125367..bee2d2f7f82c 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -452,3 +452,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl index a3798c2637fd..09eda7ed91b0 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -458,3 +458,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl index 152034b8e0a0..3c02cc3886ca 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -391,3 +391,4 @@ 450 n32 set_mempolicy_home_node sys_set_mempolicy_home_node 451 n32 cachestat sys_cachestat 452 n32 fchmodat2 sys_fchmodat2 +453 n32 map_shadow_stack sys_map_shadow_stack diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl index cb5e757f6621..aa9ed6a7cb48 100644 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl @@ -367,3 +367,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 n64 cachestat sys_cachestat 452 n64 fchmodat2 sys_fchmodat2 +453 n64 map_shadow_stack sys_map_shadow_stack diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl index 1a646813afdc..756f6feb21c2 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -440,3 +440,4 @@ 450 o32 set_mempolicy_home_node sys_set_mempolicy_home_node 451 o32 cachestat sys_cachestat 452 o32 fchmodat2 sys_fchmodat2 +453 o32 map_shadow_stack sys_map_shadow_stack diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl index e97c175b56f9..c80eedbe0170 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -451,3 +451,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 20e50586e8a2..87a54acf8346 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -539,3 +539,4 @@ 450 nospu set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_ni_syscall diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index 0122cc156952..22249c07e556 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -455,3 +455,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack sys_map_shadow_stack diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl index e90d585c4d3e..5ccfe6fbb6b1 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -455,3 +455,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index 4ed06c71c43f..b2d664edebdd 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -498,3 +498,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 2d0b1bd866ea..743a7ef5a4b9 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -457,3 +457,4 @@ 450 i386 set_mempolicy_home_node sys_set_mempolicy_home_node 451 i386 cachestat sys_cachestat 452 i386 fchmodat2 sys_fchmodat2 +453 i386 map_shadow_stack sys_map_shadow_stack diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl index fc1a4f3c81d9..94e6bcc2bec7 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -423,3 +423,4 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_map_shadow_stack diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index abe087c53b4b..203ae30d7761 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -823,8 +823,11 @@ __SYSCALL(__NR_cachestat, sys_cachestat) #define __NR_fchmodat2 452 __SYSCALL(__NR_fchmodat2, sys_fchmodat2) +#define __NR_map_shadow_stack 453 +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) + #undef __NR_syscalls -#define __NR_syscalls 453 +#define __NR_syscalls 454 /* * 32 bit systems traditionally used different diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index abe087c53b4b..dd2682767808 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -816,15 +816,15 @@ __SYSCALL(__NR_process_mrelease, sys_process_mrelease) __SYSCALL(__NR_futex_waitv, sys_futex_waitv) #define __NR_set_mempolicy_home_node 450 __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) - #define __NR_cachestat 451 __SYSCALL(__NR_cachestat, sys_cachestat) - #define __NR_fchmodat2 452 __SYSCALL(__NR_fchmodat2, sys_fchmodat2) +#define __NR_map_shadow_stack 453 +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) #undef __NR_syscalls -#define __NR_syscalls 453 +#define __NR_syscalls 454 /* * 32 bit systems traditionally used different diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl index 20e50586e8a2..87a54acf8346 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -539,3 +539,4 @@ 450 nospu set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 +453 common map_shadow_stack sys_ni_syscall -- 2.25.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8YHN7 CVE: NA ------------------------------------------------- Reserve several syscall entries for kabi compatibility. For arch arm32,ppc32,riscv64,ppc64,arm64,x86_64 currently. Signed-off-by: Wei Li <liwei391@huawei.com> --- arch/arm/tools/syscall.tbl | 15 +++++++++ arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 30 +++++++++++++++++ arch/powerpc/kernel/syscalls/syscall.tbl | 15 +++++++++ arch/x86/entry/syscalls/syscall_32.tbl | 15 +++++++++ arch/x86/entry/syscalls/syscall_64.tbl | 15 +++++++++ include/uapi/asm-generic/unistd.h | 33 ++++++++++++++++++- tools/include/uapi/asm-generic/unistd.h | 33 ++++++++++++++++++- .../arch/powerpc/entry/syscalls/syscall.tbl | 15 +++++++++ .../arch/x86/entry/syscalls/syscall_64.tbl | 15 +++++++++ 10 files changed, 185 insertions(+), 3 deletions(-) diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 6d494dfbf5e4..235512738edd 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -467,3 +467,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 5e8f788265a2..d24de5bb4777 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -44,7 +44,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) -#define __NR_compat_syscalls 454 +#define __NR_compat_syscalls 469 #endif #define __ARCH_WANT_SYS_CLONE diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index a201d842ec82..e34b07079a5a 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -913,6 +913,36 @@ __SYSCALL(__NR_cachestat, sys_cachestat) __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall) /* * Please add new compat syscalls above this comment and update diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 87a54acf8346..ce7e5fe2bd32 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -540,3 +540,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 743a7ef5a4b9..f0f250b33043 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -458,3 +458,18 @@ 451 i386 cachestat sys_cachestat 452 i386 fchmodat2 sys_fchmodat2 453 i386 map_shadow_stack sys_map_shadow_stack +454 i386 kabi_reserved454 sys_ni_syscall +455 i386 kabi_reserved455 sys_ni_syscall +456 i386 kabi_reserved456 sys_ni_syscall +457 i386 kabi_reserved457 sys_ni_syscall +458 i386 kabi_reserved458 sys_ni_syscall +459 i386 kabi_reserved459 sys_ni_syscall +460 i386 kabi_reserved460 sys_ni_syscall +461 i386 kabi_reserved461 sys_ni_syscall +462 i386 kabi_reserved462 sys_ni_syscall +463 i386 kabi_reserved463 sys_ni_syscall +464 i386 kabi_reserved464 sys_ni_syscall +465 i386 kabi_reserved465 sys_ni_syscall +466 i386 kabi_reserved466 sys_ni_syscall +467 i386 kabi_reserved467 sys_ni_syscall +468 i386 kabi_reserved468 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 1d6eee30eceb..f88268a37ec2 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -375,6 +375,21 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 64 map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall # # Due to a historical design error, certain syscalls are numbered differently diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 203ae30d7761..682a1e263c4a 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -826,8 +826,39 @@ __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 454 +#define __NR_syscalls 469 /* * 32 bit systems traditionally used different diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index dd2682767808..7cae265fefba 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -823,8 +823,39 @@ __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 454 +#define __NR_syscalls 469 /* * 32 bit systems traditionally used different diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl index 87a54acf8346..ce7e5fe2bd32 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -540,3 +540,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl index 1d6eee30eceb..f88268a37ec2 100644 --- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl @@ -375,6 +375,21 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 64 map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall # # Due to a historical design error, certain syscalls are numbered differently -- 2.25.1
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/4168 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/4168 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P...
participants (2)
-
patchwork bot -
Wei Li