From patchwork Wed Dec 7 21:22:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 61683 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C91A38369CA for ; Wed, 7 Dec 2022 21:24:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C91A38369CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670448280; bh=9+k5v+jkFT4FbFju0dchYowvopvy+EQk2JyDRN3ykXA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=SzXRyhc77rgUi6sfBNKr5HnGLbXzAoDP0XW/+PNteuQ1KVVE3F/p/54KTQ/vfFkx5 Kt+Vqs7U9vdRAUD/gGjhxr4OREAAoEAgbyGJXf/cAcsThN/YW0k/7KlqnEnT/Snbak 7obMl2daz69Iys4VJ5MQBD5cSHuVBF0U10ZJ6LOQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id BC59A38367A1 for ; Wed, 7 Dec 2022 21:22:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BC59A38367A1 Received: by mail-oi1-x231.google.com with SMTP id s187so16001234oie.10 for ; Wed, 07 Dec 2022 13:22:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9+k5v+jkFT4FbFju0dchYowvopvy+EQk2JyDRN3ykXA=; b=0A3o0xysp3FadDP50LDh1U3fAuw/UfD8yd5G2MZ2CQDIOjGdpOwJvx5fpOz34bNeGa Cby+fC9N2H2CnIYjg3btiOuKEbfPQraqUbJBPg/Jl/O8v66ISwuYo7xgiSGYs6yz8G+s r3ow1yhxUFHEkOgl0999+J2huqdzwDAzbucfwkFNU69IwUroSGy1s/0E1tOxyhOyKAzO 5RO49zblsCiNAUOE+rlDd7KQce8hwkC8xWdc6etsmg97r/jPVBaBWjn9uGWVGabNzWSk yRnhHQNTdRy462Bo8OOytm4T0uybH14fAzUJC4w5L0nctfNWUPzM0aS3+I+aFzdtrTw3 fftg== X-Gm-Message-State: ANoB5plgmrrAR/q+61YTq67oIXs1+JmbqGKl72mzrKjuZ+LmzF8YnIi+ qiQuHfKRs/VJgQa6dLfMz6Z5doEvHPgxvY9RsUM= X-Google-Smtp-Source: AA0mqf4/SVrcqY1myYWzn7IXuyCTKvSdEPGaTeNJniQoq9fGhqv+drjdDVXzJzGmfFGFHNYzPUEsWw== X-Received: by 2002:a05:6808:282:b0:35b:f0ec:be76 with SMTP id z2-20020a056808028200b0035bf0ecbe76mr11492530oic.57.1670448174806; Wed, 07 Dec 2022 13:22:54 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:6793:2c6f:f2fc:30ca:36c1]) by smtp.gmail.com with ESMTPSA id n189-20020aca59c6000000b0035a64076e0bsm9870305oib.37.2022.12.07.13.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 13:22:54 -0800 (PST) To: libc-alpha@sourceware.org, Carlos O'Donell Subject: [PATCH v2 3/5] Linux: Assume and consolidate getpeername wire-up syscall Date: Wed, 7 Dec 2022 18:22:44 -0300 Message-Id: <20221207212246.2384051-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> References: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And disable if kernel does not support it. Checked on x86_64-linux-gnu and i686-linux-gnu. 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 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); #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 - #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 #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 /* 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 - #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 #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 #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 #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 - #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 #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 #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 #endif /* These syscalls were added for both 32-bit and 64-bit in 4.4. */