From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH 19/30] Linux: Assume iand consolidate socket wire-up syscall
Date: Mon, 5 Dec 2022 11:39:43 -0500 [thread overview]
Message-ID: <185ec803-6471-fbaf-3511-b61bfed5701b@redhat.com> (raw)
In-Reply-To: <20221019221433.1082017-20-adhemerval.zanella@linaro.org>
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> And disable if kernel does not support it.
LGTM.
No regressions on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> 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/socket.c | 7 +------
> sysdeps/unix/sysv/linux/sparc/kernel-features.h | 1 -
> 10 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
> index 889b62bbea..e5a62811a5 100644
> --- a/sysdeps/unix/sysv/linux/generic/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list
> @@ -1,7 +1,6 @@
> # File name Caller Syscall name # args Strong name Weak names
>
> # Socket APIs
> -socket - socket i:iii __socket socket
> socketpair - socketpair i:iiif __socketpair socketpair
> listen - listen i:ii __listen listen
> getsockname - getsockname i:ipp __getsockname getsockname
> diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> index babb0ff83d..4c2f1eb8f5 100644
> --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> @@ -19,7 +19,6 @@
>
> /* Direct socketcalls available with kernel 4.3. */
> #if __LINUX_KERNEL_VERSION >= 0x040300
> -# define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> @@ -41,6 +40,7 @@
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> # undef __ASSUME_BIND_SYSCALL
> +# undef __ASSUME_SOCKET_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 3dc93f5b11..a42b70c85b 100644
> --- a/sysdeps/unix/sysv/linux/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/kernel-features.h
> @@ -80,6 +80,7 @@
> #define __ASSUME_GETSOCKOPT_SYSCALL 1
> #define __ASSUME_SETSOCKOPT_SYSCALL 1
> #define __ASSUME_BIND_SYSCALL 1
> +#define __ASSUME_SOCKET_SYSCALL 1
>
> /* 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 37209378b9..38ffbdbaed 100644
> --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> @@ -19,7 +19,6 @@
>
> /* Direct socketcalls available with kernel 4.3. */
> #if __LINUX_KERNEL_VERSION >= 0x040300
> -# define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> @@ -43,6 +42,7 @@
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> # undef __ASSUME_BIND_SYSCALL
> +# undef __ASSUME_SOCKET_SYSCALL
> #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 7fff6dd902..389dd146b4 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> @@ -18,7 +18,6 @@
> #include <endian.h>
>
> /* All supported kernel versions for MicroBlaze have these syscalls. */
> -#define __ASSUME_SOCKET_SYSCALL 1
> #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 af4555bb1d..9ee1dc2bc7 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> @@ -18,7 +18,6 @@
> <https://www.gnu.org/licenses/>. */
>
> /* New syscalls added for PowerPC in 2.6.37. */
> -#define __ASSUME_SOCKET_SYSCALL 1
> #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 ae8dc626b2..d5991b265b 100644
> --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> @@ -19,7 +19,6 @@
>
> /* Direct socketcalls available with kernel 4.3. */
> #if __LINUX_KERNEL_VERSION >= 0x040300
> -# define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKNAME_SYSCALL 1
> @@ -43,6 +42,7 @@
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> # undef __ASSUME_BIND_SYSCALL
> +# undef __ASSUME_SOCKET_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 2883da92b2..3b57eb7f27 100644
> --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
> @@ -23,7 +23,6 @@
> #include <endian.h>
>
> /* These syscalls were added for SH in 2.6.37. */
> -#define __ASSUME_SOCKET_SYSCALL 1
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> #define __ASSUME_GETSOCKNAME_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/socket.c b/sysdeps/unix/sysv/linux/socket.c
> index 0fc7a61d06..0258fff872 100644
> --- a/sysdeps/unix/sysv/linux/socket.c
> +++ b/sysdeps/unix/sysv/linux/socket.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
> __socket (int fd, int type, int domain)
> {
> #ifdef __ASSUME_SOCKET_SYSCALL
> - return INLINE_SYSCALL (socket, 3, fd, type, domain);
> + return INLINE_SYSCALL_CALL (socket, fd, type, domain);
> #else
> return SOCKETCALL (socket, fd, type, domain);
> #endif
> diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> index 2b7056c0fb..f3a5ef6a99 100644
> --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> @@ -41,7 +41,6 @@
> # undef __ASSUME_GETSOCKOPT_SYSCALL
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> #else
> -# define __ASSUME_SOCKET_SYSCALL 1
> # define __ASSUME_SOCKETPAIR_SYSCALL 1
> # define __ASSUME_SHUTDOWN_SYSCALL 1
> #endif
--
Cheers,
Carlos.
next prev parent reply other threads:[~2022-12-05 16:39 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 22:14 [PATCH 00/30] Remove Linux generic sysdep Adhemerval Zanella
2022-10-19 22:14 ` [PATCH 01/30] linux: Fix generic struct_stat for 64 bit time (BZ# 29657) Adhemerval Zanella
2022-10-25 17:50 ` Joseph Myers
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 02/30] linux: Consolidate dl-origin.c Adhemerval Zanella
2022-10-19 22:14 ` [PATCH 03/30] Linux: consolidate chmod implementation Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 04/30] Linux: consolidate chown implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 05/30] Linux: consolidate dup2 implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 06/30] Lninux: consolidate epoll_create implementation Adhemerval Zanella
2022-10-21 8:57 ` Florian Weimer
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 07/30] Linux: consolidate inotify_init implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 08/30] Linux: consolidate lchown implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 09/30] Linux: consolidate link implementation Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 10/30] Linux: consolidate mkdir implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 11/30] Linux: consolidate readlink implementation Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 12/30] Linux: consolidate rmdir implementation Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 13/30] Linux: consolidate symlink implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 14/30] Linux: consolidate unlink implementation Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 15/30] Linux: consolidate sendfile implementation Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 16/30] Linux: Move wordsize-32 Version to default Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-12-07 0:10 ` Joseph Myers
2022-12-07 20:19 ` Adhemerval Zanella Netto
2022-10-19 22:14 ` [PATCH 17/30] Linux: consolidate ____longjmp_chk Adhemerval Zanella
2022-12-05 16:40 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 18/30] Linux: Assume and consolidate bind wire-up syscall Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 19/30] Linux: Assume iand consolidate socket " Adhemerval Zanella
2022-12-05 16:39 ` Carlos O'Donell [this message]
2022-10-19 22:14 ` [PATCH 20/30] Linux: Assume and consolidate socketpair " Adhemerval Zanella
2022-12-06 16:15 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 21/30] Linux: Assume and consolidate listen " Adhemerval Zanella
2022-12-06 16:17 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 22/30] Linux: Assume and consolidate getsockname " Adhemerval Zanella
2022-10-20 0:01 ` Joseph Myers
2022-10-20 18:12 ` Adhemerval Zanella Netto
2022-12-06 16:18 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 23/30] Linux: Assume and consolidate getpeername " Adhemerval Zanella
2022-10-20 0:02 ` Joseph Myers
2022-12-06 16:20 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 24/30] Linux: Assume and consolidate shutdown " Adhemerval Zanella
2022-12-06 16:23 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 25/30] Linux: Remove unused generic Makefile Adhemerval Zanella
2022-12-06 17:24 ` Carlos O'Donell
2022-12-07 21:19 ` Adhemerval Zanella Netto
2022-10-19 22:14 ` [PATCH 26/30] Linux: Remove generic sysdep Adhemerval Zanella
2022-12-06 17:29 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 27/30] Linux: make generic xstatver.h the default one Adhemerval Zanella
2022-12-06 17:33 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 28/30] Linux: Make generic fcntl.h " Adhemerval Zanella
2022-12-06 17:36 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 29/30] Linux: Consolidate typesizes.h Adhemerval Zanella
2022-12-06 17:47 ` Carlos O'Donell
2022-10-19 22:14 ` [PATCH 30/30] Linux: Remove generic Implies Adhemerval Zanella
2022-12-06 17:50 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=185ec803-6471-fbaf-3511-b61bfed5701b@redhat.com \
--to=carlos@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).