From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v2 2/5] Linux: Assume and consolidate getsockname wire-up syscall
Date: Sun, 19 Feb 2023 16:20:36 -0500 [thread overview]
Message-ID: <6cce5acb-5401-632a-5e71-2d085c0730f7@redhat.com> (raw)
In-Reply-To: <20221207212246.2384051-3-adhemerval.zanella@linaro.org>
On 12/7/22 16:22, Adhemerval Zanella wrote:
> And disable if kernel does not support it.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/generic/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/getsockname.c | 7 +------
> 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 | 6 ++++++
> 10 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
> index 7dbfde0dae..e89ce91ac0 100644
> --- a/sysdeps/unix/sysv/linux/generic/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list
> @@ -1,5 +1,4 @@
> # File name Caller Syscall name # args Strong name Weak names
>
> # Socket APIs
> -getsockname - getsockname i:ipp __getsockname getsockname
OK.
> getpeername - getpeername i:ipp __getpeername getpeername
> diff --git a/sysdeps/unix/sysv/linux/getsockname.c b/sysdeps/unix/sysv/linux/getsockname.c
> index d0718c2aaf..8350b800fe 100644
> --- a/sysdeps/unix/sysv/linux/getsockname.c
> +++ b/sysdeps/unix/sysv/linux/getsockname.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
> __getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len)
> {
> #ifdef __ASSUME_GETSOCKNAME_SYSCALL
> - return INLINE_SYSCALL (getsockname, 3, fd, addr.__sockaddr__, len);
> + return INLINE_SYSCALL_CALL (getsockname, fd, addr.__sockaddr__, len);
OK.
> #else
> return SOCKETCALL (getsockname, fd, addr.__sockaddr__, len);
> #endif
> diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> index ddf9ec0e5f..0c949349e1 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_GETSOCKNAME_SYSCALL 1
OK. Refactoring here. We let the default linux generic decide what to do,
but if we are on < 4.3 then we disable trying getsockname. Semantics remain
the same, we just changed the way the default is set.
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> #endif
>
> @@ -42,6 +41,7 @@
> # undef __ASSUME_SOCKETPAIR_SYSCALL
> # undef __ASSUME_LISTEN_SYSCALL
> # undef __ASSUME_SHUTDOWN_SYSCALL
> +# undef __ASSUME_GETSOCKNAME_SYSCALL
OK.
> #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 e63bd4b4fc..cac8708050 100644
> --- a/sysdeps/unix/sysv/linux/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/kernel-features.h
> @@ -84,6 +84,7 @@
> #define __ASSUME_SOCKETPAIR_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> #define __ASSUME_SHUTDOWN_SYSCALL 1
> +#define __ASSUME_GETSOCKNAME_SYSCALL 1
OK. Assume it in the generic linux support.
>
> /* 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 55b8958fb2..b8f8e48c8a 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_GETSOCKNAME_SYSCALL 1
OK. Remove.
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> #endif
>
> @@ -44,6 +43,7 @@
> # undef __ASSUME_SOCKETPAIR_SYSCALL
> # undef __ASSUME_LISTEN_SYSCALL
> # undef __ASSUME_SHUTDOWN_SYSCALL
> +# undef __ASSUME_GETSOCKNAME_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 9ee6c621ee..12f9a55b03 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_CONNECT_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
OK. This one isn't even needed after the refactor.
> #define __ASSUME_GETPEERNAME_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> index ad9eb340b5..852bac0313 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_CONNECT_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
OK. Likewise.
> #define __ASSUME_GETPEERNAME_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> index e47c628f51..3a3942fa68 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_GETSOCKNAME_SYSCALL 1
OK.
> # define __ASSUME_GETPEERNAME_SYSCALL 1
> #endif
>
> @@ -44,6 +43,7 @@
> # undef __ASSUME_SOCKETPAIR_SYSCALL
> # undef __ASSUME_LISTEN_SYSCALL
> # undef __ASSUME_SHUTDOWN_SYSCALL
> +# undef __ASSUME_GETSOCKNAME_SYSCALL
OK.
> #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 0ab656d58e..7a15569dfc 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_CONNECT_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
OK. Not needed.
> #define __ASSUME_GETPEERNAME_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> index 12e98a9f95..8ada43587b 100644
> --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
> @@ -42,6 +42,12 @@
> # undef __ASSUME_SETSOCKOPT_SYSCALL
> #endif
>
> +/* There syscalls were added for 32-bit in compat syscall table only
> + in 4.20 (but present for 64-bit in all supported kernel versions). */
> +#if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400
> +# undef __ASSUME_GETSOCKNAME_SYSCALL
> +#endif
OK.
> +
> /* These syscalls were added for both 32-bit and 64-bit in 4.4. */
> #if __LINUX_KERNEL_VERSION < 0x040400
> # undef __ASSUME_BIND_SYSCALL
--
Cheers,
Carlos.
next prev parent reply other threads:[~2023-02-20 13:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-07 21:22 [PATCH v2 0/5] Remove Linux generic sysdep Adhemerval Zanella
2022-12-07 21:22 ` [PATCH v2 1/5] Linux: Move wordsize-32 Version to default Adhemerval Zanella
2023-02-19 21:11 ` Carlos O'Donell
2022-12-07 21:22 ` [PATCH v2 2/5] Linux: Assume and consolidate getsockname wire-up syscall Adhemerval Zanella
2023-02-19 21:20 ` Carlos O'Donell [this message]
2022-12-07 21:22 ` [PATCH v2 3/5] Linux: Assume and consolidate getpeername " Adhemerval Zanella
2023-02-19 21:23 ` Carlos O'Donell
2022-12-07 21:22 ` [PATCH v2 4/5] Linux: Remove unused generic Makefile Adhemerval Zanella
2023-02-19 21:27 ` Carlos O'Donell
2022-12-08 12:46 ` [PATCH v2 5/5] Linux: Remove generic Implies Adhemerval Zanella
2023-02-19 21:29 ` [PATCH v2 0/5] Remove Linux generic sysdep 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=6cce5acb-5401-632a-5e71-2d085c0730f7@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).