Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb640135 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Suren Baghdasaryan
Browse files

BACKPORT: arch: add pidfd and io_uring syscalls everywhere



Add the io_uring and pidfd_send_signal system calls to all architectures.

These system calls are designed to handle both native and compat tasks,
so all entries are the same across architectures, only arm-compat and
the generic tale still use an old format.

Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> (s390)
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

(cherry picked from commit 39036cd2727395c3369b1051005da74059a85317)

Conflicts:

        arch/alpha/kernel/syscalls/syscall.tbl
        arch/arm/tools/syscall.tbl
        arch/arm64/include/asm/unistd.h
        arch/arm64/include/asm/unistd32.h
        arch/ia64/kernel/syscalls/syscall.tbl
        arch/m68k/kernel/syscalls/syscall.tbl
        arch/microblaze/kernel/syscalls/syscall.tbl
        arch/mips/kernel/syscalls/syscall_n32.tbl
        arch/mips/kernel/syscalls/syscall_n64.tbl
        arch/mips/kernel/syscalls/syscall_o32.tbl
        arch/parisc/kernel/syscalls/syscall.tbl
        arch/powerpc/kernel/syscalls/syscall.tbl
        arch/s390/kernel/syscalls/syscall.tbl
        arch/sh/kernel/syscalls/syscall.tbl
        arch/sparc/kernel/syscalls/syscall.tbl
        arch/xtensa/kernel/syscalls/syscall.tbl
        arch/arm/include/uapi/asm/unistd.h
        arch/arm/kernel/calls.S

(1. Skipped syscall.tbl modifications for missing architectures.
 2. Skipped io_uring syscall additions
 3. Added __NR_pidfd_send_signal into arch/arm/include/uapi/asm/unistd.h
 4. Added CALL(sys_pidfd_send_signal) into arch/arm/kernel/calls.S)

Bug: 135608568
Test: make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-
Change-Id: Ica9acfaee5602f26e8b1cea431b6fe6d53bf9cf9
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
parent c5be65ad
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@
#define __NR_pkey_mprotect		(__NR_SYSCALL_BASE+394)
#define __NR_pkey_mprotect		(__NR_SYSCALL_BASE+394)
#define __NR_pkey_alloc			(__NR_SYSCALL_BASE+395)
#define __NR_pkey_alloc			(__NR_SYSCALL_BASE+395)
#define __NR_pkey_free			(__NR_SYSCALL_BASE+396)
#define __NR_pkey_free			(__NR_SYSCALL_BASE+396)
#define __NR_pidfd_send_signal		(__NR_SYSCALL_BASE+424)
#define __NR_pidfd_open		(__NR_SYSCALL_BASE+434)
#define __NR_pidfd_open		(__NR_SYSCALL_BASE+434)


/*
/*
+1 −0
Original line number Original line Diff line number Diff line
@@ -406,6 +406,7 @@
		CALL(sys_pkey_mprotect)
		CALL(sys_pkey_mprotect)
/* 395 */	CALL(sys_pkey_alloc)
/* 395 */	CALL(sys_pkey_alloc)
		CALL(sys_pkey_free)
		CALL(sys_pkey_free)
		CALL(sys_pidfd_send_signal)
		CALL(sys_pidfd_open)
		CALL(sys_pidfd_open)
#ifndef syscalls_counted
#ifndef syscalls_counted
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
+2 −0
Original line number Original line Diff line number Diff line
@@ -809,6 +809,8 @@ __SYSCALL(__NR_copy_file_range, sys_copy_file_range)
__SYSCALL(__NR_preadv2, compat_sys_preadv2)
__SYSCALL(__NR_preadv2, compat_sys_preadv2)
#define __NR_pwritev2 393
#define __NR_pwritev2 393
__SYSCALL(__NR_pwritev2, compat_sys_pwritev2)
__SYSCALL(__NR_pwritev2, compat_sys_pwritev2)
#define __NR_pidfd_send_signal 424
__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)
#define __NR_pidfd_open 434
#define __NR_pidfd_open 434
__SYSCALL(__NR_pidfd_open, sys_pidfd_open)
__SYSCALL(__NR_pidfd_open, sys_pidfd_open)