From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 73150381EC94; Wed, 7 Dec 2022 19:15:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73150381EC94 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440545; bh=ftdF5Tro1pKrUTD84nwrJqAReQzJ9xy7Uzxb852bKYo=; h=From:To:Subject:Date:From; b=WdUhCXNnQLbzn3bLCalw1ZgcsxL17UOw6gg6EnTcfLCUM2qobBUQ2WxlqECeLCS+d H77Q06ldDHAegO3yHOalZBQYGzKNhdba9O1igU7Q9tkv0y2pK6jh5TBfjCGNaK5NI3 YwMp1kv4bvBcgVpIDcWD7P34ZQoiBd2twnb3yzVA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Linux: consolidate sendfile implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 9cffb295e3af682bcc1c2629e808e3db8a4e2cbf X-Git-Newrev: 04e7e2658c4ffe1a96fb445cbfe583a9d51ca622 Message-Id: <20221207191545.73150381EC94@sourceware.org> Date: Wed, 7 Dec 2022 19:15:45 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=04e7e2658c4ffe1a96fb445cbfe583a9d51ca622 commit 04e7e2658c4ffe1a96fb445cbfe583a9d51ca622 Author: Adhemerval Zanella Netto Date: Wed Oct 19 19:14:18 2022 -0300 Linux: consolidate sendfile implementation 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. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- .../unix/sysv/linux/mips/mips64/n64/sendfile64.c | 1 - .../unix/sysv/linux/mips/mips64/n64/syscalls.list | 3 -- .../linux/{generic/wordsize-32 => }/sendfile.c | 15 +++++++-- sysdeps/unix/sysv/linux/sendfile64.c | 37 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/syscalls.list | 2 -- sysdeps/unix/sysv/linux/wordsize-64/sendfile64.c | 1 - sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 - 7 files changed, 49 insertions(+), 11 deletions(-) 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