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: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, 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 [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 3BD4C1F4DA for ; Wed, 19 Oct 2022 22:19:24 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="c8Pozqbe"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 68AE13839DCC for ; Wed, 19 Oct 2022 22:19:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68AE13839DCC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666217963; bh=tOv5hqWe/xVQGycKxlYvoQVeJTuArkl4siJ4l66pM24=; 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=c8Pozqbez+BQSiM5Mhfri2KRGe5aaeB7KIrBw+VnyMvtfSXOv3rTBovoluOt5B3wI SmOGnRaqhjaNXQ7WRUN4bTa5Eo/tqZAz9gWGF39DWEA+C/qlROoeAnKLlZfM7aiwo+ JX6uZlzR99CY0ePUKI26ajvmI3Z/qAC/5lH7knXU= Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id AE57C3858289 for ; Wed, 19 Oct 2022 22:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AE57C3858289 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-136b5dd6655so22411127fac.3 for ; Wed, 19 Oct 2022 15:15:06 -0700 (PDT) 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=tOv5hqWe/xVQGycKxlYvoQVeJTuArkl4siJ4l66pM24=; b=RNtSXn1HKt47xq7NcwDNWsiBV7rgFEYShrunB0tF/HiyPiLnyB+T0gTcisFa2pHr/7 v4OpRSBkAPjNZp1z1ObC3VLXY6DMSsG9QntSvhaL8GEnr1RaZ/AH8XKbAX8S6+jVnC8Z pKMfcrSN2MGuhctOeXYNnjl6AQezwDu4lKTUH8OANTzKj+qjgUCRHXTSwX4g+GDSDRli OeIkMnF1qVtado7Tt8G3E8PwlecNn/nd7gzudELIWIK9dsL3+Pq3hP1w8a2vMCO5Btbr FpS8hWYMkdAucYjycgEAW4lszBD4pBXqDhFQmrezFFZpTCPIJqTlFWRmqSSHJ6TIsDxG kWrg== X-Gm-Message-State: ACrzQf2yoeaPEvTvrQS+mNq418PupSrvDbZqzQhRksgMFhCJaBb07fhP VLqi2BbLQC8tAzFrloG3Y8HLDs/5hyhVyYn9 X-Google-Smtp-Source: AMsMyM7Q1d4kV4N0tsPeeuWI91/VXVjT7DvySeJ6pLOmTlE9siru6nX84zc7CNK1+UbGpvytR3r+4w== X-Received: by 2002:a05:6870:42d1:b0:136:3b49:cc26 with SMTP id z17-20020a05687042d100b001363b49cc26mr6489820oah.238.1666217706050; Wed, 19 Oct 2022 15:15:06 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7d19:f1c1:9fb4:472a:ab68]) by smtp.gmail.com with ESMTPSA id m9-20020aca5809000000b00353fe4fb4casm7137927oib.48.2022.10.19.15.15.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:15:05 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 22/30] Linux: Assume and consolidate getsockname wire-up syscall Date: Wed, 19 Oct 2022 19:14:25 -0300 Message-Id: <20221019221433.1082017-23-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" And disable if kernel does not support it. Checked on x86_64-linux-gnu and i686-linux-gnu. --- sysdeps/unix/sysv/linux/generic/syscalls.list | 1 - sysdeps/unix/sysv/linux/getsockname.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 706893f245..a5bb00a3e4 100644 --- a/sysdeps/unix/sysv/linux/generic/syscalls.list +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list @@ -1,6 +1,5 @@ # File name Caller Syscall name # args Strong name Weak names # Socket APIs -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/getsockname.c b/sysdeps/unix/sysv/linux/getsockname.c index d0718c2aaf..8350b800fe 100644 --- a/sysdeps/unix/sysv/linux/getsockname.c +++ b/sysdeps/unix/sysv/linux/getsockname.c @@ -15,19 +15,14 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include - #include -#include -#include int __getsockname (int fd, __SOCKADDR_ARG addr, socklen_t *len) { #ifdef __ASSUME_GETSOCKNAME_SYSCALL - return INLINE_SYSCALL (getsockname, 3, fd, addr.__sockaddr__, len); + return INLINE_SYSCALL_CALL (getsockname, fd, addr.__sockaddr__, len); #else return SOCKETCALL (getsockname, 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 a79ec679cc..f294380215 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_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1 #endif @@ -41,6 +40,7 @@ # undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL +# undef __ASSUME_GETSOCKNAME_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 d1769b2d99..6fb99f5c35 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -83,6 +83,7 @@ #define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_SOCKETPAIR_SYSCALL 1 #define __ASSUME_LISTEN_SYSCALL 1 +#define __ASSUME_GETSOCKNAME_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 a65fa63c5e..898c24ba62 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_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1 #endif @@ -43,6 +42,7 @@ # undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL +# undef __ASSUME_GETSOCKNAME_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 e19e6bb6ba..7e2b15859e 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_GETSOCKNAME_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 eb73a91a5d..8953cb019f 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_GETSOCKNAME_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 3daee3f132..1422ee620c 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_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1 #endif @@ -43,6 +42,7 @@ # undef __ASSUME_SOCKET_SYSCALL # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL +# undef __ASSUME_GETSOCKNAME_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 23eadf84e0..91dc28f33f 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_GETSOCKNAME_SYSCALL 1 #define __ASSUME_GETPEERNAME_SYSCALL 1 #define __ASSUME_SEND_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1 -- 2.34.1