From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id BA12438582A7 for ; Wed, 19 Oct 2022 22:14:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA12438582A7 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x333.google.com with SMTP id d18-20020a05683025d200b00661c6f1b6a4so10337121otu.1 for ; Wed, 19 Oct 2022 15:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xZItmzty5TeD2FTrqhgPi8pJbxZ318hiFOmo66fAIqQ=; b=dz/FH83rxggZnzK3O8X/xfdEaYHBNa3HdECJxR6nxnVyHK+ol0mdnAwOEpNwTl4E0P KHq3T+InDBFcV11FJLsrTtXRUqw5hCeZ/wi+n1bQncBGw0ZfPkK9zJbF7BoiH3dW9thf IEf0FEZTvlCFSxgM6rLLTbdYsJYOHQq6szznmqTQFDHNzd55AwmtTR/GuQMcbislAXUX pS4Hdi7XR0iWlphmWIiJgrIvhrZLnJ0lTkIE2YLqWgaybGq+Itkmn0tQM+Set4b/nX/L IOv8IScKeNuzDeChHaxlTeFdOO+Nm6vDNFpizBY7roOnbwhF8HOjNC3jmSGcu2CBuQpg okMA== 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=xZItmzty5TeD2FTrqhgPi8pJbxZ318hiFOmo66fAIqQ=; b=Ytc9ZKORfpUxjPvWPDQSqxHcgsEeyyQNvwlURU0PFuOzPHpTdgrxJpacvpl7SQIBSs RzTuy2YRodJf2xxn88EC40pD28/ozpAmthk6h6o+4Q/Y+uox/FUJSLnhfVm6lKzN2orm /RXDrIJkEI1aSsND8dizm4a5Tucp1TV8t7fdflCGkA59JtwPEREKt3vIvSrt2RW23KJd 7XaerMUqJAre0DFQX6gktxO3irEwmq1apEbWV1P2GVf1LLl3wcDmYx4YFu6dwNPGqYMj NTQziqvEZeFN9eWzI6T0FUiGXlKsx+AUNg2JtKJ1GNk2VPS9r1UREIBvxxG8w/NqmZpP SC1A== X-Gm-Message-State: ACrzQf0H0VRztN5XFTEiBDtDlu7lMEAMDQUEyjzf6TeZ8c/XMWaz99QD KlgviCVI6cCjhsB7QAj+qMm3234RkyJUh74e X-Google-Smtp-Source: AMsMyM6DEdVY+5oU9TYIavMHKWdx/4vXt8rguP4AVrBWooNkDy+ZonwYZJS0cEJmvIamkPjNW+Teiw== X-Received: by 2002:a9d:7dcc:0:b0:661:ad47:9685 with SMTP id k12-20020a9d7dcc000000b00661ad479685mr5254838otn.356.1666217697797; Wed, 19 Oct 2022 15:14:57 -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.14.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:57 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 15/30] Linux: consolidate sendfile implementation Date: Wed, 19 Oct 2022 19:14:18 -0300 Message-Id: <20221019221433.1082017-16-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-Spam-Status: No, score=-12.8 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 List-Id: This is similar to other LFS consolidation, where the non-LFS is only built if __OFF_T_MATCHES_OFF64_T is not defined and the LFS version is aliased to non-LFS name if __OFF_T_MATCHES_OFF64_T is defined. For non-LFS variant, use sendfile syscall if defined, otherwise use sendfile64 plus the offset overflow check (as generic implementation). Checked on x86_64-linux-gnu. --- .../sysv/linux/mips/mips64/n64/sendfile64.c | 1 - .../sysv/linux/mips/mips64/n64/syscalls.list | 3 -- .../{generic/wordsize-32 => }/sendfile.c | 15 ++++++-- sysdeps/unix/sysv/linux/sendfile64.c | 37 +++++++++++++++++++ sysdeps/unix/sysv/linux/syscalls.list | 2 - .../unix/sysv/linux/wordsize-64/sendfile64.c | 1 - .../unix/sysv/linux/wordsize-64/syscalls.list | 1 - 7 files changed, 49 insertions(+), 11 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/sendfile64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list rename sysdeps/unix/sysv/linux/{generic/wordsize-32 => }/sendfile.c (77%) create mode 100644 sysdeps/unix/sysv/linux/sendfile64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/sendfile64.c diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sendfile64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/sendfile64.c deleted file mode 100644 index 4c451bd093..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sendfile64.c +++ /dev/null @@ -1 +0,0 @@ -/* sendfile64 is alias of sendfile syscall. */ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list deleted file mode 100644 index 0924f245d4..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list +++ /dev/null @@ -1,3 +0,0 @@ -# File name Caller Syscall name # args Strong name Weak names - -sendfile - sendfile i:iipi sendfile sendfile64 diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c b/sysdeps/unix/sysv/linux/sendfile.c similarity index 77% rename from sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c rename to sysdeps/unix/sysv/linux/sendfile.c index 4fdf979324..c8bc890944 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/sendfile.c +++ b/sysdeps/unix/sysv/linux/sendfile.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Transfer data between file descriptors. Linux version. + Copyright (C) 2011-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,11 +21,16 @@ #include #include +#ifndef __OFF_T_MATCHES_OFF64_T + /* Send COUNT bytes from file associated with IN_FD starting at OFFSET to descriptor OUT_FD. */ ssize_t sendfile (int out_fd, int in_fd, off_t *offset, size_t count) { +# ifdef __NR_sendfile + return INLINE_SYSCALL_CALL (sendfile, out_fd, in_fd, offset, count); +# else __off64_t off64; int rc; @@ -38,9 +44,12 @@ sendfile (int out_fd, int in_fd, off_t *offset, size_t count) off64 = *offset; } - rc = INLINE_SYSCALL (sendfile64, 4, out_fd, in_fd, - offset ? &off64 : NULL, count); + rc = INLINE_SYSCALL_CALL (sendfile64, out_fd, in_fd, offset ? &off64 : NULL, + count); if (offset) *offset = off64; return rc; +# endif } + +#endif diff --git a/sysdeps/unix/sysv/linux/sendfile64.c b/sysdeps/unix/sysv/linux/sendfile64.c new file mode 100644 index 0000000000..d9d2a4a4c2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sendfile64.c @@ -0,0 +1,37 @@ +/* Transfer data between file descriptors. Linux version. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include +#include +#include +#include + +/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to + descriptor OUT_FD. */ +ssize_t +sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count) +{ +#ifndef __NR_sendfile64 +# define __NR_sendfile64 __NR_sendfile +#endif + return INLINE_SYSCALL_CALL (sendfile64, out_fd, in_fd, offset, count); +} + +#ifdef __OFF_T_MATCHES_OFF64_T +strong_alias (sendfile64, sendfile) +#endif diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 6420049e8b..b9f45463c5 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -62,8 +62,6 @@ sched_primin - sched_get_priority_min i:i __sched_get_priority_min sched_get_pri sched_setp - sched_setparam i:ip __sched_setparam sched_setparam sched_sets - sched_setscheduler i:iip __sched_setscheduler sched_setscheduler sched_yield - sched_yield i: __sched_yield sched_yield -sendfile - sendfile i:iipU sendfile -sendfile64 - sendfile64 i:iipU sendfile64 setfsgid EXTRA setfsgid i:i setfsgid setfsuid EXTRA setfsuid i:i setfsuid setpgid - setpgid i:ii __setpgid setpgid diff --git a/sysdeps/unix/sysv/linux/wordsize-64/sendfile64.c b/sysdeps/unix/sysv/linux/wordsize-64/sendfile64.c deleted file mode 100644 index 4c451bd093..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/sendfile64.c +++ /dev/null @@ -1 +0,0 @@ -/* sendfile64 is alias of sendfile syscall. */ diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 3232f11f51..db80696e41 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -1,4 +1,3 @@ # File name Caller Syscall name # args Strong name Weak names -sendfile - sendfile i:iipi sendfile sendfile64 personality EXTRA personality i:i __personality personality -- 2.34.1