AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify accept4, recvmmsg, sendmmsg code.

Browse Source 
The accept4, recvmmsg and sendmmsg functions had macros
__ASSUME_*_SYSCALL_WITH_SOCKETCALL.  Before we could assume kernels
with the relevant functionality, these macros represented the
conditions under which, on a socketcall architecture, glibc could just
call the syscall unconditionally and not have to deal with socketcall
at all for those functions, because if the syscall didn't work for
them the socketcall call wouldn't either.

Now we can assume kernels with the relevant functionality, the only
question is whether we can assume the syscall is present; if not, we
are on a socketcall architecture and just use socketcall instead.
Thus, this patch removes the macros that are no longer necessary, and
simplifies the code for accept4, recvmmsg and sendmmsg to use the same
logic as the other C implementations of socket functions that may use
a syscall or socketcall depending on kernel support.

Tested for x86_64 and x86.

	* sysdeps/unix/sysv/linux/accept4.c (accept4): Use syscall if
	[__ASSUME_ACCEPT4_SYSCALL], otherwise socketcall.
	* sysdeps/unix/sysv/linux/recvmmsg.c (recvmmsg): Use syscall if
	[__ASSUME_RECVMMSG_SYSCALL], otherwise socketcall.
	* sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Use syscall if
	[__ASSUME_SENDMMSG_SYSCALL], otherwise socketcall.
	* sysdeps/unix/sysv/linux/kernel-features.h
	(__ASSUME_ACCEPT4_SYSCALL): Move to general list of macros for
	socket syscalls.
	(__ASSUME_RECVMMSG_SYSCALL): Likewise.
	(__ASSUME_SENDMMSG_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/i386/kernel-features.h
	(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove.
	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove.
	* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/sh/kernel-features.h
	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/sparc/kernel-features.h
	(__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise.
	(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
This commit is contained in:
Joseph Myers 2017-05-09 21:59:36 +00:00
parent eab380d8ec
commit e3b0580d0d
10 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2017-05-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/accept4.c (accept4): Use syscall if
[__ASSUME_ACCEPT4_SYSCALL], otherwise socketcall.
* sysdeps/unix/sysv/linux/recvmmsg.c (recvmmsg): Use syscall if
[__ASSUME_RECVMMSG_SYSCALL], otherwise socketcall.
* sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Use syscall if
[__ASSUME_SENDMMSG_SYSCALL], otherwise socketcall.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ACCEPT4_SYSCALL): Move to general list of macros for
socket syscalls.
(__ASSUME_RECVMMSG_SYSCALL): Likewise.
(__ASSUME_SENDMMSG_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/i386/kernel-features.h
(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove.
(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove.
* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/sparc/kernel-features.h
(__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise.
(__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
(__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
2017-05-09 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-05-09 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* posix/Makefile (headers): Add pthreadtypes-arch.h and * posix/Makefile (headers): Add pthreadtypes-arch.h and

11
sysdeps/unix/sysv/linux/accept4.c
View File

@ -28,14 +28,9 @@
int int
accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags) accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags)
{ {
/* Do not use the accept4 syscall on socketcall architectures unless #ifdef __ASSUME_ACCEPT4_SYSCALL
it was added at the same time as the socketcall support or can be
assumed to be present. */
#if defined __ASSUME_SOCKETCALL \
&& !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_ACCEPT4_SYSCALL
return SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags);
#else
return SYSCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags); return SYSCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags);
#else
return SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags);
#endif #endif
} }

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

@ -20,12 +20,6 @@
/* i386 uses socketcall. */ /* i386 uses socketcall. */
#define __ASSUME_SOCKETCALL 1 #define __ASSUME_SOCKETCALL 1
/* The recvmmsg syscall was added for i386 in 2.6.33. */
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
/* The sendmmsg syscall was added for i386 in 3.0. */
#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
/* 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_SOCKET_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1

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

@ -71,16 +71,6 @@
2.6.27. */ 2.6.27. */
#define __ASSUME_IN_NONBLOCK 1 #define __ASSUME_IN_NONBLOCK 1
/* Support for accept4 functionality was added in 2.6.28, but for some
architectures using a separate syscall rather than socketcall that
syscall was only added later, and some architectures first had
socketcall support then a separate syscall. Define
__ASSUME_ACCEPT4_SYSCALL if it is available through a separate
syscall, and __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL if it became
available through a separate syscall at the same time as through
socketcall. */
#define __ASSUME_ACCEPT4_SYSCALL 1
/* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */ /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
#define __ASSUME_FUTEX_CLOCK_REALTIME 1 #define __ASSUME_FUTEX_CLOCK_REALTIME 1
@ -88,18 +78,12 @@
#define __ASSUME_PREADV 1 #define __ASSUME_PREADV 1
#define __ASSUME_PWRITEV 1 #define __ASSUME_PWRITEV 1
/* Support for recvmmsg functionality was added in 2.6.33. The macros
defined correspond to those for accept4. */
#define __ASSUME_RECVMMSG_SYSCALL 1
/* statfs fills in f_flags since 2.6.36. */ /* statfs fills in f_flags since 2.6.36. */
#if __LINUX_KERNEL_VERSION >= 0x020624 #if __LINUX_KERNEL_VERSION >= 0x020624
# define __ASSUME_STATFS_F_FLAGS 1 # define __ASSUME_STATFS_F_FLAGS 1
#endif #endif
/* Support for sendmmsg functionality was added in 3.0. The macros /* Support for sendmmsg functionality was added in 3.0. */
defined correspond to those for accept4 and recvmmsg. */
#define __ASSUME_SENDMMSG_SYSCALL 1
#define __ASSUME_SENDMMSG 1 #define __ASSUME_SENDMMSG 1
/* On most architectures, most socket syscalls are supported for all /* On most architectures, most socket syscalls are supported for all
@ -111,6 +95,9 @@
#define __ASSUME_CONNECT_SYSCALL 1 #define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_RECVFROM_SYSCALL 1 #define __ASSUME_RECVFROM_SYSCALL 1
#define __ASSUME_SENDTO_SYSCALL 1 #define __ASSUME_SENDTO_SYSCALL 1
#define __ASSUME_ACCEPT4_SYSCALL 1
#define __ASSUME_RECVMMSG_SYSCALL 1
#define __ASSUME_SENDMMSG_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. */

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

@ -33,9 +33,6 @@
#define __ASSUME_GETSOCKOPT_SYSCALL 1 #define __ASSUME_GETSOCKOPT_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1 #define __ASSUME_SETSOCKOPT_SYSCALL 1
/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* Support for the pselect6, preadv and pwritev syscalls was added in /* Support for the pselect6, preadv and pwritev syscalls was added in

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

@ -34,9 +34,6 @@
#define __ASSUME_GETSOCKOPT_SYSCALL 1 #define __ASSUME_GETSOCKOPT_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1 #define __ASSUME_SETSOCKOPT_SYSCALL 1
/* The sendmmsg syscall was added for PowerPC in 3.0. */
#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
/* Define this if your 32-bit syscall API requires 64-bit register /* Define this if your 32-bit syscall API requires 64-bit register
pairs to start with an even-number register. */ pairs to start with an even-number register. */
#ifndef __powerpc64__ #ifndef __powerpc64__

11
sysdeps/unix/sysv/linux/recvmmsg.c
View File

@ -28,14 +28,9 @@ int
recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
struct timespec *tmo) struct timespec *tmo)
{ {
/* Do not use the recvmmsg syscall on socketcall architectures unless #ifdef __ASSUME_RECVMMSG_SYSCALL
it was added at the same time as the socketcall support or can be
assumed to be present. */
#if defined __ASSUME_SOCKETCALL \
&& !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_RECVMMSG_SYSCALL
return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
#else
return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
#else
return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo);
#endif #endif
} }

11
sysdeps/unix/sysv/linux/sendmmsg.c
View File

@ -27,15 +27,10 @@
int int
__sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) __sendmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
{ {
/* Do not use the sendmmsg syscall on socketcall architectures unless #ifdef __ASSUME_SENDMMSG_SYSCALL
it was added at the same time as the socketcall support or can be
assumed to be present. */
#if defined __ASSUME_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL \
&& !defined __ASSUME_SENDMMSG_SYSCALL
return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
#else
return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags); return SYSCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
#else
return SOCKETCALL_CANCEL (sendmmsg, fd, vmessages, vlen, flags);
#endif #endif
} }
libc_hidden_def (__sendmmsg) libc_hidden_def (__sendmmsg)

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

@ -37,9 +37,6 @@
#define __ASSUME_GETSOCKOPT_SYSCALL 1 #define __ASSUME_GETSOCKOPT_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1 #define __ASSUME_SETSOCKOPT_SYSCALL 1
/* The sendmmsg syscall was added for SH in 3.0. */
#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* SH does not have a 64-bit inode field. */ /* SH does not have a 64-bit inode field. */

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

@ -20,15 +20,6 @@
/* SPARC uses socketcall. */ /* SPARC uses socketcall. */
#define __ASSUME_SOCKETCALL 1 #define __ASSUME_SOCKETCALL 1
/* The accept4 syscall was added for SPARC in 2.6.28. */
#define __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL 1
/* The recvmmsg syscall was added for SPARC in 2.6.33. */
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
/* The sendmmsg syscall was added for SPARC in 3.0. */
#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* 32-bit SPARC kernels do not support /* 32-bit SPARC kernels do not support