From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 87B791F601 for ; Mon, 5 Dec 2022 16:40:48 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="KC7vu050"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE6D239540A2 for ; Mon, 5 Dec 2022 16:40:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE6D239540A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670258447; bh=vIUAEf0fm7vgAJVlIWyJciFqaNZyzLZMcLfxMIuZiKk=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=KC7vu050if2B/d2oAkm5w3cP/rGQa/X9eLurEjIbyasIJ/HlPy274VEQ05O2YFgqQ 8LWRhIbELwojtBSIONT/FOa3EvbnOSVutAWWt2LvtB/GoBZ9e8vLkH771BLH6AECEk mgl8/UmgvLDvpDxZ0B3OMuU7ZlrU4A1jA1LZ5vwQ= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 682AD3940CED for ; Mon, 5 Dec 2022 16:39:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 682AD3940CED Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-639-kj7gm7UdN56C1ayoZhDFNQ-1; Mon, 05 Dec 2022 11:39:47 -0500 X-MC-Unique: kj7gm7UdN56C1ayoZhDFNQ-1 Received: by mail-io1-f69.google.com with SMTP id e15-20020a056602158f00b006e01d8fa493so982876iow.3 for ; Mon, 05 Dec 2022 08:39:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vIUAEf0fm7vgAJVlIWyJciFqaNZyzLZMcLfxMIuZiKk=; b=EJpHud4I5bzcYCGI1J+HoSK5RivT8Np5h7qSu0GpaoKF1eYpYSuS/DFvDdRtK6Jj3q DW0UU/cVQ1ww2P5BBUvxlB4WIuVh+XAyettEkORMv5rwjQmuoSXqTXPPs5d7dfMniLzI 4rBvYoLLrMVgVgLxkjTZ89dJyGtPpMARTvPC+DKjYZoRdj7i3oQ1G7easj3xwivtBxZX c5cKF+n6oGoksPkL3DV/w+o4MsLDihjG6vo2dkWF+V5kAkirWPO3MPLvN15nnIxONkCh LsbLiLY3voNOfe1Tv688CNNpWq/+usostjEidTVJfuroEtkli42GC/MsSOubNjGhOJso 4r4Q== X-Gm-Message-State: ANoB5pkUmNLMWDd8jB+7sEqJv7K0uSMR9WbJbHE/Lpps2Sdg3nThNgQ/ GKUO1gN2Kvwfw5ky7KQ/US0PAlzapadXSuc6dDmxz9vI2h8jPhcCZC5SgG70d4nX/u7e/KDy+yB HjA7iCyq/kWGww9ClKBUh X-Received: by 2002:a6b:ec08:0:b0:6e0:d52:c1e6 with SMTP id c8-20020a6bec08000000b006e00d52c1e6mr2619467ioh.131.1670258387015; Mon, 05 Dec 2022 08:39:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf7wHBKHWUL/vF4gXdBaZAMKgf/Wa/Vp/MLkt3FS0HqHaax+CQ5c3P/b7MavDlJd5nMbbLQ+tg== X-Received: by 2002:a6b:ec08:0:b0:6e0:d52:c1e6 with SMTP id c8-20020a6bec08000000b006e00d52c1e6mr2619459ioh.131.1670258386673; Mon, 05 Dec 2022 08:39:46 -0800 (PST) Received: from [192.168.0.241] (192-0-145-146.cpe.teksavvy.com. [192.0.145.146]) by smtp.gmail.com with ESMTPSA id p13-20020a02b00d000000b00375664a365esm5862630jah.1.2022.12.05.08.39.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Dec 2022 08:39:46 -0800 (PST) Message-ID: <75e8c35d-590d-20a4-bdc6-14b4b8bb9216@redhat.com> Date: Mon, 5 Dec 2022 11:39:45 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: [PATCH 18/30] Linux: Assume and consolidate bind wire-up syscall To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-19-adhemerval.zanella@linaro.org> Organization: Red Hat In-Reply-To: <20221019221433.1082017-19-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" 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 Tested-by: Carlos O'Donell > --- > 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 > . */ > > -#include > -#include > #include > - > #include > -#include > -#include > > 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. */ -- Cheers, Carlos.