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

Commit 977108f8 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: wire up separate socketcalls system calls 



As discussed on linux-arch all architectures should wire up the separate
system calls that are hidden behind the socketcall multiplexer system call.

It's just a couple more system calls and gives us a very small performance
improvement.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 7681df45

arch/s390/include/asm/unistd.h

+0 −20
Original line number Diff line number Diff line
@@ -8,28 +8,8 @@ 


#include <uapi/asm/unistd.h>





#define __IGNORE_time



/* Ignore system calls that are also reachable via sys_socketcall */

#define __IGNORE_recvmmsg

#define __IGNORE_sendmmsg

#define __IGNORE_socket

#define __IGNORE_socketpair

#define __IGNORE_bind

#define __IGNORE_connect

#define __IGNORE_listen

#define __IGNORE_accept4

#define __IGNORE_getsockopt

#define __IGNORE_setsockopt

#define __IGNORE_getsockname

#define __IGNORE_getpeername

#define __IGNORE_sendto

#define __IGNORE_sendmsg

#define __IGNORE_recvfrom

#define __IGNORE_recvmsg

#define __IGNORE_shutdown



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_SYS_ALARM

#define __ARCH_WANT_SYS_GETHOSTNAME

arch/s390/include/uapi/asm/unistd.h

+18 −1
Original line number Diff line number Diff line
@@ -292,7 +292,24 @@ 
#define __NR_execveat		354

#define __NR_userfaultfd	355

#define __NR_membarrier		356

#define NR_syscalls 357

#define __NR_recvmmsg		357

#define __NR_sendmmsg		358

#define __NR_socket		359

#define __NR_socketpair		360

#define __NR_bind		361

#define __NR_connect		362

#define __NR_listen		363

#define __NR_accept4		364

#define __NR_getsockopt		365

#define __NR_setsockopt		366

#define __NR_getsockname	367

#define __NR_getpeername	368

#define __NR_sendto		369

#define __NR_sendmsg		370

#define __NR_recvfrom		371

#define __NR_recvmsg		372

#define __NR_shutdown		373

#define NR_syscalls 374



/* 

 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/compat_wrapper.c

+7 −0
Original line number Diff line number Diff line
@@ -169,3 +169,10 @@ COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, fla 
COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);

COMPAT_SYSCALL_WRAP3(s390_pci_mmio_write, const unsigned long, mmio_addr, const void __user *, user_buffer, const size_t, length);

COMPAT_SYSCALL_WRAP3(s390_pci_mmio_read, const unsigned long, mmio_addr, void __user *, user_buffer, const size_t, length);

COMPAT_SYSCALL_WRAP4(socketpair, int, family, int, type, int, protocol, int __user *, usockvec);

COMPAT_SYSCALL_WRAP3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen);

COMPAT_SYSCALL_WRAP3(connect, int, fd, struct sockaddr __user *, uservaddr, int, addrlen);

COMPAT_SYSCALL_WRAP4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, int __user *, upeer_addrlen, int, flags);

COMPAT_SYSCALL_WRAP3(getsockname, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);

COMPAT_SYSCALL_WRAP3(getpeername, int, fd, struct sockaddr __user *, usockaddr, int __user *, usockaddr_len);

COMPAT_SYSCALL_WRAP6(sendto, int, fd, void __user *, buff, size_t, len, unsigned int, flags, struct sockaddr __user *, addr, int, addr_len);

arch/s390/kernel/syscalls.S

+17 −0
Original line number Diff line number Diff line
@@ -365,3 +365,20 @@ SYSCALL(sys_s390_pci_mmio_read,compat_sys_s390_pci_mmio_read) 
SYSCALL(sys_execveat,compat_sys_execveat)

SYSCALL(sys_userfaultfd,sys_userfaultfd)		/* 355 */

SYSCALL(sys_membarrier,sys_membarrier)

SYSCALL(sys_recvmmsg,compat_sys_recvmmsg)

SYSCALL(sys_sendmmsg,compat_sys_sendmmsg)

SYSCALL(sys_socket,sys_socket)

SYSCALL(sys_socketpair,compat_sys_socketpair)		/* 360 */

SYSCALL(sys_bind,sys_bind)

SYSCALL(sys_connect,sys_connect)

SYSCALL(sys_listen,sys_listen)

SYSCALL(sys_accept4,sys_accept4)

SYSCALL(sys_getsockopt,compat_sys_getsockopt)		/* 365 */

SYSCALL(sys_setsockopt,compat_sys_setsockopt)

SYSCALL(sys_getsockname,compat_sys_getsockname)

SYSCALL(sys_getpeername,compat_sys_getpeername)

SYSCALL(sys_sendto,compat_sys_sendto)

SYSCALL(sys_sendmsg,compat_sys_sendmsg)			/* 370 */

SYSCALL(sys_recvfrom,compat_sys_recvfrom)

SYSCALL(sys_recvmsg,compat_sys_recvmsg)

SYSCALL(sys_shutdown,sys_shutdown)