From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, PDS_RDNS_DYNAMIC_FP,RCVD_IN_DNSWL_MED,RDNS_DYNAMIC,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.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 476451F626 for ; Mon, 20 Feb 2023 13:30:55 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=vRTN7tJG; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0EED2384DD24 for ; Mon, 20 Feb 2023 13:30:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0EED2384DD24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676899854; bh=FAkb6X3S7o+zKDU6aw5E+AVe5rMCLgJXLnmh2fgdVzQ=; 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=vRTN7tJGrAJtQqqXKeh3f4t60lS91scObckRcBNSgOHzPt6fmTD11fi3JpkbSPfet bD+fXugzoyAlk4jP/84Z27u1jG9AWehM+QzvSCfbxzkDGeKQUV6u1Xcvxc2AXuRLcv Dmwae+5SNtA0L2gOJvfvCuu4Cqa86NVWjUThTmHc= 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 97033385B51F for ; Mon, 20 Feb 2023 13:30:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 97033385B51F Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-479-noKwwnssO92pk1ICNK91_A-1; Sun, 19 Feb 2023 16:23:11 -0500 X-MC-Unique: noKwwnssO92pk1ICNK91_A-1 Received: by mail-il1-f198.google.com with SMTP id b13-20020a056e02184d00b0030c45d93884so667015ilv.16 for ; Sun, 19 Feb 2023 13:23:10 -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=FAkb6X3S7o+zKDU6aw5E+AVe5rMCLgJXLnmh2fgdVzQ=; b=31uqdk82U78zWyO2VMSF+ST8dzHek1LKvCcC+0DXzu9wog/hbo5hD9M5nMjT2Zkddw LS+4Wd+31wBKY/2C0cO/MXMboS8B4v1u0s0A99hXM6me8G09Aj62zrxB20m0snvhet5I 8Qkr92Fj84uKJghiNWkJ0andJfjOnYFc3f6INjGRXVDn1SqojpyW8aCuBPGVGtxCZX/1 KzmKMsWMmm/MbkxKju3YnokMZxx4uQcI+0wLuC1r3T4EZvDOI22bOOoRevCtCHWa8ySG kkGDLqmrfPDWzh7nM1/bLX1SKDP4MmoQGZz4sjrAsDv80i0Aaqt/fYK5Rm0AQqmY6dxS Bvsg== X-Gm-Message-State: AO0yUKXfMi0lfI8hzt+bhmGQ40NhQMe2hL/o6gtzZr4AlP41CpbvqZJN 18P/rwtC9HQ3gaw/Wk98kXuBToFi7VXgI9vCiDR3bpUj0PEDeZ0wGVF9KLD4mBpr26I1Fx+WJ1s mJ9cWY3M0SJd56K3X6odZn4iH6Q== X-Received: by 2002:a05:6e02:c2e:b0:310:e6a5:d7b1 with SMTP id q14-20020a056e020c2e00b00310e6a5d7b1mr540798ilg.15.1676841789879; Sun, 19 Feb 2023 13:23:09 -0800 (PST) X-Google-Smtp-Source: AK7set9dg8YEehSyhu3uzPrtxyRlHGIP8Q9Y3WIo4D3vImNs1wioL4q12ZZ3sQpfakMDuD9i+m7hmg== X-Received: by 2002:a05:6e02:c2e:b0:310:e6a5:d7b1 with SMTP id q14-20020a056e020c2e00b00310e6a5d7b1mr540790ilg.15.1676841789558; Sun, 19 Feb 2023 13:23:09 -0800 (PST) Received: from [192.168.0.241] ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id r10-20020a02c6ca000000b00363c4307bb2sm87427jan.79.2023.02.19.13.23.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Feb 2023 13:23:09 -0800 (PST) Message-ID: <818ac12a-8582-7617-34b6-9e850032c1bb@redhat.com> Date: Sun, 19 Feb 2023 16:23:07 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v2 3/5] Linux: Assume and consolidate getpeername wire-up syscall To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> <20221207212246.2384051-4-adhemerval.zanella@linaro.org> Organization: Red Hat In-Reply-To: <20221207212246.2384051-4-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 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 Tested-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/generic/syscalls.list | 4 ---- > sysdeps/unix/sysv/linux/getpeername.c | 7 +------ > sysdeps/unix/sysv/linux/i386/kernel-features.h | 6 +----- > sysdeps/unix/sysv/linux/kernel-features.h | 1 + > sysdeps/unix/sysv/linux/m68k/kernel-features.h | 6 +----- > 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 | 6 +----- > sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 - > sysdeps/unix/sysv/linux/sparc/kernel-features.h | 1 + > 10 files changed, 6 insertions(+), 28 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/generic/syscalls.list > > diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list > deleted file mode 100644 > index e89ce91ac0..0000000000 > --- a/sysdeps/unix/sysv/linux/generic/syscalls.list > +++ /dev/null > @@ -1,4 +0,0 @@ > -# File name Caller Syscall name # args Strong name Weak names > - > -# Socket APIs > -getpeername - getpeername i:ipp __getpeername getpeername OK. Remove getpeername from syscalls.list. Use the generic version C file. > diff --git a/sysdeps/unix/sysv/linux/getpeername.c b/sysdeps/unix/sysv/linux/getpeername.c > index 09ca76b9ad..63fa8e2fe5 100644 > --- a/sysdeps/unix/sysv/linux/getpeername.c > +++ b/sysdeps/unix/sysv/linux/getpeername.c > @@ -15,19 +15,14 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -#include > #include > - > #include > -#include > -#include > > int > __getpeername (int fd, __SOCKADDR_ARG addr, socklen_t *len) > { > #ifdef __ASSUME_GETPEERNAME_SYSCALL > - return INLINE_SYSCALL (getpeername, 3, fd, addr.__sockaddr__, len); > + return INLINE_SYSCALL_CALL (getpeername, fd, addr.__sockaddr__, len); OK. > #else > return SOCKETCALL (getpeername, 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 0c949349e1..d3d5376b92 100644 > --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h > @@ -17,11 +17,6 @@ > License along with the GNU C Library; if not, see > . */ > > -/* Direct socketcalls available with kernel 4.3. */ > -#if __LINUX_KERNEL_VERSION >= 0x040300 > -# define __ASSUME_GETPEERNAME_SYSCALL 1 > -#endif > - OK. Remove check, and refactor meaning. > #include_next > > #undef __ASSUME_ACCEPT_SYSCALL > @@ -42,6 +37,7 @@ > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_SHUTDOWN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_SYSCALL OK. Undefine in < 4.3 kernel. > #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 cac8708050..403223c565 100644 > --- a/sysdeps/unix/sysv/linux/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/kernel-features.h > @@ -85,6 +85,7 @@ > #define __ASSUME_LISTEN_SYSCALL 1 > #define __ASSUME_SHUTDOWN_SYSCALL 1 > #define __ASSUME_GETSOCKNAME_SYSCALL 1 > +#define __ASSUME_GETPEERNAME_SYSCALL 1 OK. Defined by 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 b8f8e48c8a..6f7f4b2481 100644 > --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h > @@ -17,11 +17,6 @@ > License along with the GNU C Library. If not, see > . */ > > -/* Direct socketcalls available with kernel 4.3. */ > -#if __LINUX_KERNEL_VERSION >= 0x040300 > -# define __ASSUME_GETPEERNAME_SYSCALL 1 > -#endif OK. > - > #include_next > > #undef __ASSUME_ACCEPT_SYSCALL > @@ -44,6 +39,7 @@ > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_SHUTDOWN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_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 12f9a55b03..72496aa922 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_GETPEERNAME_SYSCALL 1 OK. Not needed since linux generic defines it. > #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 852bac0313..e2dc7a15a3 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_GETPEERNAME_SYSCALL 1 OK. Likewise. > #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 3a3942fa68..254b3948f4 100644 > --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h > @@ -17,11 +17,6 @@ > License along with the GNU C Library; if not, see > . */ > > -/* Direct socketcalls available with kernel 4.3. */ > -#if __LINUX_KERNEL_VERSION >= 0x040300 > -# define __ASSUME_GETPEERNAME_SYSCALL 1 > -#endif > - OK. > #include_next > > #undef __ASSUME_ACCEPT_SYSCALL > @@ -44,6 +39,7 @@ > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_SHUTDOWN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_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 7a15569dfc..ae1387e7d7 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_GETPEERNAME_SYSCALL 1 OK. Not needed. > #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 8ada43587b..3ecaf36005 100644 > --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h > @@ -46,6 +46,7 @@ > in 4.20 (but present for 64-bit in all supported kernel versions). */ > #if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400 > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_SYSCALL OK. > #endif > > /* These syscalls were added for both 32-bit and 64-bit in 4.4. */ -- Cheers, Carlos.