From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 53EDA38469B5 for ; Tue, 6 Dec 2022 16:15:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 53EDA38469B5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670343328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rF+GA7VIdiZihM29C7TzQmJ/KaYhUcQU2kXd6qRh/Jo=; b=aHMoykeZ65A6kUK67uNGORvB2MTRdPTfuB4yU2sXReVngXt3KQV9xpwyl0lJujX6f2ing8 FHMA8UtzZFD9/GsEPFr7zR9JSc2n4+QYFwBEQ/EEH93u1U9f2XnSp/pnmtq5ftm/NwzwQV NOQfcMumtPQF3aBOhNzPr8ZgzbeY8ZU= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-615--bBPbngXMv6wygE7eLW2EQ-1; Tue, 06 Dec 2022 11:15:27 -0500 X-MC-Unique: -bBPbngXMv6wygE7eLW2EQ-1 Received: by mail-io1-f72.google.com with SMTP id o16-20020a056602225000b006e032e361ccso442652ioo.13 for ; Tue, 06 Dec 2022 08:15:27 -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=rF+GA7VIdiZihM29C7TzQmJ/KaYhUcQU2kXd6qRh/Jo=; b=N+1qbJxj4tP7MVH8frreddMIIfJ1NV3eA4tFm8PELW0/korjFNDjOEFEOZ89AsusE6 JtncIa1iD78PUi9ApGDAXeUlc4FUFrCxAPlWJW4wtjfI3bGKmd9T92pXA0iu5Vrd71G0 uX2TuHm+TucAQYhZ/vXNYQ9/r1g5ESGEQ63Na0noctyaL3K3ioV1Mxk90Y/TnfDAu04n 78hv0ttumHelJJzoR4/zUkLYquxilgSs9FY6+gumugZfhSxrqTd2noXuRQSjKcPZh6wU dr/exRkjstZnqp4hcMdEl0pic7eBTQl1SDN0eqk6ETtsL2U5REOaOGqaI9DqRLDzdyH+ OsWg== X-Gm-Message-State: ANoB5pm9i+gIHH0DygJid+FQvvZYXZC34+VCSa1k4HBYpRa7hKxC7Nmz ZBLDi892sum6lLhFRneRpMSsPFqiHY1FQJo7rwRGb/I5wbczcCfj2lrxXbywidJLCgsJu67QalO S0+u0ptK2B52wPxLInmbU X-Received: by 2002:a05:6638:1124:b0:38a:171a:dee with SMTP id f4-20020a056638112400b0038a171a0deemr10149970jar.292.1670343326808; Tue, 06 Dec 2022 08:15:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf6m7xYJQO6OUUoKSRfVxw9OH6ocAmvDU53KXWBItQnhmqm5LcJi/3L0J3THAazXZgA9uC5giQ== X-Received: by 2002:a05:6638:1124:b0:38a:171a:dee with SMTP id f4-20020a056638112400b0038a171a0deemr10149950jar.292.1670343326495; Tue, 06 Dec 2022 08:15:26 -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 p17-20020a056638191100b0038a4a8f0addsm2123479jal.135.2022.12.06.08.15.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 08:15:25 -0800 (PST) Message-ID: <455d18e7-a0c9-0940-5b90-92310bec777a@redhat.com> Date: Tue, 6 Dec 2022 11:15:25 -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 20/30] Linux: Assume and consolidate socketpair wire-up syscall To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-21-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20221019221433.1082017-21-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-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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/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/socketpair.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 e5a62811a5..95ed2cbac8 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 > -socketpair - socketpair i:iiif __socketpair socketpair OK. Remove wrapper. > 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 4c2f1eb8f5..8a7fe47602 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_SOCKETPAIR_SYSCALL 1 > # define __ASSUME_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > @@ -41,6 +40,7 @@ > # undef __ASSUME_SETSOCKOPT_SYSCALL > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > +# undef __ASSUME_SOCKETPAIR_SYSCALL OK. Expect 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 a42b70c85b..fd44b39cf4 100644 > --- a/sysdeps/unix/sysv/linux/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/kernel-features.h > @@ -81,6 +81,7 @@ > #define __ASSUME_SETSOCKOPT_SYSCALL 1 > #define __ASSUME_BIND_SYSCALL 1 > #define __ASSUME_SOCKET_SYSCALL 1 > +#define __ASSUME_SOCKETPAIR_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/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h > index 38ffbdbaed..46b3045b56 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_SOCKETPAIR_SYSCALL 1 > # define __ASSUME_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > @@ -43,6 +42,7 @@ > # undef __ASSUME_SETSOCKOPT_SYSCALL > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > +# undef __ASSUME_SOCKETPAIR_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 389dd146b4..198ff3209d 100644 > --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h > @@ -22,7 +22,6 @@ > #define __ASSUME_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > -#define __ASSUME_SOCKETPAIR_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > #define __ASSUME_RECV_SYSCALL 1 > #define __ASSUME_SHUTDOWN_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > index 9ee1dc2bc7..72ec2df178 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > @@ -22,7 +22,6 @@ > #define __ASSUME_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > -#define __ASSUME_SOCKETPAIR_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > #define __ASSUME_RECV_SYSCALL 1 > #define __ASSUME_SHUTDOWN_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h > index d5991b265b..01fc98e9ab 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_SOCKETPAIR_SYSCALL 1 > # define __ASSUME_LISTEN_SYSCALL 1 > # define __ASSUME_GETSOCKNAME_SYSCALL 1 > # define __ASSUME_GETPEERNAME_SYSCALL 1 > @@ -43,6 +42,7 @@ > # undef __ASSUME_SETSOCKOPT_SYSCALL > # undef __ASSUME_BIND_SYSCALL > # undef __ASSUME_SOCKET_SYSCALL > +# undef __ASSUME_SOCKETPAIR_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 3b57eb7f27..b18314a9cd 100644 > --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h > @@ -27,7 +27,6 @@ > #define __ASSUME_LISTEN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > #define __ASSUME_GETPEERNAME_SYSCALL 1 > -#define __ASSUME_SOCKETPAIR_SYSCALL 1 > #define __ASSUME_SEND_SYSCALL 1 > #define __ASSUME_RECV_SYSCALL 1 > #define __ASSUME_SHUTDOWN_SYSCALL 1 > diff --git a/sysdeps/unix/sysv/linux/socketpair.c b/sysdeps/unix/sysv/linux/socketpair.c > index d06cbbc2c9..65f8cb46dc 100644 > --- a/sysdeps/unix/sysv/linux/socketpair.c > +++ b/sysdeps/unix/sysv/linux/socketpair.c OK. Default C implementation. > @@ -15,19 +15,14 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -#include > #include > - > #include > -#include > -#include > > int > __socketpair (int domain, int type, int protocol, int sv[2]) > { > #ifdef __ASSUME_SOCKETPAIR_SYSCALL > - return INLINE_SYSCALL (socketpair, 4, domain, type, protocol, &sv[0]); > + return INLINE_SYSCALL_CALL (socketpair, domain, type, protocol, &sv[0]); OK. > #else > return SOCKETCALL (socketpair, domain, type, protocol, sv); > #endif > diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h > index f3a5ef6a99..f43e5c384f 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_SOCKETPAIR_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > #endif > -- Cheers, Carlos.