From patchwork Mon Feb 20 14:29:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 65274 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 7556D383FE36 for ; Mon, 20 Feb 2023 14:30:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7556D383FE36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676903439; bh=uwBKMmLSMGBd4OkZVO2qkxNU+W15xJcdujHocDHSSV4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=MEWbR/z2lLvgjy4v6fFE05QLLZqM494S8kPXao0tK8/vDnaXQiYAtuUK7l3+vlQLl QplTH8LPQe+xaiZx8RYrs/HqIykoqDspmk0WRYrXdrk6AT2bdabkycEhtG3n7H3sWI HM/i/S0Vi1uEXx0/SqUe3CJc76GTjoHU8whFJzbk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 609933846926 for ; Mon, 20 Feb 2023 14:30:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 609933846926 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-172094e10e3so1554085fac.10 for ; Mon, 20 Feb 2023 06:30:11 -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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uwBKMmLSMGBd4OkZVO2qkxNU+W15xJcdujHocDHSSV4=; b=tUPsi9Rlt5XwRnDWBBmwIDKE+qlk6g0O+8dlma46wINljt4AcAD461lOo/Uu1+d7dd +5RQd51v7HkwMy4mYNBELhEdNLIiWmXDTmMBr9txtve0kmqIMisOB5tyd+JS5jUeC9/M aW2O/PnbP3oc3BROfJszyA2tdcLZWX4OiMzAFWPF2nl2JAbogmmYPPWfzCHsYJ18sR+/ 7d1b5qj68Lt+igcKEfXl2p4CS1UGf8GU/oDvxwfBkjvTQAI4lFMizZ8pHLhGTNBdYjqE uWAr4LSE9c2l3sFG1//l/RD42F5O3KEU2FaH/g3Py3fpoEq5jjZSipYfkP2bmykESd+F P7aA== X-Gm-Message-State: AO0yUKUWzdzyBkkkzw6hjs7GQEtt/dBr/D+M6XUGKSj+z2hmJ+KsCnGV mob/0/ajsmkCsO6zZC2+9zLaundTrbaKs1Y/bks= X-Google-Smtp-Source: AK7set8vBFpe68XhVdj/odweXIaAC7dQzRpXIgGS9IynNsbIXiJFN17W32RZdbny+nWCDRo4HB0xIA== X-Received: by 2002:a05:6870:d285:b0:16e:3645:b2e5 with SMTP id d5-20020a056870d28500b0016e3645b2e5mr4687806oae.28.1676903410108; Mon, 20 Feb 2023 06:30:10 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:3a5:41b1:cd01:745d:be16]) by smtp.gmail.com with ESMTPSA id g1-20020a056870c38100b0016b0369f08fsm4446774oao.15.2023.02.20.06.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 06:30:09 -0800 (PST) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [PATCH v3 2/5] Linux: Assume and consolidate getsockname wire-up syscall Date: Mon, 20 Feb 2023 11:29:54 -0300 Message-Id: <20230220142957.1180692-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220142957.1180692-1-adhemerval.zanella@linaro.org> References: <20230220142957.1180692-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 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 | 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 - sysdeps/unix/sysv/linux/sparc/kernel-features.h | 6 ++++++ 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list index 7dbfde0dae..e89ce91ac0 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 -getsockname - getsockname i:ipp __getsockname getsockname getpeername - getpeername i:ipp __getpeername getpeername diff --git a/sysdeps/unix/sysv/linux/getsockname.c b/sysdeps/unix/sysv/linux/getsockname.c index 38e6f2dac6..61973fa5cd 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 334a31a0e5..1c5cbd3351 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 #endif @@ -42,6 +41,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_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 4b5c4afbc1..4a4d624aeb 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_SHUTDOWN_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 2d9b225249..e57f09a74e 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 #endif @@ -44,6 +43,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_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 e5bfa05491..10eff56743 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 2b3cbd05c1..231742a5c3 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 7ca9393942..058b211e55 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 #endif @@ -44,6 +43,7 @@ # undef __ASSUME_SOCKETPAIR_SYSCALL # undef __ASSUME_LISTEN_SYSCALL # undef __ASSUME_SHUTDOWN_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 931f1c8834..76e2de7bf5 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 diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h index 279fa93a3b..f71aa8ca38 100644 --- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h @@ -42,6 +42,12 @@ # undef __ASSUME_SETSOCKOPT_SYSCALL #endif +/* There syscalls were added for 32-bit in compat syscall table only + in 4.20 (but present for 64-bit in all supported kernel versions). */ +#if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400 +# undef __ASSUME_GETSOCKNAME_SYSCALL +#endif + /* These syscalls were added for both 32-bit and 64-bit in 4.4. */ #if __LINUX_KERNEL_VERSION < 0x040400 # undef __ASSUME_BIND_SYSCALL