lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Linux: Assume and consolidate listen wire-up syscall

Browse Source 
And disable if kernel does not support it.

Checked on x86_64-linux-gnu and i686-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella Netto
2022-10-19 19:14:24 -03:00
committed by Adhemerval Zanella
parent d00783653a
commit 377a14a22a
10 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysdeps/unix/sysv/linux/generic/syscalls.list
View File

@ -1,7 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names # File name Caller Syscall name # args Strong name Weak names
# Socket APIs # Socket APIs
listen - listen i:ii __listen listen
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getpeername - getpeername i:ipp __getpeername getpeername getpeername - getpeername i:ipp __getpeername getpeername
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown

2
sysdeps/unix/sysv/linux/i386/kernel-features.h
View File

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
@ -41,6 +40,7 @@
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL
#endif #endif
/* i686 only supports ipc syscall before 5.1. */ /* i686 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -82,6 +82,7 @@
#define __ASSUME_BIND_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1
#define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_SOCKET_SYSCALL 1
#define __ASSUME_SOCKETPAIR_SYSCALL 1 #define __ASSUME_SOCKETPAIR_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
/* Support for SysV IPC through wired syscalls. All supported architectures /* Support for SysV IPC through wired syscalls. All supported architectures
either support ipc syscall and/or all the ipc correspondent syscalls. */ either support ipc syscall and/or all the ipc correspondent syscalls. */

7
sysdeps/unix/sysv/linux/listen.c
View File

@ -15,19 +15,14 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <socketcall.h> #include <socketcall.h>
#include <kernel-features.h>
#include <sys/syscall.h>
int int
listen (int fd, int backlog) listen (int fd, int backlog)
{ {
#ifdef __ASSUME_LISTEN_SYSCALL #ifdef __ASSUME_LISTEN_SYSCALL
return INLINE_SYSCALL (listen, 2, fd, backlog); return INLINE_SYSCALL_CALL (listen, fd, backlog);
#else #else
return SOCKETCALL (listen, fd, backlog); return SOCKETCALL (listen, fd, backlog);
#endif #endif

2
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View File

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
@ -43,6 +42,7 @@
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL
#endif #endif
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */ /* No support for PI futexes or robust mutexes before 3.10 for m68k. */

1
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View File

@ -19,7 +19,6 @@
/* All supported kernel versions for MicroBlaze have these syscalls. */ /* All supported kernel versions for MicroBlaze have these syscalls. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1

1
sysdeps/unix/sysv/linux/powerpc/kernel-features.h
View File

@ -19,7 +19,6 @@
/* New syscalls added for PowerPC in 2.6.37. */ /* New syscalls added for PowerPC in 2.6.37. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1

2
sysdeps/unix/sysv/linux/s390/kernel-features.h
View File

@ -19,7 +19,6 @@
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
@ -43,6 +42,7 @@
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL
#endif #endif
/* s390 only supports ipc syscall before 5.1. */ /* s390 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/sh/kernel-features.h
View File

@ -24,7 +24,6 @@
/* These syscalls were added for SH in 2.6.37. */ /* These syscalls were added for SH in 2.6.37. */
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETSOCKNAME_SYSCALL 1
#define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1

5
sysdeps/unix/sysv/linux/sparc/kernel-features.h
View File

@ -45,12 +45,9 @@
#endif #endif
/* These syscalls were added for both 32-bit and 64-bit in 4.4. */ /* These syscalls were added for both 32-bit and 64-bit in 4.4. */
#if __LINUX_KERNEL_VERSION >= 0x040400
# define __ASSUME_LISTEN_SYSCALL 1
#endif
#if __LINUX_KERNEL_VERSION < 0x040400 #if __LINUX_KERNEL_VERSION < 0x040400
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_LISTEN_SYSCALL
#endif #endif
#ifdef __arch64__ #ifdef __arch64__