Commit 25e290ee authored by Dominik Brodowski's avatar Dominik Brodowski

net: socket: add __sys_listen() helper; remove in-kernel call to syscall

Using the net-internal helper __sys_listen() allows us to avoid the
internal calls to the sys_listen() syscall.

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net

Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 1387c2c2
...@@ -367,5 +367,6 @@ extern int __sys_socket(int family, int type, int protocol); ...@@ -367,5 +367,6 @@ extern int __sys_socket(int family, int type, int protocol);
extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen); extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);
extern int __sys_connect(int fd, struct sockaddr __user *uservaddr, extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,
int addrlen); int addrlen);
extern int __sys_listen(int fd, int backlog);
#endif /* _LINUX_SOCKET_H */ #endif /* _LINUX_SOCKET_H */
...@@ -820,7 +820,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args) ...@@ -820,7 +820,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
ret = __sys_connect(a0, compat_ptr(a1), a[2]); ret = __sys_connect(a0, compat_ptr(a1), a[2]);
break; break;
case SYS_LISTEN: case SYS_LISTEN:
ret = sys_listen(a0, a1); ret = __sys_listen(a0, a1);
break; break;
case SYS_ACCEPT: case SYS_ACCEPT:
ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0); ret = __sys_accept4(a0, compat_ptr(a1), compat_ptr(a[2]), 0);
......
...@@ -1496,7 +1496,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) ...@@ -1496,7 +1496,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
* ready for listening. * ready for listening.
*/ */
SYSCALL_DEFINE2(listen, int, fd, int, backlog) int __sys_listen(int fd, int backlog)
{ {
struct socket *sock; struct socket *sock;
int err, fput_needed; int err, fput_needed;
...@@ -1517,6 +1517,11 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) ...@@ -1517,6 +1517,11 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
return err; return err;
} }
SYSCALL_DEFINE2(listen, int, fd, int, backlog)
{
return __sys_listen(fd, backlog);
}
/* /*
* For accept, we attempt to create a new socket, set up the link * For accept, we attempt to create a new socket, set up the link
* with the client, wake up the client, then return the new * with the client, wake up the client, then return the new
...@@ -2487,7 +2492,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) ...@@ -2487,7 +2492,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
err = __sys_connect(a0, (struct sockaddr __user *)a1, a[2]); err = __sys_connect(a0, (struct sockaddr __user *)a1, a[2]);
break; break;
case SYS_LISTEN: case SYS_LISTEN:
err = sys_listen(a0, a1); err = __sys_listen(a0, a1);
break; break;
case SYS_ACCEPT: case SYS_ACCEPT:
err = __sys_accept4(a0, (struct sockaddr __user *)a1, err = __sys_accept4(a0, (struct sockaddr __user *)a1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment