UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Using the net-internal helper __sys_socket() allows us to avoid the
internal calls to the sys_socket() 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: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2018-03-13 19:29:43 +01:00
parent 4541e80560
commit 9d6a15c3f2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/socket.h
View File

@ -363,5 +363,6 @@ extern int __sys_sendto(int fd, void __user *buff, size_t len,
int addr_len); int addr_len);
extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
int __user *upeer_addrlen, int flags); int __user *upeer_addrlen, int flags);
extern int __sys_socket(int family, int type, int protocol);
#endif /* _LINUX_SOCKET_H */ #endif /* _LINUX_SOCKET_H */

2
net/compat.c
View File

@ -811,7 +811,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
switch (call) { switch (call) {
case SYS_SOCKET: case SYS_SOCKET:
ret = sys_socket(a0, a1, a[2]); ret = __sys_socket(a0, a1, a[2]);
break; break;
case SYS_BIND: case SYS_BIND:
ret = sys_bind(a0, compat_ptr(a1), a[2]); ret = sys_bind(a0, compat_ptr(a1), a[2]);

9
net/socket.c
View File

@ -1332,7 +1332,7 @@ int sock_create_kern(struct net *net, int family, int type, int protocol, struct
} }
EXPORT_SYMBOL(sock_create_kern); EXPORT_SYMBOL(sock_create_kern);
SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) int __sys_socket(int family, int type, int protocol)
{ {
int retval; int retval;
struct socket *sock; struct socket *sock;
@ -1359,6 +1359,11 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
return sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); return sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
} }
SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
{
return __sys_socket(family, type, protocol);
}
/* /*
* Create a pair of connected sockets. * Create a pair of connected sockets.
*/ */
@ -2463,7 +2468,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
switch (call) { switch (call) {
case SYS_SOCKET: case SYS_SOCKET:
err = sys_socket(a0, a1, a[2]); err = __sys_socket(a0, a1, a[2]);
break; break;
case SYS_BIND: case SYS_BIND:
err = sys_bind(a0, (struct sockaddr __user *)a1, a[2]); err = sys_bind(a0, (struct sockaddr __user *)a1, a[2]);