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: AS3215 2.6.0.0/16 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_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 D7AA11F601 for ; Tue, 6 Dec 2022 16:18:39 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="hOeS+Fbf"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C2BA384699A for ; Tue, 6 Dec 2022 16:18:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C2BA384699A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670343519; bh=DmFnQoJNipohhQcL7p2stmj0/Laf0lqUV2pfeSRce7g=; 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=hOeS+FbfvpLHj0rz/rbDwQhW6m7sVqGZLQk7AfJdvJQeuZz1J/oVEzMSWJzOYp7J+ JbxAaryI8s4kDYR9CdPJNflddTfvxzaCWOKZQLuda64m6C30pfOIphq/tStNJkYAAg LymfaAI8BEgQb7MXvSbi/jwtIc+NWOL1cfLcb9Co= 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 C2E813871FB5 for ; Tue, 6 Dec 2022 16:17:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C2E813871FB5 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-495-mdZ_soipPpiwX768zAhXIw-1; Tue, 06 Dec 2022 11:17:22 -0500 X-MC-Unique: mdZ_soipPpiwX768zAhXIw-1 Received: by mail-il1-f197.google.com with SMTP id i11-20020a056e02152b00b00303642498daso4423106ilu.5 for ; Tue, 06 Dec 2022 08:17:22 -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=DmFnQoJNipohhQcL7p2stmj0/Laf0lqUV2pfeSRce7g=; b=VBTuubB4sloC9dyy3yMsV4Ptgqn7Ud9gdRnmDyHV2fMyq4DC9EFcKDw960cSm8tyrU b1Y+lXPO+yG2Zs2hQHQ2vyOjU6gTW5EOqhlw5NKqSKtZZp0naAPEpdMTbVH5wVQ8m13E WYbniKyntG/uPaP9Qr98zKGG7dpgyGkAOvqFzJpK8i3mt34ePoBgcgDRbjAqcD2Kwn5f WfRzDnKuJvs/lmHNKoQgOb2eBOMDsXAI35mfnHoPcqkHkEHQxazTB2zc+10sWgCrYrR7 +o+UgLwJmSakrpRzCLBYwHYw5TaQyeOJGdIBGBuG1LKU+pYUFBORrPamcFe9wt1azgjv Rs2g== X-Gm-Message-State: ANoB5plH5Qw9GLCHNtLl0EVAeYqDXHSKsLfYQZ+auIMMnud64fJzGrch RSSuRulSw/JDyFoFyFUyGvxnmIL3ipoxhnBlW+nv6ly5Lytb94Re0KCdu9o44yqeMD1Dj6IgMEO ywJldSGFG7juveY+OibTZ X-Received: by 2002:a6b:f418:0:b0:6ce:8185:ad0 with SMTP id i24-20020a6bf418000000b006ce81850ad0mr32083776iog.213.1670343441165; Tue, 06 Dec 2022 08:17:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Cy6kuZOsxVvjcGZqhiF4lTMyiclm0pYcguVqavQ2xuao7TheXUFX8iAAt6m1TD6JLecoNLw== X-Received: by 2002:a6b:f418:0:b0:6ce:8185:ad0 with SMTP id i24-20020a6bf418000000b006ce81850ad0mr32083766iog.213.1670343440876; Tue, 06 Dec 2022 08:17:20 -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 n7-20020a02a907000000b00389e7fde6fdsm6738367jam.116.2022.12.06.08.17.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 08:17:20 -0800 (PST) Message-ID: Date: Tue, 6 Dec 2022 11:17:19 -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 21/30] Linux: Assume and consolidate listen wire-up syscall To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-22-adhemerval.zanella@linaro.org> Organization: Red Hat In-Reply-To: <20221019221433.1082017-22-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/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/listen.c | 7 +------ > 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, 6 insertions(+), 17 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list > index 95ed2cbac8..706893f245 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 > -listen - listen i:ii __listen listen OK. Remove wrapper. > getsockname - getsockname i:ipp __getsockname getsockname > getpeername - getpeername i:ipp __getpeername getpeername > shutdown - shutdown i:ii __shutdown shutdown > diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h > index 8a7fe47602..a79ec679cc 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_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > @@ -41,6 +40,7 @@ > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > # undef __ASSUME_SOCKETPAIR_SYSCALL > +# undef __ASSUME_LISTEN_SYSCALL OK. Accept it. > #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 fd44b39cf4..d1769b2d99 100644 > --- a/sysdeps/unix/sysv/linux/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/kernel-features.h > @@ -82,6 +82,7 @@ > #define __ASSUME_BIND_SYSCALL 1 > #define __ASSUME_SOCKET_SYSCALL 1 > #define __ASSUME_SOCKETPAIR_SYSCALL 1 > +#define __ASSUME_LISTEN_SYSCALL 1 OK. Default. > > /* 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/listen.c b/sysdeps/unix/sysv/linux/listen.c > index 8d7ff85edf..e563e4df6c 100644 > --- a/sysdeps/unix/sysv/linux/listen.c > +++ b/sysdeps/unix/sysv/linux/listen.c OK. Now the default wrapper. > @@ -15,19 +15,14 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -#include > #include > - > #include > -#include > -#include > > int > listen (int fd, int backlog) > { > #ifdef __ASSUME_LISTEN_SYSCALL > - return INLINE_SYSCALL (listen, 2, fd, backlog); > + return INLINE_SYSCALL_CALL (listen, fd, backlog); OK. > #else > return SOCKETCALL (listen, fd, backlog); > #endif > diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h > index 46b3045b56..a65fa63c5e 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_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > @@ -43,6 +42,7 @@ > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > # undef __ASSUME_SOCKETPAIR_SYSCALL > +# undef __ASSUME_LISTEN_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 198ff3209d..e19e6bb6ba 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_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > index 72ec2df178..eb73a91a5d 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_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h > index 01fc98e9ab..3daee3f132 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_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > @@ -43,6 +42,7 @@ > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > # undef __ASSUME_SOCKETPAIR_SYSCALL > +# undef __ASSUME_LISTEN_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 b18314a9cd..23eadf84e0 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_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h > index f43e5c384f..7070aaa1ae 100644 > --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h > @@ -45,12 +45,9 @@ > #endif > > /* These syscalls were added for both 32-bit and 64-bit in 4.4. */ > -#if __LINUX_KERNEL_VERSION >= 0x040400 > -# define __ASSUME_LISTEN_SYSCALL 1 > -#endif > - > #if __LINUX_KERNEL_VERSION < 0x040400 > # undef __ASSUME_BIND_SYSCALL > +# undef __ASSUME_LISTEN_SYSCALL > #endif > > #ifdef __arch64__ -- Cheers, Carlos.