[18/30] Linux: Assume and consolidate bind wire-up syscall
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
And disable if kernel does not support it.
Checked on x86_64-linux-gnu and i686-linux-gnu.
---
sysdeps/unix/sysv/linux/bind.c | 7 +------
sysdeps/unix/sysv/linux/generic/syscalls.list | 1 -
sysdeps/unix/sysv/linux/i386/kernel-features.h | 2 +-
sysdeps/unix/sysv/linux/kernel-features.h | 1 +
sysdeps/unix/sysv/linux/m68k/kernel-features.h | 2 +-
sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 1 -
sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 1 -
sysdeps/unix/sysv/linux/s390/kernel-features.h | 2 +-
sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 -
sysdeps/unix/sysv/linux/sparc/kernel-features.h | 5 ++++-
10 files changed, 9 insertions(+), 14 deletions(-)
Comments
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> And disable if kernel does not support it.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
LGTM.
No regressions on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/bind.c | 7 +------
> sysdeps/unix/sysv/linux/generic/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/i386/kernel-features.h | 2 +-
> sysdeps/unix/sysv/linux/kernel-features.h | 1 +
> sysdeps/unix/sysv/linux/m68k/kernel-features.h | 2 +-
> sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/s390/kernel-features.h | 2 +-
> sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/sparc/kernel-features.h | 5 ++++-
> 10 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/bind.c b/sysdeps/unix/sysv/linux/bind.c
> index 83992a5dbd..97a42c497f 100644
> --- a/sysdeps/unix/sysv/linux/bind.c
> +++ b/sysdeps/unix/sysv/linux/bind.c
> @@ -15,19 +15,14 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <errno.h>
> -#include <signal.h>
> #include <sys/socket.h>
> -
> #include <socketcall.h>
> -#include <kernel-features.h>
> -#include <sys/syscall.h>
>
> int
> __bind (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len)
> {
> #ifdef __ASSUME_BIND_SYSCALL
> - return INLINE_SYSCALL (bind, 3, fd, addr.__sockaddr__, len);
> + return INLINE_SYSCALL_CALL (bind, fd, addr.__sockaddr__, len);
OK.
> #else
> return SOCKETCALL (bind, fd, addr.__sockaddr__, len, 0, 0, 0);
> #endif
> diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
> index f573f27c8b..889b62bbea 100644
> --- a/sysdeps/unix/sysv/linux/generic/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list
> @@ -3,7 +3,6 @@
> # Socket APIs
> socket - socket i:iii __socket socket
> socketpair - socketpair i:iiif __socketpair socketpair
> -bind - bind i:ipi __bind bind
OK. C wrapper always present.
> listen - listen i:ii __listen listen
> getsockname - getsockname i:ipp __getsockname getsockname
> getpeername - getpeername i:ipp __getpeername getpeername
> diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> index 87d610cd66..babb0ff83d 100644
> --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> @@ -21,7 +21,6 @@
> #if __LINUX_KERNEL_VERSION >= 0x040300
> # define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> -# define __ASSUME_BIND_SYSCALL 1
OK.
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> @@ -41,6 +40,7 @@
> # undef __ASSUME_SENDTO_SYSCALL
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> +# undef __ASSUME_BIND_SYSCALL
> #endif
>
> /* i686 only supports ipc syscall before 5.1. */
> diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
> index 74adc3956b..3dc93f5b11 100644
> --- a/sysdeps/unix/sysv/linux/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/kernel-features.h
> @@ -79,6 +79,7 @@
> #define __ASSUME_SENDMMSG_SYSCALL 1
> #define __ASSUME_GETSOCKOPT_SYSCALL 1
> #define __ASSUME_SETSOCKOPT_SYSCALL 1
> +#define __ASSUME_BIND_SYSCALL 1
OK.
>
> /* Support for SysV IPC through wired syscalls. All supported architectures
> either support ipc syscall and/or all the ipc correspondent syscalls. */
> diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> index d807ac9cfd..37209378b9 100644
> --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> @@ -21,7 +21,6 @@
> #if __LINUX_KERNEL_VERSION >= 0x040300
> # define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> -# define __ASSUME_BIND_SYSCALL 1
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> @@ -43,6 +42,7 @@
> # undef __ASSUME_SENDTO_SYSCALL
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> +# undef __ASSUME_BIND_SYSCALL
OK.
> #endif
>
> /* No support for PI futexes or robust mutexes before 3.10 for m68k. */
> diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> index 8ae3cdcd96..7fff6dd902 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> @@ -19,7 +19,6 @@
>
> /* All supported kernel versions for MicroBlaze have these syscalls. */
> #define __ASSUME_SOCKET_SYSCALL 1
> -#define __ASSUME_BIND_SYSCALL 1
OK.
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> #define __ASSUME_GETSOCKNAME_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> index 894f29d381..af4555bb1d 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> @@ -19,7 +19,6 @@
>
> /* New syscalls added for PowerPC in 2.6.37. */
> #define __ASSUME_SOCKET_SYSCALL 1
> -#define __ASSUME_BIND_SYSCALL 1
OK.
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> #define __ASSUME_GETSOCKNAME_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> index a457c84ba1..ae8dc626b2 100644
> --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> @@ -21,7 +21,6 @@
> #if __LINUX_KERNEL_VERSION >= 0x040300
> # define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> -# define __ASSUME_BIND_SYSCALL 1
OK.
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> @@ -43,6 +42,7 @@
> # undef __ASSUME_SENDTO_SYSCALL
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> +# undef __ASSUME_BIND_SYSCALL
> #endif
>
> /* s390 only supports ipc syscall before 5.1. */
> diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
> index 545bef40fd..2883da92b2 100644
> --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
> @@ -24,7 +24,6 @@
>
> /* These syscalls were added for SH in 2.6.37. */
> #define __ASSUME_SOCKET_SYSCALL 1
> -#define __ASSUME_BIND_SYSCALL 1
OK.
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> #define __ASSUME_GETSOCKNAME_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> index 6cbe189b2f..2b7056c0fb 100644
> --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> @@ -48,10 +48,13 @@
>
> /* These syscalls were added for both 32-bit and 64-bit in 4.4. */
> #if __LINUX_KERNEL_VERSION >= 0x040400
> -# define __ASSUME_BIND_SYSCALL 1
OK.
> # define __ASSUME_LISTEN_SYSCALL 1
> #endif
>
> +#if __LINUX_KERNEL_VERSION < 0x040400
> +# undef __ASSUME_BIND_SYSCALL
> +#endif
> +
> #ifdef __arch64__
> /* sparc64 defines __NR_pause, however it is not supported (ENOSYS).
> Undefine so pause.c can use a correct alternative. */
@@ -15,19 +15,14 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <signal.h>
#include <sys/socket.h>
-
#include <socketcall.h>
-#include <kernel-features.h>
-#include <sys/syscall.h>
int
__bind (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len)
{
#ifdef __ASSUME_BIND_SYSCALL
- return INLINE_SYSCALL (bind, 3, fd, addr.__sockaddr__, len);
+ return INLINE_SYSCALL_CALL (bind, fd, addr.__sockaddr__, len);
#else
return SOCKETCALL (bind, fd, addr.__sockaddr__, len, 0, 0, 0);
#endif
@@ -3,7 +3,6 @@
# Socket APIs
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair
-bind - bind i:ipi __bind bind
listen - listen i:ii __listen listen
getsockname - getsockname i:ipp __getsockname getsockname
getpeername - getpeername i:ipp __getpeername getpeername
@@ -21,7 +21,6 @@
#if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1
# define __ASSUME_SOCKETPAIR_SYSCALL 1
-# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
@@ -41,6 +40,7 @@
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
+# undef __ASSUME_BIND_SYSCALL
#endif
/* i686 only supports ipc syscall before 5.1. */
@@ -79,6 +79,7 @@
#define __ASSUME_SENDMMSG_SYSCALL 1
#define __ASSUME_GETSOCKOPT_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1
+#define __ASSUME_BIND_SYSCALL 1
/* Support for SysV IPC through wired syscalls. All supported architectures
either support ipc syscall and/or all the ipc correspondent syscalls. */
@@ -21,7 +21,6 @@
#if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1
# define __ASSUME_SOCKETPAIR_SYSCALL 1
-# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
@@ -43,6 +42,7 @@
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
+# undef __ASSUME_BIND_SYSCALL
#endif
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */
@@ -19,7 +19,6 @@
/* All supported kernel versions for MicroBlaze have these syscalls. */
#define __ASSUME_SOCKET_SYSCALL 1
-#define __ASSUME_BIND_SYSCALL 1
#define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
@@ -19,7 +19,6 @@
/* New syscalls added for PowerPC in 2.6.37. */
#define __ASSUME_SOCKET_SYSCALL 1
-#define __ASSUME_BIND_SYSCALL 1
#define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
@@ -21,7 +21,6 @@
#if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1
# define __ASSUME_SOCKETPAIR_SYSCALL 1
-# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
@@ -43,6 +42,7 @@
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
+# undef __ASSUME_BIND_SYSCALL
#endif
/* s390 only supports ipc syscall before 5.1. */
@@ -24,7 +24,6 @@
/* These syscalls were added for SH in 2.6.37. */
#define __ASSUME_SOCKET_SYSCALL 1
-#define __ASSUME_BIND_SYSCALL 1
#define __ASSUME_CONNECT_SYSCALL 1
#define __ASSUME_LISTEN_SYSCALL 1
#define __ASSUME_GETSOCKNAME_SYSCALL 1
@@ -48,10 +48,13 @@
/* These syscalls were added for both 32-bit and 64-bit in 4.4. */
#if __LINUX_KERNEL_VERSION >= 0x040400
-# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
#endif
+#if __LINUX_KERNEL_VERSION < 0x040400
+# undef __ASSUME_BIND_SYSCALL
+#endif
+
#ifdef __arch64__
/* sparc64 defines __NR_pause, however it is not supported (ENOSYS).
Undefine so pause.c can use a correct alternative. */