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 0E5D61F601 for ; Tue, 6 Dec 2022 16:20:32 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="vs8443gV"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3F8A13839D14 for ; Tue, 6 Dec 2022 16:20:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F8A13839D14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670343631; bh=5RDYiw95QeJOJfxLV0BacY6c4jqDt2dhKHTgSqO6LQc=; 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=vs8443gVjDJsz17ZTHcua8z81cpiDE5Q8TKZJmdn7vr/8ASeybohyVUsC1N+WZpsu eUpLkvd/5n4S9cr/Gx1LRGEctx6vkOrc+hfdang+z/ew7q0GXUkLYXX3SODEjjVdNE 39uk3vEqRVjITD6W7UtphfLD5+2xprKgk+dTXFHY= 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 579073833A13 for ; Tue, 6 Dec 2022 16:20:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 579073833A13 Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-153-IES2X9lqNkCxs7MpQ-Qhfg-1; Tue, 06 Dec 2022 11:20:06 -0500 X-MC-Unique: IES2X9lqNkCxs7MpQ-Qhfg-1 Received: by mail-il1-f199.google.com with SMTP id z10-20020a921a4a000000b0030349fa9653so8440162ill.7 for ; Tue, 06 Dec 2022 08:20:06 -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=5RDYiw95QeJOJfxLV0BacY6c4jqDt2dhKHTgSqO6LQc=; b=DaZ1esBnrnMQLNPqe54iYsZ5mHsHDXuBODvCWpkP9psqrXjIvSv/Kth2CKQ07iAtTP iBZgRMnf55JqBYGXb63aDQX7jBF3V2XWDyScacvrs1PtOIn9Oiq+WsYJxUqj58StM8CJ tRX7fv4rNPg+qefRqX0CWTP84FYJAeC12IsnT2qRV8pByEmjCFSVke6bfQkfUgLAsPql NB6/7EK3ZhsyBLwuc3npS7h6Ehw0FSdLZuJl3NQYSgPb7MQiK/fRrM/bYVgEYRZHms23 W8Q/QaPGeVDNFB5KxAveK5/+9HJJFCGqEi2l7LrB4IikgaCEDdiQCxp1YF9YW8aFlWBA iHUQ== X-Gm-Message-State: ANoB5pkV1IRcIz7VNrE7i8hCSvXQle5SmWcAkx0frR8E+6FwXPctKFev FhpvDpX7e4taNPxKKZueDhfPpeyMDIApftywsqekfqYfiw67pk7+HlBnwgfj3Af9ikNMYNXT8HJ T52teTmc+7gXTKr6I5rrz X-Received: by 2002:a05:6e02:118c:b0:302:e09e:b75 with SMTP id y12-20020a056e02118c00b00302e09e0b75mr27630029ili.314.1670343605506; Tue, 06 Dec 2022 08:20:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf798/1DnUY7J4wXZCtQCCLVNZ2gT3rZu1fvexwy6ZMsk3LspuFYOu+x8Za/6mX4QOSKjLo/+w== X-Received: by 2002:a05:6e02:118c:b0:302:e09e:b75 with SMTP id y12-20020a056e02118c00b00302e09e0b75mr27630017ili.314.1670343605193; Tue, 06 Dec 2022 08:20:05 -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 k31-20020a02661f000000b00389def938dbsm6724316jac.71.2022.12.06.08.20.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 08:20:04 -0800 (PST) Message-ID: Date: Tue, 6 Dec 2022 11:20:03 -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 23/30] Linux: Assume and consolidate getpeername wire-up syscall To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-24-adhemerval.zanella@linaro.org> Organization: Red Hat In-Reply-To: <20221019221433.1082017-24-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. I assume this needs a v2 for the sparc32 changes noted by Joseph. It looks good to me for the other arches. Tested-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/generic/syscalls.list | 1 - > sysdeps/unix/sysv/linux/getpeername.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 - > 9 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list > index a5bb00a3e4..b000ca3c7c 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 > -getpeername - getpeername i:ipp __getpeername getpeername OK. Remove default wrapper. > shutdown - shutdown i:ii __shutdown shutdown > 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. Default wrapper. > #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 f294380215..423edc9017 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_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > #endif > > @@ -41,6 +40,7 @@ > # undef __ASSUME_SOCKETPAIR_SYSCALL > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_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 6fb99f5c35..c751530cd3 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_GETSOCKNAME_SYSCALL 1 > +#define __ASSUME_GETPEERNAME_SYSCALL 1 > > /* 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 898c24ba62..a7b3458a21 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_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > #endif > > @@ -43,6 +42,7 @@ > # undef __ASSUME_SOCKETPAIR_SYSCALL > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_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 7e2b15859e..328529434d 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 > #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 8953cb019f..7fae7ca429 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 > #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 1422ee620c..e797b71052 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_GETPEERNAME_SYSCALL 1 > # define __ASSUME_SHUTDOWN_SYSCALL 1 > #endif > > @@ -43,6 +42,7 @@ > # undef __ASSUME_SOCKETPAIR_SYSCALL > # undef __ASSUME_LISTEN_SYSCALL > # undef __ASSUME_GETSOCKNAME_SYSCALL > +# undef __ASSUME_GETPEERNAME_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 91dc28f33f..3a0b4e6198 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 > #define __ASSUME_SEND_SYSCALL 1 > #define __ASSUME_RECV_SYSCALL 1 > #define __ASSUME_SHUTDOWN_SYSCALL 1 -- Cheers, Carlos.