AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-26 15:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Assume and consolidate socketpair 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:23 -03:00 committed by Adhemerval Zanella
parent 1fed1a5af4
commit d00783653a
10 changed files with 5 additions and 14 deletions
Show Stats 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
socketpair - socketpair i:iiif __socketpair socketpair
listen - listen i:ii __listen listen 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

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_SOCKETPAIR_SYSCALL 1
# define __ASSUME_LISTEN_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
@ -41,6 +40,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL # undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_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

@ -81,6 +81,7 @@
#define __ASSUME_SETSOCKOPT_SYSCALL 1 #define __ASSUME_SETSOCKOPT_SYSCALL 1
#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
/* 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. */

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_SOCKETPAIR_SYSCALL 1
# define __ASSUME_LISTEN_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
@ -43,6 +42,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL # undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_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

@ -22,7 +22,6 @@
#define __ASSUME_LISTEN_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_SOCKETPAIR_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1 #define __ASSUME_SHUTDOWN_SYSCALL 1

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

@ -22,7 +22,6 @@
#define __ASSUME_LISTEN_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_SOCKETPAIR_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1 #define __ASSUME_SHUTDOWN_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_SOCKETPAIR_SYSCALL 1
# define __ASSUME_LISTEN_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
@ -43,6 +42,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL # undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_BIND_SYSCALL # undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKET_SYSCALL
# undef __ASSUME_SOCKETPAIR_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

@ -27,7 +27,6 @@
#define __ASSUME_LISTEN_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_SOCKETPAIR_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1 #define __ASSUME_SHUTDOWN_SYSCALL 1

7
sysdeps/unix/sysv/linux/socketpair.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
__socketpair (int domain, int type, int protocol, int sv[2]) __socketpair (int domain, int type, int protocol, int sv[2])
{ {
#ifdef __ASSUME_SOCKETPAIR_SYSCALL #ifdef __ASSUME_SOCKETPAIR_SYSCALL
return INLINE_SYSCALL (socketpair, 4, domain, type, protocol, &sv[0]); return INLINE_SYSCALL_CALL (socketpair, domain, type, protocol, &sv[0]);
#else #else
return SOCKETCALL (socketpair, domain, type, protocol, sv); return SOCKETCALL (socketpair, domain, type, protocol, sv);
#endif #endif

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

@ -41,7 +41,6 @@
# undef __ASSUME_GETSOCKOPT_SYSCALL # undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL # undef __ASSUME_SETSOCKOPT_SYSCALL
#else #else
# define __ASSUME_SOCKETPAIR_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif