* [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation
@ 2016-08-19 14:42 Adhemerval Zanella
2016-08-19 14:42 ` [PATCH 3/4] Consolidate posix_fallocate{64} implementations Adhemerval Zanella
` (4 more replies)
0 siblings, 5 replies; 21+ messages in thread
From: Adhemerval Zanella @ 2016-08-19 14:42 UTC (permalink / raw)
To: libc-alpha
This is a follow up patch from my previous one to consolidate Linux
implementation over architectures. As before, the general idea is to
remove the port proliferation of specific implementation and use a common
one plus arch-specific define to different behaviors. It also align
with my work on trying to remove the sysdep-cancel.h requiriment to
simplify the long-standing cancellation issue.
For x32 this patch serie requires my previous {INLINE,INTERNAL}_SYSCALL
macro fix [1], although it is still possible to push them by still
enabling x32 to generate such syscall through syscalls.list.
[1] https://sourceware.org/ml/libc-alpha/2016-08/msg00443.html
Adhemerval Zanella (4):
Add INTERNAL_SYSCALL_CALL
Consolidate fallocate{64} implementations
Consolidate posix_fallocate{64} implementations
Consolidate posix_fadvise implementations
ChangeLog | 92 +++++++++++++++++
io/Makefile | 2 +-
io/tst-posix_fallocate-common.c | 92 +++++++++++++++++
io/tst-posix_fallocate.c | 107 ++++---------------
io/tst-posix_fallocate64.c | 44 ++++++++
posix/Makefile | 3 +-
posix/tst-posix_fadvise-common.c | 113 +++++++++++++++++++++
posix/tst-posix_fadvise.c | 25 +++++
posix/tst-posix_fadvise64.c | 44 ++++++++
sysdeps/unix/sysdep.h | 42 +++++++-
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/arm/kernel-features.h | 7 ++
sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 38 -------
sysdeps/unix/sysv/linux/fallocate.c | 11 +-
sysdeps/unix/sysv/linux/fallocate64.c | 14 +--
.../sysv/linux/generic/wordsize-32/posix_fadvise.c | 37 -------
sysdeps/unix/sysv/linux/i386/posix_fadvise64.S | 92 -----------------
.../unix/sysv/linux/mips/mips32/posix_fadvise.c | 41 --------
.../unix/sysv/linux/mips/mips32/posix_fadvise64.c | 60 -----------
.../unix/sysv/linux/mips/mips64/n32/fallocate.c | 33 ------
.../unix/sysv/linux/mips/mips64/n32/fallocate64.c | 33 ------
.../sysv/linux/mips/mips64/n32/posix_fadvise.c | 37 -------
.../sysv/linux/mips/mips64/n32/posix_fadvise64.c | 55 ----------
.../sysv/linux/mips/mips64/n32/posix_fallocate.c | 37 -------
.../sysv/linux/mips/mips64/n32/posix_fallocate64.c | 38 -------
.../unix/sysv/linux/mips/mips64/n64/fallocate.c | 1 -
.../unix/sysv/linux/mips/mips64/n64/fallocate64.c | 1 -
.../sysv/linux/mips/mips64/n64/posix_fadvise.c | 50 ---------
.../sysv/linux/mips/mips64/n64/posix_fadvise64.c | 28 ++++-
.../sysv/linux/mips/mips64/n64/posix_fallocate.c | 1 -
.../sysv/linux/mips/mips64/n64/posix_fallocate64.c | 1 -
sysdeps/unix/sysv/linux/posix_fadvise.c | 45 +++++---
sysdeps/unix/sysv/linux/posix_fadvise64.c | 52 +++++++---
sysdeps/unix/sysv/linux/posix_fallocate.c | 6 +-
sysdeps/unix/sysv/linux/posix_fallocate64.c | 8 +-
sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 5 +
.../sysv/linux/powerpc/powerpc32/posix_fadvise.c | 39 -------
.../sysv/linux/powerpc/powerpc32/posix_fadvise64.c | 55 ----------
sysdeps/unix/sysv/linux/tile/kernel-features.h | 1 +
sysdeps/unix/sysv/linux/tst-fallocate-common.c | 88 ++++++++++++++++
sysdeps/unix/sysv/linux/tst-fallocate.c | 25 +++++
sysdeps/unix/sysv/linux/tst-fallocate64.c | 54 ++++++++++
sysdeps/unix/sysv/linux/wordsize-64/fallocate.c | 34 -------
sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c | 1 -
.../unix/sysv/linux/wordsize-64/posix_fadvise.c | 40 --------
.../unix/sysv/linux/wordsize-64/posix_fadvise64.c | 1 -
.../unix/sysv/linux/wordsize-64/posix_fallocate.c | 46 ---------
.../sysv/linux/wordsize-64/posix_fallocate64.c | 1 -
sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 2 -
49 files changed, 764 insertions(+), 921 deletions(-)
create mode 100644 io/tst-posix_fallocate-common.c
create mode 100644 io/tst-posix_fallocate64.c
create mode 100644 posix/tst-posix_fadvise-common.c
create mode 100644 posix/tst-posix_fadvise.c
create mode 100644 posix/tst-posix_fadvise64.c
delete mode 100644 sysdeps/unix/sysv/linux/arm/posix_fadvise64.c
delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/i386/posix_fadvise64.S
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c
create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate-common.c
create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate.c
create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c
--
2.7.4
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 3/4] Consolidate posix_fallocate{64} implementations 2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella @ 2016-08-19 14:42 ` Adhemerval Zanella 2016-08-22 14:35 ` Yury Norov 2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella ` (3 subsequent siblings) 4 siblings, 1 reply; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-19 14:42 UTC (permalink / raw) To: libc-alpha This patch consolidates all the posix_fallocate{64} implementation for Linux in only one (sysdeps/unix/sysv/linux/posix_fallocate{64}.c). It also removes the syscall from the auto-generation using assembly macros. The macro SYSCALL_LL{64} is used to handle the offset argument along with the new INTERNAL_SYSCALL_CALL macro to define correct argument count for internal INTERNAL_SYSCALL call. Tested on x86_64, i686, x32, aarch64, ppc64le, and armhf. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c: Remove file. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/posix_fallocate.c (posix_fallocate): Use SYSCALL_LL to pass both offset and len arguments. * sysdeps/unix/sysv/linux/posix_fallocate64.c (posix_fallocate64): Likewise. --- io/Makefile | 2 +- io/tst-posix_fallocate-common.c | 92 ++++++++++++++++++ io/tst-posix_fallocate.c | 107 ++++----------------- io/tst-posix_fallocate64.c | 44 +++++++++ .../sysv/linux/mips/mips64/n32/posix_fallocate.c | 37 ------- .../sysv/linux/mips/mips64/n32/posix_fallocate64.c | 38 -------- .../sysv/linux/mips/mips64/n64/posix_fallocate.c | 1 - .../sysv/linux/mips/mips64/n64/posix_fallocate64.c | 1 - sysdeps/unix/sysv/linux/posix_fallocate.c | 6 +- sysdeps/unix/sysv/linux/posix_fallocate64.c | 8 +- .../unix/sysv/linux/wordsize-64/posix_fallocate.c | 46 --------- .../sysv/linux/wordsize-64/posix_fallocate64.c | 1 - 13 files changed, 180 insertions(+), 222 deletions(-) create mode 100644 io/tst-posix_fallocate-common.c create mode 100644 io/tst-posix_fallocate64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c diff --git a/io/Makefile b/io/Makefile index deb6100..20fe3de 100644 --- a/io/Makefile +++ b/io/Makefile @@ -71,7 +71,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ tst-renameat tst-fchownat tst-fchmodat tst-faccessat \ tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \ tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \ - tst-posix_fallocate tst-fts tst-fts-lfs + tst-posix_fallocate tst-posix_fallocate64 tst-fts tst-fts-lfs ifeq ($(run-built-tests),yes) tests-special += $(objpfx)ftwtest.out diff --git a/io/tst-posix_fallocate-common.c b/io/tst-posix_fallocate-common.c new file mode 100644 index 0000000..42d6ec6 --- /dev/null +++ b/io/tst-posix_fallocate-common.c @@ -0,0 +1,92 @@ +/* Common posix_fallocate tests definitions. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +static void do_prepare (void); +#define PREPARE(argc, argv) do_prepare () +static int do_test (void); +#define TEST_FUNCTION do_test () + +#define TIMEOUT 20 /* sec. */ + +#include <test-skeleton.c> + +static char *temp_filename; +static int temp_fd; + +static void +do_prepare (void) +{ + temp_fd = create_temp_file ("tst-posix_fallocate.", &temp_filename); + if (temp_fd == -1) + { + printf ("cannot create temporary file: %m\n"); + exit (1); + } +} + +#define FAIL(str) \ + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) + +static int +do_test_with_offset (off_t offset) +{ + struct stat st; + + if (posix_fallocate (temp_fd, offset, 768) != 0) + FAIL ("1st posix_fallocate call failed"); + + if (fstat (temp_fd, &st) != 0) + FAIL ("2nd fstat failed"); + + if (st.st_size != (offset + 768)) + { + printf ("file size after first posix_fallocate call is %llu, expected %u\n", + (unsigned long long int) st.st_size, 512u + 768u); + return 1; + } + + if (posix_fallocate (temp_fd, 0, 1024) != 0) + FAIL ("2nd posix_fallocate call failed"); + + if (fstat (temp_fd, &st) != 0) + FAIL ("3rd fstat failed"); + + if (st.st_size != (offset) + 768) + FAIL ("file size changed in second posix_fallocate"); + + offset += 2048; + if (posix_fallocate (temp_fd, offset, 64) != 0) + FAIL ("3rd posix_fallocate call failed"); + + if (fstat (temp_fd, &st) != 0) + FAIL ("4th fstat failed"); + + if (st.st_size != (offset + 64)) + { + printf ("file size after first posix_fallocate call is %llu, expected %u\n", + (unsigned long long int) st.st_size, 2048u + 64u); + return 1; + } + + return 0; +} diff --git a/io/tst-posix_fallocate.c b/io/tst-posix_fallocate.c index 53f0704..59f3fa1 100644 --- a/io/tst-posix_fallocate.c +++ b/io/tst-posix_fallocate.c @@ -1,100 +1,33 @@ -#include <fcntl.h> -#include <sys/stat.h> +/* Basic posix_fallocate tests. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. -static void do_prepare (void); -#define PREPARE(argc, argv) do_prepare () -static int do_test (void); -#define TEST_FUNCTION do_test () -#include <test-skeleton.c> + 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. -static int fd; + 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. -static void -do_prepare (void) -{ - fd = create_temp_file ("tst-posix_fallocate.", NULL); - if (fd == -1) - { - printf ("cannot create temporary file: %m\n"); - exit (1); - } -} + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ +#include "tst-posix_fallocate-common.c" static int do_test (void) { - struct stat64 st; + struct stat st; - if (fstat64 (fd, &st) != 0) - { - puts ("1st fstat failed"); - return 1; - } + if (fstat (temp_fd, &st) != 0) + FAIL ("1st fstat failed"); if (st.st_size != 0) - { - puts ("file not created with size 0"); - return 1; - } - - if (posix_fallocate (fd, 512, 768) != 0) - { - puts ("1st posix_fallocate call failed"); - return 1; - } - - if (fstat64 (fd, &st) != 0) - { - puts ("2nd fstat failed"); - return 1; - } - - if (st.st_size != 512 + 768) - { - printf ("file size after first posix_fallocate call is %llu, expected %u\n", - (unsigned long long int) st.st_size, 512u + 768u); - return 1; - } - - if (posix_fallocate (fd, 0, 1024) != 0) - { - puts ("2nd posix_fallocate call failed"); - return 1; - } - - if (fstat64 (fd, &st) != 0) - { - puts ("3rd fstat failed"); - return 1; - } - - if (st.st_size != 512 + 768) - { - puts ("file size changed in second posix_fallocate"); - return 1; - } - - if (posix_fallocate (fd, 2048, 64) != 0) - { - puts ("3rd posix_fallocate call failed"); - return 1; - } - - if (fstat64 (fd, &st) != 0) - { - puts ("4th fstat failed"); - return 1; - } - - if (st.st_size != 2048 + 64) - { - printf ("file size after first posix_fallocate call is %llu, expected %u\n", - (unsigned long long int) st.st_size, 2048u + 64u); - return 1; - } - - close (fd); + FAIL ("file not created with size 0"); - return 0; + return do_test_with_offset (512); } diff --git a/io/tst-posix_fallocate64.c b/io/tst-posix_fallocate64.c new file mode 100644 index 0000000..cbb57ff --- /dev/null +++ b/io/tst-posix_fallocate64.c @@ -0,0 +1,44 @@ +/* Basic posix_fallocate tests (with _FILE_OFFSET_BITS). + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#define _FILE_OFFSET_BITS 64 +#include "tst-posix_fallocate-common.c" + +static int +do_test (void) +{ + struct stat st; + int ret; + + if (fstat (temp_fd, &st) != 0) + FAIL ("1st fstat failed"); + + if (st.st_size != 0) + FAIL ("file not created with size 0"); + + ret = do_test_with_offset (512); + if (ret == -1) + return -1; + + off_t base_offset = UINT32_MAX + 512LL; + ret = do_test_with_offset (base_offset); + if (ret == -1) + return 1; + + return 0; +} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c deleted file mode 100644 index e652e5b..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <fcntl.h> -#include <sysdep.h> - -#define posix_fallocate static internal_fallocate -#include <sysdeps/posix/posix_fallocate.c> -#undef posix_fallocate - -/* Reserve storage for the data of the file associated with FD. */ -int -posix_fallocate (int fd, __off_t offset, __off_t len) -{ - INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); - - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) - return 0; - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) - return INTERNAL_SYSCALL_ERRNO (res, err); - return internal_fallocate (fd, offset, len); -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c deleted file mode 100644 index d5659e0..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <fcntl.h> -#include <sysdep.h> - -extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len); -#define __posix_fallocate64_l64 static internal_fallocate64 -#include <sysdeps/posix/posix_fallocate64.c> -#undef __posix_fallocate64_l64 - -/* Reserve storage for the data of the file associated with FD. */ -int -__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) -{ - INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); - - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) - return 0; - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) - return INTERNAL_SYSCALL_ERRNO (res, err); - return internal_fallocate64 (fd, offset, len); -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c deleted file mode 100644 index b3fe81b..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c deleted file mode 100644 index f466f13..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c +++ /dev/null @@ -1 +0,0 @@ -/* posix_fallocate64 is in posix_fallocate.c */ diff --git a/sysdeps/unix/sysv/linux/posix_fallocate.c b/sysdeps/unix/sysv/linux/posix_fallocate.c index fc9ac37..139cb56 100644 --- a/sysdeps/unix/sysv/linux/posix_fallocate.c +++ b/sysdeps/unix/sysv/linux/posix_fallocate.c @@ -27,10 +27,8 @@ int posix_fallocate (int fd, __off_t offset, __off_t len) { INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, - __LONG_LONG_PAIR (offset >> 31, offset), - __LONG_LONG_PAIR (len >> 31, len)); - + int res = INTERNAL_SYSCALL_CALL (fallocate, err, fd, 0, + SYSCALL_LL (offset), SYSCALL_LL (len)); if (! INTERNAL_SYSCALL_ERROR_P (res, err)) return 0; if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) diff --git a/sysdeps/unix/sysv/linux/posix_fallocate64.c b/sysdeps/unix/sysv/linux/posix_fallocate64.c index 4a0a722..8a870cb 100644 --- a/sysdeps/unix/sysv/linux/posix_fallocate64.c +++ b/sysdeps/unix/sysv/linux/posix_fallocate64.c @@ -28,12 +28,8 @@ int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) { INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, - __LONG_LONG_PAIR ((long int) (offset >> 32), - (long int) offset), - __LONG_LONG_PAIR ((long int) (len >> 32), - (long int) len)); - + int res = INTERNAL_SYSCALL_CALL (fallocate, err, fd, 0, + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); if (! INTERNAL_SYSCALL_ERROR_P (res, err)) return 0; if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c deleted file mode 100644 index 8caee31..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <fcntl.h> -#include <sysdep.h> - -#define posix_fallocate static internal_fallocate -#include <sysdeps/posix/posix_fallocate.c> -#undef posix_fallocate - -/* Reserve storage for the data of the file associated with FD. */ -int -posix_fallocate (int fd, __off_t offset, __off_t len) -{ - INTERNAL_SYSCALL_DECL (err); -#ifdef INTERNAL_SYSCALL_TYPES - int res = INTERNAL_SYSCALL_TYPES (fallocate, err, 4, int, fd, - int, 0, off_t, offset, - off_t, len); -#else - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); -#endif - - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) - return 0; - - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) - return INTERNAL_SYSCALL_ERRNO (res, err); - - return internal_fallocate (fd, offset, len); -} -weak_alias (posix_fallocate, posix_fallocate64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c deleted file mode 100644 index f466f13..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c +++ /dev/null @@ -1 +0,0 @@ -/* posix_fallocate64 is in posix_fallocate.c */ -- 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 3/4] Consolidate posix_fallocate{64} implementations 2016-08-19 14:42 ` [PATCH 3/4] Consolidate posix_fallocate{64} implementations Adhemerval Zanella @ 2016-08-22 14:35 ` Yury Norov 2016-08-23 19:22 ` Adhemerval Zanella 0 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-22 14:35 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:48AM -0300, Adhemerval Zanella wrote: > This patch consolidates all the posix_fallocate{64} implementation for Linux > in only one (sysdeps/unix/sysv/linux/posix_fallocate{64}.c). It also removes > the syscall from the auto-generation using assembly macros. > > The macro SYSCALL_LL{64} is used to handle the offset argument along with > the new INTERNAL_SYSCALL_CALL macro to define correct argument count for > internal INTERNAL_SYSCALL call. > > Tested on x86_64, i686, x32, aarch64, ppc64le, and armhf. > > * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c: Remove > file. > * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c: > Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c: > Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c: Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c: Likewise. > * sysdeps/unix/sysv/linux/posix_fallocate.c (posix_fallocate): Use > SYSCALL_LL to pass both offset and len arguments. > * sysdeps/unix/sysv/linux/posix_fallocate64.c (posix_fallocate64): > Likewise. > --- > io/Makefile | 2 +- > io/tst-posix_fallocate-common.c | 92 ++++++++++++++++++ > io/tst-posix_fallocate.c | 107 ++++----------------- > io/tst-posix_fallocate64.c | 44 +++++++++ > .../sysv/linux/mips/mips64/n32/posix_fallocate.c | 37 ------- > .../sysv/linux/mips/mips64/n32/posix_fallocate64.c | 38 -------- > .../sysv/linux/mips/mips64/n64/posix_fallocate.c | 1 - > .../sysv/linux/mips/mips64/n64/posix_fallocate64.c | 1 - > sysdeps/unix/sysv/linux/posix_fallocate.c | 6 +- > sysdeps/unix/sysv/linux/posix_fallocate64.c | 8 +- > .../unix/sysv/linux/wordsize-64/posix_fallocate.c | 46 --------- > .../sysv/linux/wordsize-64/posix_fallocate64.c | 1 - > 13 files changed, 180 insertions(+), 222 deletions(-) > create mode 100644 io/tst-posix_fallocate-common.c > create mode 100644 io/tst-posix_fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c > > diff --git a/io/Makefile b/io/Makefile > index deb6100..20fe3de 100644 > --- a/io/Makefile > +++ b/io/Makefile > @@ -71,7 +71,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ > tst-renameat tst-fchownat tst-fchmodat tst-faccessat \ > tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \ > tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \ > - tst-posix_fallocate tst-fts tst-fts-lfs > + tst-posix_fallocate tst-posix_fallocate64 tst-fts tst-fts-lfs > > ifeq ($(run-built-tests),yes) > tests-special += $(objpfx)ftwtest.out > diff --git a/io/tst-posix_fallocate-common.c b/io/tst-posix_fallocate-common.c > new file mode 100644 > index 0000000..42d6ec6 > --- /dev/null > +++ b/io/tst-posix_fallocate-common.c > @@ -0,0 +1,92 @@ > +/* Common posix_fallocate tests definitions. > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#include <fcntl.h> > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <unistd.h> > + > +static void do_prepare (void); > +#define PREPARE(argc, argv) do_prepare () Trailing whitespace > +static int do_test (void); > +#define TEST_FUNCTION do_test () > + > +#define TIMEOUT 20 /* sec. */ > + > +#include <test-skeleton.c> > + > +static char *temp_filename; > +static int temp_fd; > + > +static void > +do_prepare (void) > +{ > + temp_fd = create_temp_file ("tst-posix_fallocate.", &temp_filename); > + if (temp_fd == -1) > + { > + printf ("cannot create temporary file: %m\n"); > + exit (1); > + } > +} > + > +#define FAIL(str) \ > + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) > + > +static int > +do_test_with_offset (off_t offset) > +{ > + struct stat st; > + > + if (posix_fallocate (temp_fd, offset, 768) != 0) > + FAIL ("1st posix_fallocate call failed"); > + > + if (fstat (temp_fd, &st) != 0) > + FAIL ("2nd fstat failed"); > + > + if (st.st_size != (offset + 768)) > + { > + printf ("file size after first posix_fallocate call is %llu, expected %u\n", > + (unsigned long long int) st.st_size, 512u + 768u); > + return 1; > + } > + > + if (posix_fallocate (temp_fd, 0, 1024) != 0) > + FAIL ("2nd posix_fallocate call failed"); > + > + if (fstat (temp_fd, &st) != 0) > + FAIL ("3rd fstat failed"); > + > + if (st.st_size != (offset) + 768) > + FAIL ("file size changed in second posix_fallocate"); > + > + offset += 2048; > + if (posix_fallocate (temp_fd, offset, 64) != 0) > + FAIL ("3rd posix_fallocate call failed"); > + > + if (fstat (temp_fd, &st) != 0) > + FAIL ("4th fstat failed"); > + > + if (st.st_size != (offset + 64)) > + { > + printf ("file size after first posix_fallocate call is %llu, expected %u\n", > + (unsigned long long int) st.st_size, 2048u + 64u); > + return 1; > + } > + > + return 0; > +} > diff --git a/io/tst-posix_fallocate.c b/io/tst-posix_fallocate.c > index 53f0704..59f3fa1 100644 > --- a/io/tst-posix_fallocate.c > +++ b/io/tst-posix_fallocate.c > @@ -1,100 +1,33 @@ > -#include <fcntl.h> > -#include <sys/stat.h> > +/* Basic posix_fallocate tests. > + Copyright (C) 2016 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > > -static void do_prepare (void); > -#define PREPARE(argc, argv) do_prepare () > -static int do_test (void); > -#define TEST_FUNCTION do_test () > -#include <test-skeleton.c> > + 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. > > -static int fd; > + 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. > > -static void > -do_prepare (void) > -{ > - fd = create_temp_file ("tst-posix_fallocate.", NULL); > - if (fd == -1) > - { > - printf ("cannot create temporary file: %m\n"); > - exit (1); > - } > -} > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > > +#include "tst-posix_fallocate-common.c" > > static int > do_test (void) > { > - struct stat64 st; > + struct stat st; > > - if (fstat64 (fd, &st) != 0) > - { > - puts ("1st fstat failed"); > - return 1; > - } > + if (fstat (temp_fd, &st) != 0) > + FAIL ("1st fstat failed"); > > if (st.st_size != 0) > - { > - puts ("file not created with size 0"); > - return 1; > - } > - > - if (posix_fallocate (fd, 512, 768) != 0) > - { > - puts ("1st posix_fallocate call failed"); > - return 1; > - } > - > - if (fstat64 (fd, &st) != 0) > - { > - puts ("2nd fstat failed"); > - return 1; > - } > - > - if (st.st_size != 512 + 768) > - { > - printf ("file size after first posix_fallocate call is %llu, expected %u\n", > - (unsigned long long int) st.st_size, 512u + 768u); > - return 1; > - } > - > - if (posix_fallocate (fd, 0, 1024) != 0) > - { > - puts ("2nd posix_fallocate call failed"); > - return 1; > - } > - > - if (fstat64 (fd, &st) != 0) > - { > - puts ("3rd fstat failed"); > - return 1; > - } > - > - if (st.st_size != 512 + 768) > - { > - puts ("file size changed in second posix_fallocate"); > - return 1; > - } > - > - if (posix_fallocate (fd, 2048, 64) != 0) > - { > - puts ("3rd posix_fallocate call failed"); > - return 1; > - } > - > - if (fstat64 (fd, &st) != 0) > - { > - puts ("4th fstat failed"); > - return 1; > - } > - > - if (st.st_size != 2048 + 64) > - { > - printf ("file size after first posix_fallocate call is %llu, expected %u\n", > - (unsigned long long int) st.st_size, 2048u + 64u); > - return 1; > - } > - > - close (fd); > + FAIL ("file not created with size 0"); > > - return 0; > + return do_test_with_offset (512); > } > diff --git a/io/tst-posix_fallocate64.c b/io/tst-posix_fallocate64.c > new file mode 100644 > index 0000000..cbb57ff > --- /dev/null > +++ b/io/tst-posix_fallocate64.c > @@ -0,0 +1,44 @@ > +/* Basic posix_fallocate tests (with _FILE_OFFSET_BITS). > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#define _FILE_OFFSET_BITS 64 > +#include "tst-posix_fallocate-common.c" > + > +static int > +do_test (void) > +{ > + struct stat st; > + int ret; > + > + if (fstat (temp_fd, &st) != 0) > + FAIL ("1st fstat failed"); > + > + if (st.st_size != 0) > + FAIL ("file not created with size 0"); > + > + ret = do_test_with_offset (512); > + if (ret == -1) > + return -1; > + > + off_t base_offset = UINT32_MAX + 512LL; > + ret = do_test_with_offset (base_offset); > + if (ret == -1) > + return 1; > + > + return 0; > +} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c > deleted file mode 100644 > index e652e5b..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c > +++ /dev/null > @@ -1,37 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <fcntl.h> > -#include <sysdep.h> > - > -#define posix_fallocate static internal_fallocate > -#include <sysdeps/posix/posix_fallocate.c> > -#undef posix_fallocate > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -posix_fallocate (int fd, __off_t offset, __off_t len) > -{ > - INTERNAL_SYSCALL_DECL (err); > - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); > - > - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) > - return 0; > - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) > - return INTERNAL_SYSCALL_ERRNO (res, err); > - return internal_fallocate (fd, offset, len); > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c > deleted file mode 100644 > index d5659e0..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c > +++ /dev/null > @@ -1,38 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <fcntl.h> > -#include <sysdep.h> > - > -extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len); > -#define __posix_fallocate64_l64 static internal_fallocate64 > -#include <sysdeps/posix/posix_fallocate64.c> > -#undef __posix_fallocate64_l64 > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) > -{ > - INTERNAL_SYSCALL_DECL (err); > - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); > - > - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) > - return 0; > - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) > - return INTERNAL_SYSCALL_ERRNO (res, err); > - return internal_fallocate64 (fd, offset, len); > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c > deleted file mode 100644 > index b3fe81b..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include <sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c> > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c > deleted file mode 100644 > index f466f13..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* posix_fallocate64 is in posix_fallocate.c */ > diff --git a/sysdeps/unix/sysv/linux/posix_fallocate.c b/sysdeps/unix/sysv/linux/posix_fallocate.c > index fc9ac37..139cb56 100644 > --- a/sysdeps/unix/sysv/linux/posix_fallocate.c > +++ b/sysdeps/unix/sysv/linux/posix_fallocate.c > @@ -27,10 +27,8 @@ int > posix_fallocate (int fd, __off_t offset, __off_t len) > { > INTERNAL_SYSCALL_DECL (err); > - int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, > - __LONG_LONG_PAIR (offset >> 31, offset), > - __LONG_LONG_PAIR (len >> 31, len)); > - > + int res = INTERNAL_SYSCALL_CALL (fallocate, err, fd, 0, > + SYSCALL_LL (offset), SYSCALL_LL (len)); > if (! INTERNAL_SYSCALL_ERROR_P (res, err)) > return 0; > if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) > diff --git a/sysdeps/unix/sysv/linux/posix_fallocate64.c b/sysdeps/unix/sysv/linux/posix_fallocate64.c > index 4a0a722..8a870cb 100644 > --- a/sysdeps/unix/sysv/linux/posix_fallocate64.c > +++ b/sysdeps/unix/sysv/linux/posix_fallocate64.c > @@ -28,12 +28,8 @@ int > __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) > { > INTERNAL_SYSCALL_DECL (err); > - int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, > - __LONG_LONG_PAIR ((long int) (offset >> 32), > - (long int) offset), > - __LONG_LONG_PAIR ((long int) (len >> 32), > - (long int) len)); > - > + int res = INTERNAL_SYSCALL_CALL (fallocate, err, fd, 0, > + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); > if (! INTERNAL_SYSCALL_ERROR_P (res, err)) > return 0; > if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c > deleted file mode 100644 > index 8caee31..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c > +++ /dev/null > @@ -1,46 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <fcntl.h> > -#include <sysdep.h> > - > -#define posix_fallocate static internal_fallocate > -#include <sysdeps/posix/posix_fallocate.c> > -#undef posix_fallocate > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -posix_fallocate (int fd, __off_t offset, __off_t len) > -{ > - INTERNAL_SYSCALL_DECL (err); > -#ifdef INTERNAL_SYSCALL_TYPES > - int res = INTERNAL_SYSCALL_TYPES (fallocate, err, 4, int, fd, > - int, 0, off_t, offset, > - off_t, len); > -#else > - int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len); > -#endif > - > - if (! INTERNAL_SYSCALL_ERROR_P (res, err)) > - return 0; > - > - if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) > - return INTERNAL_SYSCALL_ERRNO (res, err); > - > - return internal_fallocate (fd, offset, len); > -} > -weak_alias (posix_fallocate, posix_fallocate64) > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c > deleted file mode 100644 > index f466f13..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* posix_fallocate64 is in posix_fallocate.c */ > -- > 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 3/4] Consolidate posix_fallocate{64} implementations 2016-08-22 14:35 ` Yury Norov @ 2016-08-23 19:22 ` Adhemerval Zanella 0 siblings, 0 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-23 19:22 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha Thanks for the reviews, comments below. >> diff --git a/io/tst-posix_fallocate-common.c b/io/tst-posix_fallocate-common.c >> new file mode 100644 >> index 0000000..42d6ec6 >> --- /dev/null >> +++ b/io/tst-posix_fallocate-common.c >> @@ -0,0 +1,92 @@ >> +/* Common posix_fallocate tests definitions. >> + Copyright (C) 2016 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 >> + <http://www.gnu.org/licenses/>. */ >> + >> +#include <fcntl.h> >> +#include <sys/types.h> >> +#include <sys/stat.h> >> +#include <unistd.h> >> + >> +static void do_prepare (void); >> +#define PREPARE(argc, argv) do_prepare () > > Trailing whitespace Ack, I will fix it. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella 2016-08-19 14:42 ` [PATCH 3/4] Consolidate posix_fallocate{64} implementations Adhemerval Zanella @ 2016-08-19 14:42 ` Adhemerval Zanella 2016-08-22 15:08 ` Yury Norov ` (2 more replies) 2016-08-19 14:42 ` [PATCH 2/4] Consolidate fallocate{64} implementations Adhemerval Zanella ` (2 subsequent siblings) 4 siblings, 3 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-19 14:42 UTC (permalink / raw) To: libc-alpha This patch consolidates mostly of the Linux posix_fallocate{64} implementations on sysdeps/unix/sysv/linux/posix_fallocate{64}.c. It still keeps arch-specific files for: * S390-32: it uses a packed structure to pass all the arguments on syscall. It is the only supported port that implements __NR_fadvise64_64 in this way. * ARM: it does not implement __NR_fadvise64 (as other 32-bits ports), so posix_fadvise calls internal posix_fadvise64 symbol. * MIPS64 n64: it requires a different version number that other ports. The new macro SYSCALL_LL{64} is used to handle the offset argument and INTERNAL_SYSCALL_CALL to handle passing the correct number of expect arguments. The default Linux adds two new defines a port can use to control how __NR_fadvise64_64 passes the kernel arguments: * __ASSUME_FADVISE64_64_6ARG: the 'advise' argument is moved on second position. This is the case of powerpc32 and arm to avoid implement 7 argument syscall. * __ASSUME_FADVISE64_64_NO_ALIGN: for ABIs that defines __ASSUME_ALIGNED_REGISTER_PAIRS packs the offset without the leading '0'. This is the case of tile 32 bits. ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64 (which is also handled on arch kernel-feature.h). Tested on x86_64, x32, i686, armhf, and aarch64. * posix/Makefile (tests): Add tst-posix_fadvise and tst-posix_fadvise64. * posix/tst-posix_fadvise.c: New file. * posix/tst-posix_fadvise64.c: Likewise. * posix/tst-posix_fadvise-common.c: Likewise. * sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_FADVISE64_64_6ARG): Define. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h [!__powerpc64__] (__ASSUME_FADVISE64_64_6ARG): Add define. * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c: Remove file. * sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: Alias to __posix_fadvise64_l32. (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l32]: Add compat definition to posix_fadvise64. (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: Add versioned definition to posix_fadvise64. * sysdeps/unix/sysv/linux/posix_fadvise.c (posix_fadvise): Build iff __OFF_T_MATCHES_OFF64_T is defined, use INTERNAL_SYSCALL_CALL, add __ASSUME_FADVISE64_64_6ARG/__ASSUME_FADVISE64_64_NO_ALIGN support. * sysdeps/unix/sysv/linux/posix_fadvise64.c (posix_fadvise64): Add __ASSUME_FADVISE64_64_NO_ALIGN support and use INTERNAL_SYSCALL_CALL. * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (posix_fadvise): Remove. --- posix/Makefile | 3 +- posix/tst-posix_fadvise-common.c | 113 +++++++++++++++++++++ posix/tst-posix_fadvise.c | 25 +++++ posix/tst-posix_fadvise64.c | 44 ++++++++ sysdeps/unix/sysv/linux/arm/kernel-features.h | 7 ++ sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 38 ------- .../sysv/linux/generic/wordsize-32/posix_fadvise.c | 37 ------- sysdeps/unix/sysv/linux/i386/posix_fadvise64.S | 92 ----------------- .../unix/sysv/linux/mips/mips32/posix_fadvise.c | 41 -------- .../unix/sysv/linux/mips/mips32/posix_fadvise64.c | 60 ----------- .../sysv/linux/mips/mips64/n32/posix_fadvise.c | 37 ------- .../sysv/linux/mips/mips64/n32/posix_fadvise64.c | 55 ---------- .../sysv/linux/mips/mips64/n64/posix_fadvise.c | 50 --------- .../sysv/linux/mips/mips64/n64/posix_fadvise64.c | 28 ++++- sysdeps/unix/sysv/linux/posix_fadvise.c | 45 +++++--- sysdeps/unix/sysv/linux/posix_fadvise64.c | 52 +++++++--- sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 5 + .../sysv/linux/powerpc/powerpc32/posix_fadvise.c | 39 ------- .../sysv/linux/powerpc/powerpc32/posix_fadvise64.c | 55 ---------- sysdeps/unix/sysv/linux/tile/kernel-features.h | 1 + .../unix/sysv/linux/wordsize-64/posix_fadvise.c | 40 -------- .../unix/sysv/linux/wordsize-64/posix_fadvise64.c | 1 - sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 1 - 24 files changed, 333 insertions(+), 574 deletions(-) create mode 100644 posix/tst-posix_fadvise-common.c create mode 100644 posix/tst-posix_fadvise.c create mode 100644 posix/tst-posix_fadvise64.c delete mode 100644 sysdeps/unix/sysv/linux/arm/posix_fadvise64.c delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/i386/posix_fadvise64.S delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c diff --git a/posix/Makefile b/posix/Makefile index 3a7719e..97867ca 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -90,7 +90,8 @@ tests := tstgetopt testfnm runtests runptests \ bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ tst-pathconf tst-getaddrinfo4 tst-rxspencer-no-utf8 \ tst-fnmatch3 bug-regex36 tst-getaddrinfo5 \ - tst-posix_spawn-fd + tst-posix_spawn-fd \ + tst-posix_fadvise tst-posix_fadvise64 xtests := bug-ga2 ifeq (yes,$(build-shared)) test-srcs := globtest diff --git a/posix/tst-posix_fadvise-common.c b/posix/tst-posix_fadvise-common.c new file mode 100644 index 0000000..6670835 --- /dev/null +++ b/posix/tst-posix_fadvise-common.c @@ -0,0 +1,113 @@ +/* Common posix_fadvise tests definitions. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +static void do_prepare (void); +#define PREPARE(argc, argv) do_prepare () +static int do_test (void); +#define TEST_FUNCTION do_test () + +#include <test-skeleton.c> + +static char *temp_filename; +static int temp_fd; +static char fifoname[] = "/tmp/tst-posix_fadvise-fifo-XXXXXX"; +static int fifofd; + +static void +do_prepare (void) +{ + temp_fd = create_temp_file ("tst-posix_fadvise.", &temp_filename); + if (temp_fd == -1) + { + printf ("cannot create temporary file: %m\n"); + exit (1); + } + + if (mktemp (fifoname) == NULL) + { + printf ("%s: cannot generate temp file name: %m\n", __func__); + exit (1); + } + add_temp_file (fifoname); + + if (mkfifo (fifoname, S_IWUSR | S_IRUSR) != 0) + { + printf ("%s: cannot create fifo: %m\n", __func__); + exit (1); + } + + fifofd = open (fifoname, O_RDONLY | O_NONBLOCK); + if (fifofd == -1) + { + printf ("%s: cannot open fifo: %m\n", __func__); + exit (1); + } +} + +#define FAIL(str) \ + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) + +/* Effectivelly testing posix_fadvise is hard because side effects are not + observed without checking either performance or any kernel specific + supplied information. Also, the syscall is meant to be an advisory, + so kernel is free to use these information in which way it seems as + fit (even ignoring it). + + This test check for some invalid returned operation to check argument + passing and if implementation follows POSIX error definition. */ +static int +do_test_common (void) +{ + /* Add some data to file and ensure it is written down on disk. */ + char buffer[2048] = { 0xcd }; + + if (write (temp_fd, buffer, 2048) != 2048) + FAIL ("write returned a value different than expected 2048"); + + if (fsync (temp_fd) != 0) + FAIL ("fsync failed"); + + /* Test passing an invalid fd. */ + if (posix_fadvise (-1, 0, 0, POSIX_FADV_NORMAL) != EBADF) + FAIL ("posix_fadvise with invalid fd did not return EBADF"); + + /* Test passing an invalid operation. */ + if (posix_fadvise (temp_fd, 0, 0, -1) != EINVAL) + FAIL ("posix_fadvise with invalid advise did not return EINVAL"); + + /* Test passing a FIFO fd. */ + if (posix_fadvise (fifofd, 0, 0, POSIX_FADV_NORMAL) != ESPIPE) + FAIL ("posix_advise with PIPE fd did not return ESPIPE"); + + /* Default fadvise on all file starting at initial position. */ + if (posix_fadvise (temp_fd, 0, 0, POSIX_FADV_NORMAL) != 0) + FAIL ("default posix_fadvise failed"); + + if (posix_fadvise (temp_fd, 0, 4096, POSIX_FADV_NORMAL) != 0) + FAIL ("posix_fadvise failed (offset = 0, len = 4096) failed"); + + if (posix_fadvise (temp_fd, 4096, 0, POSIX_FADV_NORMAL) != 0) + FAIL ("posix_fadvise failed (offset = 4096, len = 0) failed"); + + return 0; +} diff --git a/posix/tst-posix_fadvise.c b/posix/tst-posix_fadvise.c new file mode 100644 index 0000000..6ee0936 --- /dev/null +++ b/posix/tst-posix_fadvise.c @@ -0,0 +1,25 @@ +/* Basic posix_fadvise tests. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#include "tst-posix_fadvise-common.c" + +static int +do_test (void) +{ + return do_test_common (); +} diff --git a/posix/tst-posix_fadvise64.c b/posix/tst-posix_fadvise64.c new file mode 100644 index 0000000..91d1860 --- /dev/null +++ b/posix/tst-posix_fadvise64.c @@ -0,0 +1,44 @@ +/* Basic posix_fadvise64 tests. + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#define _FILE_OFFSET_BITS 64 +#include "tst-posix_fadvise-common.c" + +static int +do_test (void) +{ + int ret = do_test_common (); + if (ret == -1) + return -1; + + /* Test passing a negative length. The compat fadvise64 might use + off64_t for size argument passing, so using -1 for len without + _FILE_OFFSET_BITS might not trigger the length issue. */ + if (posix_fadvise (temp_fd, 0, -1, POSIX_FADV_NORMAL) != EINVAL) + FAIL ("posix_fadvise with negative length did not return EINVAL"); + + /* Check with some offset values larger than 32-bits. */ + off_t offset = UINT32_MAX + 2048LL; + if (posix_fadvise (temp_fd, 0, offset, POSIX_FADV_NORMAL) != 0) + FAIL ("posix_fadvise failed (offset = 0, len = 4096) failed"); + + if (posix_fadvise (temp_fd, offset, 0, POSIX_FADV_NORMAL) != 0) + FAIL ("posix_fadvise failed (offset = 4096, len = 0) failed"); + + return 0; +} diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h index 6ca607e..628d27f 100644 --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h @@ -27,6 +27,13 @@ # undef __ASSUME_SET_ROBUST_LIST #endif +/* ARM fadvise64_64 reorganize the syscall arguments. */ +#define __ASSUME_FADVISE64_64_6ARG 1 + /* Define this if your 32-bit syscall API requires 64-bit register pairs to start with an even-number register. */ #define __ASSUME_ALIGNED_REGISTER_PAIRS 1 + +/* ARM only has a syscall for fadvise64{_64} and it defined with a + non-standard name. */ +#define __NR_fadvise64_64 __NR_arm_fadvise64_64 diff --git a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c deleted file mode 100644 index ffb3ecd..0000000 --- a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) -{ - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (arm_fadvise64_64, err, 6, fd, advise, - __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), - __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); - if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) - return 0; - return INTERNAL_SYSCALL_ERRNO (ret, err); -} -weak_alias (__posix_fadvise64_l64, posix_fadvise64); diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c deleted file mode 100644 index 7c93a8f..0000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. - - 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, - __LONG_LONG_PAIR (offset >> 31, offset), - __LONG_LONG_PAIR (len >> 31, len), - advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -} diff --git a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S deleted file mode 100644 index 4b5d65c..0000000 --- a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S +++ /dev/null @@ -1,92 +0,0 @@ -/* Copyright (C) 1995-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <sysdep.h> - -#define EINVAL 22 -#define ENOSYS 38 -#define EOVERFLOW 75 - -#define SVRSP 16 /* saved register space */ -#define PARMS 4+SVRSP /* space for 4 saved regs */ -#define FD PARMS -#define OFFLO FD+4 -#define OFFHI OFFLO+4 -#define LENLO OFFHI+4 -#define LENHI LENLO+4 -#define FLAGS LENHI+4 - - .text -ENTRY (__posix_fadvise64_l64) - - /* Save registers. */ - pushl %ebp - cfi_adjust_cfa_offset (4) - pushl %ebx - cfi_adjust_cfa_offset (4) - pushl %esi - cfi_adjust_cfa_offset (4) - pushl %edi - cfi_adjust_cfa_offset (4) - - movl FD(%esp), %ebx - cfi_rel_offset (ebx, 8) - movl OFFLO(%esp), %ecx - movl OFFHI(%esp), %edx - movl LENLO(%esp), %esi - cfi_rel_offset (esi, 4) - movl LENHI(%esp), %edi - cfi_rel_offset (edi, 0) - movl FLAGS(%esp), %ebp - cfi_rel_offset (ebp, 12) - - movl $SYS_ify(fadvise64_64), %eax - ENTER_KERNEL - - /* Restore registers. */ - popl %edi - cfi_adjust_cfa_offset (-4) - cfi_restore (edi) - popl %esi - cfi_adjust_cfa_offset (-4) - cfi_restore (esi) - popl %ebx - cfi_adjust_cfa_offset (-4) - cfi_restore (ebx) - popl %ebp - cfi_adjust_cfa_offset (-4) - cfi_restore (ebp) - - /* The function returns zero, or the error number. So all we - have to do is negate the value passed back from the kernel. */ - /* If 0 > %eax > -4096 there was an error. */ - negl %eax - - /* Successful; return the syscall's value. */ - ret - -END (__posix_fadvise64_l64) - - .section .text.compat, "ax" -ENTRY (__posix_fadvise64_l32) - DO_CALL (fadvise64, 5) - negl %eax - ret -PSEUDO_END_ERRVAL (__posix_fadvise64_l32) - -default_symbol_version (__posix_fadvise64_l64, posix_fadvise64, GLIBC_2.3.3) -symbol_version (__posix_fadvise64_l32, posix_fadvise64, GLIBC_2.2) diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c deleted file mode 100644 index 705c0c7..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 7, fd, 0, - __LONG_LONG_PAIR (offset >> 31, offset), - __LONG_LONG_PAIR (len >> 31, len), - advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c deleted file mode 100644 index 0ded3c3..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) -{ -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 7, fd, 0, - __LONG_LONG_PAIR ((long) (offset >> 32), - (long) offset), - __LONG_LONG_PAIR ((long) (len >> 32), - (long) len), - advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) - -int -attribute_compat_text_section -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) -{ - return __posix_fadvise64_l64 (fd, offset, len, advise); -} - -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); -#else -strong_alias (__posix_fadvise64_l64, posix_fadvise64); -#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c deleted file mode 100644 index 3b1ef7e..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c deleted file mode 100644 index e7ddc87..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) -{ -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) - -int -attribute_compat_text_section -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) -{ - return __posix_fadvise64_l64 (fd, offset, len, advise); -} - -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); -#else -strong_alias (__posix_fadvise64_l64, posix_fadvise64); -#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c deleted file mode 100644 index 86ff6ef..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#define posix_fadvise64 __no_posix_fadvise64 -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> -#undef posix_fadvise64 - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) -strong_alias (posix_fadvise, __posix_fadvise64_l32); -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); -strong_alias (posix_fadvise, __posix_fadvise64_l64); -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); -#else -weak_alias (posix_fadvise, posix_fadvise64); -#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c index c9f72c4..3856fe0 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c @@ -1 +1,27 @@ -/* posix_fadvise64 is in posix_fadvise.c */ +/* Copyright (C) 2003-2016 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 + <http://www.gnu.org/licenses/>. */ + +#undef strong_alias +#define strong_alias(a, b) + +#include <sysdeps/unix/sysv/linux/posix_fadvise64.c> + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) +_strong_alias (__posix_fadvise64_l64, __posix_fadvise64_l32); +compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); +versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); +#endif diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c index 093d707..869a642 100644 --- a/sysdeps/unix/sysv/linux/posix_fadvise.c +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c @@ -22,27 +22,46 @@ /* Advice the system about the expected behaviour of the application with respect to the file associated with FD. */ +#ifndef __OFF_T_MATCHES_OFF64_T + +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. + + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit + fadvise64_64 without the padding 0 after fd. + + s390 implements fadvice64_64 using a specific struct with arguments + packed inside. This is the only implementation handled in arch-specific + code. */ + int posix_fadvise (int fd, off_t offset, off_t len, int advise) { -#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64) INTERNAL_SYSCALL_DECL (err); # ifdef __NR_fadvise64 - int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd, - __LONG_LONG_PAIR (offset >> 31, offset), len, - advise); + int ret = INTERNAL_SYSCALL_CALL (fadvise64, err, fd, + __ALIGNMENT_ARG SYSCALL_LL (offset), + len, advise); # else - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, - __LONG_LONG_PAIR ((long) (offset >> 31), - (long) offset), - __LONG_LONG_PAIR ((long) (len >> 31), - (long) len), - advise); +# ifdef __ASSUME_FADVISE64_64_6ARG + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, + __ALIGNMENT_ARG SYSCALL_LL (offset), + SYSCALL_LL (len)); +# else + +# ifdef __ASSUME_FADVISE64_64_NO_ALIGN +# undef __ALIGNMENT_ARG +# define __ALIGNMENT_ARG +# endif + + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, + __ALIGNMENT_ARG SYSCALL_LL (offset), + SYSCALL_LL (len), advise); +# endif # endif if (INTERNAL_SYSCALL_ERROR_P (ret, err)) return INTERNAL_SYSCALL_ERRNO (ret, err); return 0; -#else - return ENOSYS; -#endif } +#endif /* __OFF_T_MATCHES_OFF64_T */ diff --git a/sysdeps/unix/sysv/linux/posix_fadvise64.c b/sysdeps/unix/sysv/linux/posix_fadvise64.c index 6d10558..15e08b7 100644 --- a/sysdeps/unix/sysv/linux/posix_fadvise64.c +++ b/sysdeps/unix/sysv/linux/posix_fadvise64.c @@ -17,32 +17,54 @@ #include <errno.h> #include <fcntl.h> -#include <sysdep.h> +#include <shlib-compat.h> int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); + +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. + + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit + fadvise64_64 without the padding 0 after fd. + + s390 implements fadvice64_64 using a specific struct with arguments + packed inside. This is the only implementation handled in arch-specific + code. */ + +#ifdef __ASSUME_FADVISE64_64_NO_ALIGN +# undef __ALIGNMENT_ARG +# define __ALIGNMENT_ARG +#endif + +#ifndef __NR_fadvise64_64 +# define __NR_fadvise64_64 __NR_fadvise64 +#endif /* Advice the system about the expected behaviour of the application with respect to the file associated with FD. */ - int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) { INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, - __LONG_LONG_PAIR ((long) (offset >> 32), - (long) offset), - __LONG_LONG_PAIR ((long) (len >> 32), - (long) len), - advise); +#ifdef __ASSUME_FADVISE64_64_6ARG + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); +#else + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, + __ALIGNMENT_ARG SYSCALL_LL64 (offset), + SYSCALL_LL64 (len), advise); +#endif if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) return 0; return INTERNAL_SYSCALL_ERRNO (ret, err); } -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) +/* The type of the len argument was changed from size_t to off_t in + POSIX.1-2003 TC1. */ +#ifndef __OFF_T_MATCHES_OFF64_T +# if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) +int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); int attribute_compat_text_section @@ -53,6 +75,10 @@ __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); +# else +weak_alias (__posix_fadvise64_l64, posix_fadvise64); +# endif #else -strong_alias (__posix_fadvise64_l64, posix_fadvise64); +weak_alias (__posix_fadvise64_l64, posix_fadvise64); +strong_alias (__posix_fadvise64_l64, posix_fadvise); #endif diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h index 996535f..42a53f2 100644 --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h @@ -46,4 +46,9 @@ # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 #endif +/* powerpc compat fadvise64_64 reorganize the syscall argument. */ +#ifndef __powerpc64__ +# define __ASSUME_FADVISE64_64_6ARG 1 +#endif + #include_next <kernel-features.h> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c deleted file mode 100644 index e846bf5..0000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 6, fd, 0, - __LONG_LONG_PAIR (offset >> 31, offset), len, - advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c deleted file mode 100644 index c26206f..0000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> - -int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) -{ - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advise, - __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), - __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); - if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) - return 0; - return INTERNAL_SYSCALL_ERRNO (ret, err); -} - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) - -int -attribute_compat_text_section -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) -{ - return __posix_fadvise64_l64 (fd, offset, len, advise); -} - -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); -#else -strong_alias (__posix_fadvise64_l64, posix_fadvise64); -#endif diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h index 9425e1c..ded0e43 100644 --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h @@ -23,4 +23,5 @@ pairs to start with an even-number register. */ #ifndef _LP64 # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 +# define __ASSUME_FADVISE64_64_NO_ALIGN 1 #endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c deleted file mode 100644 index 137b591..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2003-2016 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 - <http://www.gnu.org/licenses/>. */ - -#define posix_fadvise64 __no_posix_fadvise64 -#include <errno.h> -#include <fcntl.h> -#include <sysdep.h> -#undef posix_fadvise64 - -/* Advice the system about the expected behaviour of the application with - respect to the file associated with FD. */ - -int -posix_fadvise (int fd, off_t offset, off_t len, int advise) -{ -#ifdef __NR_fadvise64 - INTERNAL_SYSCALL_DECL (err); - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - return INTERNAL_SYSCALL_ERRNO (ret, err); - return 0; -#else - return ENOSYS; -#endif -} -weak_alias (posix_fadvise, posix_fadvise64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c deleted file mode 100644 index c9f72c4..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c +++ /dev/null @@ -1 +0,0 @@ -/* posix_fadvise64 is in posix_fadvise.c */ diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list index 8cccb1d..63657eb9 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list @@ -2,5 +2,4 @@ gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday personality EXTRA personality Ei:i __personality personality -posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64 time - time:__vdso_time@LINUX_2.6 Ei:P time -- 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella @ 2016-08-22 15:08 ` Yury Norov 2016-08-23 19:29 ` Adhemerval Zanella 2016-08-24 3:53 ` Yury Norov 2016-09-25 10:42 ` Yury Norov 2 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-22 15:08 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:49AM -0300, Adhemerval Zanella wrote: > This patch consolidates mostly of the Linux posix_fallocate{64} implementations > on sysdeps/unix/sysv/linux/posix_fallocate{64}.c. It still keeps arch-specific > files for: > > * S390-32: it uses a packed structure to pass all the arguments on syscall. > It is the only supported port that implements __NR_fadvise64_64 in this > way. > > * ARM: it does not implement __NR_fadvise64 (as other 32-bits ports), so > posix_fadvise calls internal posix_fadvise64 symbol. > > * MIPS64 n64: it requires a different version number that other ports. > > The new macro SYSCALL_LL{64} is used to handle the offset argument and > INTERNAL_SYSCALL_CALL to handle passing the correct number of expect > arguments. > > The default Linux adds two new defines a port can use to control how > __NR_fadvise64_64 passes the kernel arguments: > > * __ASSUME_FADVISE64_64_6ARG: the 'advise' argument is moved on second > position. This is the case of powerpc32 and arm to avoid implement > 7 argument syscall. > > * __ASSUME_FADVISE64_64_NO_ALIGN: for ABIs that defines > __ASSUME_ALIGNED_REGISTER_PAIRS packs the offset without the leading > '0'. This is the case of tile 32 bits. > > ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64 (which is also > handled on arch kernel-feature.h). > > Tested on x86_64, x32, i686, armhf, and aarch64. > > * posix/Makefile (tests): Add tst-posix_fadvise and tst-posix_fadvise64. > * posix/tst-posix_fadvise.c: New file. > * posix/tst-posix_fadvise64.c: Likewise. > * posix/tst-posix_fadvise-common.c: Likewise. > * sysdeps/unix/sysv/linux/arm/kernel-features.h > (__ASSUME_FADVISE64_64_6ARG): Define. > * sysdeps/unix/sysv/linux/powerpc/kernel-features.h > [!__powerpc64__] (__ASSUME_FADVISE64_64_6ARG): Add define. > * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c: Remove file. > * sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Likewise. > * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c: > Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c: Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c > (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: > Alias to __posix_fadvise64_l32. > (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l32]: > Add compat definition to posix_fadvise64. > (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: > Add versioned definition to posix_fadvise64. > * sysdeps/unix/sysv/linux/posix_fadvise.c (posix_fadvise): Build iff > __OFF_T_MATCHES_OFF64_T is defined, use INTERNAL_SYSCALL_CALL, add > __ASSUME_FADVISE64_64_6ARG/__ASSUME_FADVISE64_64_NO_ALIGN support. > * sysdeps/unix/sysv/linux/posix_fadvise64.c (posix_fadvise64): Add > __ASSUME_FADVISE64_64_NO_ALIGN support and use INTERNAL_SYSCALL_CALL. > * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (posix_fadvise): > Remove. > > --- > posix/Makefile | 3 +- > posix/tst-posix_fadvise-common.c | 113 +++++++++++++++++++++ > posix/tst-posix_fadvise.c | 25 +++++ > posix/tst-posix_fadvise64.c | 44 ++++++++ > sysdeps/unix/sysv/linux/arm/kernel-features.h | 7 ++ > sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 38 ------- > .../sysv/linux/generic/wordsize-32/posix_fadvise.c | 37 ------- > sysdeps/unix/sysv/linux/i386/posix_fadvise64.S | 92 ----------------- > .../unix/sysv/linux/mips/mips32/posix_fadvise.c | 41 -------- > .../unix/sysv/linux/mips/mips32/posix_fadvise64.c | 60 ----------- > .../sysv/linux/mips/mips64/n32/posix_fadvise.c | 37 ------- > .../sysv/linux/mips/mips64/n32/posix_fadvise64.c | 55 ---------- > .../sysv/linux/mips/mips64/n64/posix_fadvise.c | 50 --------- > .../sysv/linux/mips/mips64/n64/posix_fadvise64.c | 28 ++++- > sysdeps/unix/sysv/linux/posix_fadvise.c | 45 +++++--- > sysdeps/unix/sysv/linux/posix_fadvise64.c | 52 +++++++--- > sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 5 + > .../sysv/linux/powerpc/powerpc32/posix_fadvise.c | 39 ------- > .../sysv/linux/powerpc/powerpc32/posix_fadvise64.c | 55 ---------- > sysdeps/unix/sysv/linux/tile/kernel-features.h | 1 + > .../unix/sysv/linux/wordsize-64/posix_fadvise.c | 40 -------- > .../unix/sysv/linux/wordsize-64/posix_fadvise64.c | 1 - > sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 1 - > 24 files changed, 333 insertions(+), 574 deletions(-) > create mode 100644 posix/tst-posix_fadvise-common.c > create mode 100644 posix/tst-posix_fadvise.c > create mode 100644 posix/tst-posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/arm/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/i386/posix_fadvise64.S > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c > > diff --git a/posix/Makefile b/posix/Makefile > index 3a7719e..97867ca 100644 > --- a/posix/Makefile > +++ b/posix/Makefile > @@ -90,7 +90,8 @@ tests := tstgetopt testfnm runtests runptests \ > bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ > tst-pathconf tst-getaddrinfo4 tst-rxspencer-no-utf8 \ > tst-fnmatch3 bug-regex36 tst-getaddrinfo5 \ > - tst-posix_spawn-fd > + tst-posix_spawn-fd \ > + tst-posix_fadvise tst-posix_fadvise64 > xtests := bug-ga2 > ifeq (yes,$(build-shared)) > test-srcs := globtest > diff --git a/posix/tst-posix_fadvise-common.c b/posix/tst-posix_fadvise-common.c > new file mode 100644 > index 0000000..6670835 > --- /dev/null > +++ b/posix/tst-posix_fadvise-common.c > @@ -0,0 +1,113 @@ > +/* Common posix_fadvise tests definitions. > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#include <fcntl.h> > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <unistd.h> > + > +static void do_prepare (void); > +#define PREPARE(argc, argv) do_prepare () > +static int do_test (void); > +#define TEST_FUNCTION do_test () > + > +#include <test-skeleton.c> > + > +static char *temp_filename; > +static int temp_fd; > +static char fifoname[] = "/tmp/tst-posix_fadvise-fifo-XXXXXX"; > +static int fifofd; > + > +static void > +do_prepare (void) > +{ > + temp_fd = create_temp_file ("tst-posix_fadvise.", &temp_filename); > + if (temp_fd == -1) > + { > + printf ("cannot create temporary file: %m\n"); > + exit (1); > + } > + > + if (mktemp (fifoname) == NULL) > + { Trailing whitespace > + printf ("%s: cannot generate temp file name: %m\n", __func__); > + exit (1); > + } > + add_temp_file (fifoname); > + > + if (mkfifo (fifoname, S_IWUSR | S_IRUSR) != 0) > + { > + printf ("%s: cannot create fifo: %m\n", __func__); > + exit (1); > + } > + > + fifofd = open (fifoname, O_RDONLY | O_NONBLOCK); > + if (fifofd == -1) > + { > + printf ("%s: cannot open fifo: %m\n", __func__); > + exit (1); > + } > +} > + > +#define FAIL(str) \ > + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) > + You don't fit into a single line anyway. Why don't you make it nicer? > +/* Effectivelly testing posix_fadvise is hard because side effects are not > + observed without checking either performance or any kernel specific > + supplied information. Also, the syscall is meant to be an advisory, > + so kernel is free to use these information in which way it seems as > + fit (even ignoring it). > + Trailing whitespaces > + This test check for some invalid returned operation to check argument > + passing and if implementation follows POSIX error definition. */ > +static int > +do_test_common (void) > +{ > + /* Add some data to file and ensure it is written down on disk. */ > + char buffer[2048] = { 0xcd }; > + > + if (write (temp_fd, buffer, 2048) != 2048) > + FAIL ("write returned a value different than expected 2048"); > + > + if (fsync (temp_fd) != 0) > + FAIL ("fsync failed"); > + > + /* Test passing an invalid fd. */ > + if (posix_fadvise (-1, 0, 0, POSIX_FADV_NORMAL) != EBADF) > + FAIL ("posix_fadvise with invalid fd did not return EBADF"); > + > + /* Test passing an invalid operation. */ > + if (posix_fadvise (temp_fd, 0, 0, -1) != EINVAL) > + FAIL ("posix_fadvise with invalid advise did not return EINVAL"); > + > + /* Test passing a FIFO fd. */ > + if (posix_fadvise (fifofd, 0, 0, POSIX_FADV_NORMAL) != ESPIPE) > + FAIL ("posix_advise with PIPE fd did not return ESPIPE"); > + > + /* Default fadvise on all file starting at initial position. */ > + if (posix_fadvise (temp_fd, 0, 0, POSIX_FADV_NORMAL) != 0) > + FAIL ("default posix_fadvise failed"); > + > + if (posix_fadvise (temp_fd, 0, 4096, POSIX_FADV_NORMAL) != 0) > + FAIL ("posix_fadvise failed (offset = 0, len = 4096) failed"); > + > + if (posix_fadvise (temp_fd, 4096, 0, POSIX_FADV_NORMAL) != 0) > + FAIL ("posix_fadvise failed (offset = 4096, len = 0) failed"); > + > + return 0; > +} > diff --git a/posix/tst-posix_fadvise.c b/posix/tst-posix_fadvise.c > new file mode 100644 > index 0000000..6ee0936 > --- /dev/null > +++ b/posix/tst-posix_fadvise.c > @@ -0,0 +1,25 @@ > +/* Basic posix_fadvise tests. > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#include "tst-posix_fadvise-common.c" > + > +static int > +do_test (void) > +{ > + return do_test_common (); > +} > diff --git a/posix/tst-posix_fadvise64.c b/posix/tst-posix_fadvise64.c > new file mode 100644 > index 0000000..91d1860 > --- /dev/null > +++ b/posix/tst-posix_fadvise64.c > @@ -0,0 +1,44 @@ > +/* Basic posix_fadvise64 tests. > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#define _FILE_OFFSET_BITS 64 > +#include "tst-posix_fadvise-common.c" > + > +static int > +do_test (void) > +{ > + int ret = do_test_common (); > + if (ret == -1) > + return -1; > + > + /* Test passing a negative length. The compat fadvise64 might use > + off64_t for size argument passing, so using -1 for len without > + _FILE_OFFSET_BITS might not trigger the length issue. */ > + if (posix_fadvise (temp_fd, 0, -1, POSIX_FADV_NORMAL) != EINVAL) > + FAIL ("posix_fadvise with negative length did not return EINVAL"); > + > + /* Check with some offset values larger than 32-bits. */ > + off_t offset = UINT32_MAX + 2048LL; > + if (posix_fadvise (temp_fd, 0, offset, POSIX_FADV_NORMAL) != 0) > + FAIL ("posix_fadvise failed (offset = 0, len = 4096) failed"); > + > + if (posix_fadvise (temp_fd, offset, 0, POSIX_FADV_NORMAL) != 0) > + FAIL ("posix_fadvise failed (offset = 4096, len = 0) failed"); > + > + return 0; > +} > diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h > index 6ca607e..628d27f 100644 > --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h > @@ -27,6 +27,13 @@ > # undef __ASSUME_SET_ROBUST_LIST > #endif > > +/* ARM fadvise64_64 reorganize the syscall arguments. */ > +#define __ASSUME_FADVISE64_64_6ARG 1 > + > /* Define this if your 32-bit syscall API requires 64-bit register > pairs to start with an even-number register. */ > #define __ASSUME_ALIGNED_REGISTER_PAIRS 1 > + > +/* ARM only has a syscall for fadvise64{_64} and it defined with a > + non-standard name. */ > +#define __NR_fadvise64_64 __NR_arm_fadvise64_64 > diff --git a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c > deleted file mode 100644 > index ffb3ecd..0000000 > --- a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c > +++ /dev/null > @@ -1,38 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) > -{ > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (arm_fadvise64_64, err, 6, fd, advise, > - __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), > - __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); > - if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return 0; > - return INTERNAL_SYSCALL_ERRNO (ret, err); > -} > -weak_alias (__posix_fadvise64_l64, posix_fadvise64); > diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c > deleted file mode 100644 > index 7c93a8f..0000000 > --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c > +++ /dev/null > @@ -1,37 +0,0 @@ > -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. > - > - 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, > - __LONG_LONG_PAIR (offset >> 31, offset), > - __LONG_LONG_PAIR (len >> 31, len), > - advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -} > diff --git a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S b/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S > deleted file mode 100644 > index 4b5d65c..0000000 > --- a/sysdeps/unix/sysv/linux/i386/posix_fadvise64.S > +++ /dev/null > @@ -1,92 +0,0 @@ > -/* Copyright (C) 1995-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <sysdep.h> > - > -#define EINVAL 22 > -#define ENOSYS 38 > -#define EOVERFLOW 75 > - > -#define SVRSP 16 /* saved register space */ > -#define PARMS 4+SVRSP /* space for 4 saved regs */ > -#define FD PARMS > -#define OFFLO FD+4 > -#define OFFHI OFFLO+4 > -#define LENLO OFFHI+4 > -#define LENHI LENLO+4 > -#define FLAGS LENHI+4 > - > - .text > -ENTRY (__posix_fadvise64_l64) > - > - /* Save registers. */ > - pushl %ebp > - cfi_adjust_cfa_offset (4) > - pushl %ebx > - cfi_adjust_cfa_offset (4) > - pushl %esi > - cfi_adjust_cfa_offset (4) > - pushl %edi > - cfi_adjust_cfa_offset (4) > - > - movl FD(%esp), %ebx > - cfi_rel_offset (ebx, 8) > - movl OFFLO(%esp), %ecx > - movl OFFHI(%esp), %edx > - movl LENLO(%esp), %esi > - cfi_rel_offset (esi, 4) > - movl LENHI(%esp), %edi > - cfi_rel_offset (edi, 0) > - movl FLAGS(%esp), %ebp > - cfi_rel_offset (ebp, 12) > - > - movl $SYS_ify(fadvise64_64), %eax > - ENTER_KERNEL > - > - /* Restore registers. */ > - popl %edi > - cfi_adjust_cfa_offset (-4) > - cfi_restore (edi) > - popl %esi > - cfi_adjust_cfa_offset (-4) > - cfi_restore (esi) > - popl %ebx > - cfi_adjust_cfa_offset (-4) > - cfi_restore (ebx) > - popl %ebp > - cfi_adjust_cfa_offset (-4) > - cfi_restore (ebp) > - > - /* The function returns zero, or the error number. So all we > - have to do is negate the value passed back from the kernel. */ > - /* If 0 > %eax > -4096 there was an error. */ > - negl %eax > - > - /* Successful; return the syscall's value. */ > - ret > - > -END (__posix_fadvise64_l64) > - > - .section .text.compat, "ax" > -ENTRY (__posix_fadvise64_l32) > - DO_CALL (fadvise64, 5) > - negl %eax > - ret > -PSEUDO_END_ERRVAL (__posix_fadvise64_l32) > - > -default_symbol_version (__posix_fadvise64_l64, posix_fadvise64, GLIBC_2.3.3) > -symbol_version (__posix_fadvise64_l32, posix_fadvise64, GLIBC_2.2) > diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c > deleted file mode 100644 > index 705c0c7..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c > +++ /dev/null > @@ -1,41 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 7, fd, 0, > - __LONG_LONG_PAIR (offset >> 31, offset), > - __LONG_LONG_PAIR (len >> 31, len), > - advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c > deleted file mode 100644 > index 0ded3c3..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c > +++ /dev/null > @@ -1,60 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) > -{ > -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 7, fd, 0, > - __LONG_LONG_PAIR ((long) (offset >> 32), > - (long) offset), > - __LONG_LONG_PAIR ((long) (len >> 32), > - (long) len), > - advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > - > -#include <shlib-compat.h> > - > -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > - > -int > -attribute_compat_text_section > -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) > -{ > - return __posix_fadvise64_l64 (fd, offset, len, advise); > -} > - > -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > -#else > -strong_alias (__posix_fadvise64_l64, posix_fadvise64); > -#endif > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c > deleted file mode 100644 > index 3b1ef7e..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c > +++ /dev/null > @@ -1,37 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c > deleted file mode 100644 > index e7ddc87..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c > +++ /dev/null > @@ -1,55 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) > -{ > -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > - > -#include <shlib-compat.h> > - > -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > - > -int > -attribute_compat_text_section > -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) > -{ > - return __posix_fadvise64_l64 (fd, offset, len, advise); > -} > - > -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > -#else > -strong_alias (__posix_fadvise64_l64, posix_fadvise64); > -#endif > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c > deleted file mode 100644 > index 86ff6ef..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c > +++ /dev/null > @@ -1,50 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#define posix_fadvise64 __no_posix_fadvise64 > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > -#undef posix_fadvise64 > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > - > -#include <shlib-compat.h> > - > -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > -strong_alias (posix_fadvise, __posix_fadvise64_l32); > -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > -strong_alias (posix_fadvise, __posix_fadvise64_l64); > -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > -#else > -weak_alias (posix_fadvise, posix_fadvise64); > -#endif > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c > index c9f72c4..3856fe0 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c > +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c > @@ -1 +1,27 @@ > -/* posix_fadvise64 is in posix_fadvise.c */ > +/* Copyright (C) 2003-2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#undef strong_alias > +#define strong_alias(a, b) > + > +#include <sysdeps/unix/sysv/linux/posix_fadvise64.c> > + > +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > +_strong_alias (__posix_fadvise64_l64, __posix_fadvise64_l32); > +compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > +versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > +#endif > diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c > index 093d707..869a642 100644 > --- a/sysdeps/unix/sysv/linux/posix_fadvise.c > +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c > @@ -22,27 +22,46 @@ > /* Advice the system about the expected behaviour of the application with > respect to the file associated with FD. */ > > +#ifndef __OFF_T_MATCHES_OFF64_T > + > +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument > + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. > + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. > + > + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit > + fadvise64_64 without the padding 0 after fd. > + > + s390 implements fadvice64_64 using a specific struct with arguments > + packed inside. This is the only implementation handled in arch-specific > + code. */ Are you sure it will be the only implementation forever, and comment will be valid too? > + > int > posix_fadvise (int fd, off_t offset, off_t len, int advise) > { > -#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64) > INTERNAL_SYSCALL_DECL (err); > # ifdef __NR_fadvise64 > - int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd, > - __LONG_LONG_PAIR (offset >> 31, offset), len, > - advise); > + int ret = INTERNAL_SYSCALL_CALL (fadvise64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + len, advise); > # else > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, > - __LONG_LONG_PAIR ((long) (offset >> 31), > - (long) offset), > - __LONG_LONG_PAIR ((long) (len >> 31), > - (long) len), > - advise); > +# ifdef __ASSUME_FADVISE64_64_6ARG > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + SYSCALL_LL (len)); > +# else > + > +# ifdef __ASSUME_FADVISE64_64_NO_ALIGN > +# undef __ALIGNMENT_ARG > +# define __ALIGNMENT_ARG > +# endif > + > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + SYSCALL_LL (len), advise); > +# endif > # endif > if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > return INTERNAL_SYSCALL_ERRNO (ret, err); > return 0; > -#else > - return ENOSYS; > -#endif > } > +#endif /* __OFF_T_MATCHES_OFF64_T */ > diff --git a/sysdeps/unix/sysv/linux/posix_fadvise64.c b/sysdeps/unix/sysv/linux/posix_fadvise64.c > index 6d10558..15e08b7 100644 > --- a/sysdeps/unix/sysv/linux/posix_fadvise64.c > +++ b/sysdeps/unix/sysv/linux/posix_fadvise64.c > @@ -17,32 +17,54 @@ > > #include <errno.h> > #include <fcntl.h> > -#include <sysdep.h> > +#include <shlib-compat.h> > > int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); > -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); > + > +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument > + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. > + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. > + > + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit > + fadvise64_64 without the padding 0 after fd. > + > + s390 implements fadvice64_64 using a specific struct with arguments > + packed inside. This is the only implementation handled in arch-specific > + code. */ > + > +#ifdef __ASSUME_FADVISE64_64_NO_ALIGN > +# undef __ALIGNMENT_ARG > +# define __ALIGNMENT_ARG > +#endif > + > +#ifndef __NR_fadvise64_64 > +# define __NR_fadvise64_64 __NR_fadvise64 > +#endif > > /* Advice the system about the expected behaviour of the application with > respect to the file associated with FD. */ > - Is it necessary to remove this line. You don't do so elsewhere... > int > __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) > { > INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, > - __LONG_LONG_PAIR ((long) (offset >> 32), > - (long) offset), > - __LONG_LONG_PAIR ((long) (len >> 32), > - (long) len), > - advise); > +#ifdef __ASSUME_FADVISE64_64_6ARG > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, > + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); > +#else > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL64 (offset), > + SYSCALL_LL64 (len), advise); > +#endif > if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) > return 0; > return INTERNAL_SYSCALL_ERRNO (ret, err); > } > > -#include <shlib-compat.h> > - > -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > +/* The type of the len argument was changed from size_t to off_t in > + POSIX.1-2003 TC1. */ > +#ifndef __OFF_T_MATCHES_OFF64_T > +# if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > +int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); > > int > attribute_compat_text_section > @@ -53,6 +75,10 @@ __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) > > versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > +# else > +weak_alias (__posix_fadvise64_l64, posix_fadvise64); > +# endif > #else > -strong_alias (__posix_fadvise64_l64, posix_fadvise64); > +weak_alias (__posix_fadvise64_l64, posix_fadvise64); > +strong_alias (__posix_fadvise64_l64, posix_fadvise); > #endif > diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > index 996535f..42a53f2 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h > @@ -46,4 +46,9 @@ > # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 > #endif > > +/* powerpc compat fadvise64_64 reorganize the syscall argument. */ > +#ifndef __powerpc64__ > +# define __ASSUME_FADVISE64_64_6ARG 1 > +#endif > + > #include_next <kernel-features.h> > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c > deleted file mode 100644 > index e846bf5..0000000 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c > +++ /dev/null > @@ -1,39 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 6, fd, 0, > - __LONG_LONG_PAIR (offset >> 31, offset), len, > - advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c > deleted file mode 100644 > index c26206f..0000000 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c > +++ /dev/null > @@ -1,55 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > - > -int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); > -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) > -{ > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advise, > - __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), > - __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); > - if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return 0; > - return INTERNAL_SYSCALL_ERRNO (ret, err); > -} > - > -#include <shlib-compat.h> > - > -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) > - > -int > -attribute_compat_text_section > -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) > -{ > - return __posix_fadvise64_l64 (fd, offset, len, advise); > -} > - > -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); > -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); > -#else > -strong_alias (__posix_fadvise64_l64, posix_fadvise64); > -#endif > diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h > index 9425e1c..ded0e43 100644 > --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h > @@ -23,4 +23,5 @@ > pairs to start with an even-number register. */ > #ifndef _LP64 > # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 > +# define __ASSUME_FADVISE64_64_NO_ALIGN 1 > #endif > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c > deleted file mode 100644 > index 137b591..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Copyright (C) 2003-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#define posix_fadvise64 __no_posix_fadvise64 > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep.h> > -#undef posix_fadvise64 > - > -/* Advice the system about the expected behaviour of the application with > - respect to the file associated with FD. */ > - > -int > -posix_fadvise (int fd, off_t offset, off_t len, int advise) > -{ > -#ifdef __NR_fadvise64 > - INTERNAL_SYSCALL_DECL (err); > - int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise); > - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > - return INTERNAL_SYSCALL_ERRNO (ret, err); > - return 0; > -#else > - return ENOSYS; > -#endif > -} > -weak_alias (posix_fadvise, posix_fadvise64) > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c b/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c > deleted file mode 100644 > index c9f72c4..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* posix_fadvise64 is in posix_fadvise.c */ > diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > index 8cccb1d..63657eb9 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > @@ -2,5 +2,4 @@ > > gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday > personality EXTRA personality Ei:i __personality personality > -posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64 > time - time:__vdso_time@LINUX_2.6 Ei:P time > -- > 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-22 15:08 ` Yury Norov @ 2016-08-23 19:29 ` Adhemerval Zanella 2016-08-23 20:00 ` Yury Norov 0 siblings, 1 reply; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-23 19:29 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha Thanks for the reviews, comments below. On 22/08/2016 12:08, Yury Norov wrote: >> diff --git a/posix/tst-posix_fadvise-common.c b/posix/tst-posix_fadvise-common.c >> new file mode 100644 >> index 0000000..6670835 >> --- /dev/null >> +++ b/posix/tst-posix_fadvise-common.c >> @@ -0,0 +1,113 @@ >> +/* Common posix_fadvise tests definitions. >> + Copyright (C) 2016 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 >> + <http://www.gnu.org/licenses/>. */ >> + >> +#include <fcntl.h> >> +#include <sys/types.h> >> +#include <sys/stat.h> >> +#include <unistd.h> >> + >> +static void do_prepare (void); >> +#define PREPARE(argc, argv) do_prepare () >> +static int do_test (void); >> +#define TEST_FUNCTION do_test () >> + >> +#include <test-skeleton.c> >> + >> +static char *temp_filename; >> +static int temp_fd; >> +static char fifoname[] = "/tmp/tst-posix_fadvise-fifo-XXXXXX"; >> +static int fifofd; >> + >> +static void >> +do_prepare (void) >> +{ >> + temp_fd = create_temp_file ("tst-posix_fadvise.", &temp_filename); >> + if (temp_fd == -1) >> + { >> + printf ("cannot create temporary file: %m\n"); >> + exit (1); >> + } >> + >> + if (mktemp (fifoname) == NULL) >> + { > > Trailing whitespace Ack, I will fix it. > >> + printf ("%s: cannot generate temp file name: %m\n", __func__); >> + exit (1); >> + } >> + add_temp_file (fifoname); >> + >> + if (mkfifo (fifoname, S_IWUSR | S_IRUSR) != 0) >> + { >> + printf ("%s: cannot create fifo: %m\n", __func__); >> + exit (1); >> + } >> + >> + fifofd = open (fifoname, O_RDONLY | O_NONBLOCK); >> + if (fifofd == -1) >> + { >> + printf ("%s: cannot open fifo: %m\n", __func__); >> + exit (1); >> + } >> +} >> + >> +#define FAIL(str) \ >> + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) >> + > > You don't fit into a single line anyway. Why don't you make it nicer? Right, I think the snippet below should be more readable. I will change it. #define FAIL(str) \ do { \ printf ("error: %s (line %d)\n", str, __LINE__); \ return 1; \ } while (0) >> +/* Effectivelly testing posix_fadvise is hard because side effects are not >> + observed without checking either performance or any kernel specific >> + supplied information. Also, the syscall is meant to be an advisory, >> + so kernel is free to use these information in which way it seems as >> + fit (even ignoring it). >> + > > Trailing whitespaces > Ack. >> diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c >> index 093d707..869a642 100644 >> --- a/sysdeps/unix/sysv/linux/posix_fadvise.c >> +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c >> @@ -22,27 +22,46 @@ >> /* Advice the system about the expected behaviour of the application with >> respect to the file associated with FD. */ >> >> +#ifndef __OFF_T_MATCHES_OFF64_T >> + >> +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument >> + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. >> + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. >> + >> + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit >> + fadvise64_64 without the padding 0 after fd. >> + >> + s390 implements fadvice64_64 using a specific struct with arguments >> + packed inside. This is the only implementation handled in arch-specific >> + code. */ > > Are you sure it will be the only implementation forever, and comment > will be valid too? The comment is meant to only describe supported architectures at the time the patch was created. Any other port that either deviates from current approach or uses a already describe one should update this description. >> diff --git a/sysdeps/unix/sysv/linux/posix_fadvise64.c b/sysdeps/unix/sysv/linux/posix_fadvise64.c >> index 6d10558..15e08b7 100644 >> --- a/sysdeps/unix/sysv/linux/posix_fadvise64.c >> +++ b/sysdeps/unix/sysv/linux/posix_fadvise64.c >> @@ -17,32 +17,54 @@ >> >> #include <errno.h> >> #include <fcntl.h> >> -#include <sysdep.h> >> +#include <shlib-compat.h> >> >> int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); >> -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); >> + >> +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument >> + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. >> + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. >> + >> + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit >> + fadvise64_64 without the padding 0 after fd. >> + >> + s390 implements fadvice64_64 using a specific struct with arguments >> + packed inside. This is the only implementation handled in arch-specific >> + code. */ >> + >> +#ifdef __ASSUME_FADVISE64_64_NO_ALIGN >> +# undef __ALIGNMENT_ARG >> +# define __ALIGNMENT_ARG >> +#endif >> + >> +#ifndef __NR_fadvise64_64 >> +# define __NR_fadvise64_64 __NR_fadvise64 >> +#endif >> >> /* Advice the system about the expected behaviour of the application with >> respect to the file associated with FD. */ >> - > > Is it necessary to remove this line. You don't do so elsewhere.. Ack, I will add it. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-23 19:29 ` Adhemerval Zanella @ 2016-08-23 20:00 ` Yury Norov 2016-08-24 14:29 ` Adhemerval Zanella 0 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-23 20:00 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Tue, Aug 23, 2016 at 04:29:24PM -0300, Adhemerval Zanella wrote: > >> +#ifndef __OFF_T_MATCHES_OFF64_T > >> + > >> +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument > >> + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. > >> + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. > >> + > >> + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit > >> + fadvise64_64 without the padding 0 after fd. > >> + > >> + s390 implements fadvice64_64 using a specific struct with arguments > >> + packed inside. This is the only implementation handled in arch-specific > >> + code. */ > > > > Are you sure it will be the only implementation forever, and comment > > will be valid too? > > The comment is meant to only describe supported architectures at the > time the patch was created. Any other port that either deviates > from current approach or uses a already describe one should update > this description. And I bet, one will forget to do so. That's why I don't like this sort of comments. It assumes that someone (you) will constantly monitor the patch traffic and check all the patches against this comment. This assumption is wrong of course. So the comment will come broken one day, and will confuse people instead of helping them. That's why people don't read comments. With or without it, I'll use grep to find all implementations of this function. You touch arm and tile code, and you explain what you do. But you don't touch s390, and you _can_ avoid mentioning it here. I see 3 options: - move the comment that s390 is the only exception now to the patch description (preferable for me). - add date to the comment. It's fun but doesn't work much. - generalize s390 too. To be serious, the benefit of removing all custom implementations of fadvise() belongs to your patch, not to the function fadvise() itself. And it should be underlined at right place. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-23 20:00 ` Yury Norov @ 2016-08-24 14:29 ` Adhemerval Zanella 0 siblings, 0 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-24 14:29 UTC (permalink / raw) To: libc-alpha On 23/08/2016 17:00, Yury Norov wrote: > On Tue, Aug 23, 2016 at 04:29:24PM -0300, Adhemerval Zanella wrote: >>>> +#ifndef __OFF_T_MATCHES_OFF64_T >>>> + >>>> +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument >>>> + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. >>>> + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. >>>> + >>>> + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit >>>> + fadvise64_64 without the padding 0 after fd. >>>> + >>>> + s390 implements fadvice64_64 using a specific struct with arguments >>>> + packed inside. This is the only implementation handled in arch-specific >>>> + code. */ >>> >>> Are you sure it will be the only implementation forever, and comment >>> will be valid too? >> >> The comment is meant to only describe supported architectures at the >> time the patch was created. Any other port that either deviates >> from current approach or uses a already describe one should update >> this description. > > And I bet, one will forget to do so. That's why I don't like this sort of > comments. It assumes that someone (you) will constantly monitor the patch > traffic and check all the patches against this comment. This assumption is > wrong of course. So the comment will come broken one day, and will confuse > people instead of helping them. That's why people don't read comments. > > With or without it, I'll use grep to find all implementations of this > function. As for any code comment, this is a best effort to describe the current situation for any potential reader. It is not meant to be code documentation, but rather an advice on why I decided to add the two constants (__ASSUME_FADVISE64_64_6ARG, __ASSUME_FADVISE64_64_NO_ALIGN), why I think s390 is an outlier that still should have a specific implementation, and why ARM and MIPS64 still have specific files. I still see them as valuable for someone that might check why the current code is organized in the way it is. > > You touch arm and tile code, and you explain what you do. But you > don't touch s390, and you _can_ avoid mentioning it here. I see 3 > options: > - move the comment that s390 is the only exception now to the patch > description (preferable for me). > - add date to the comment. It's fun but doesn't work much. > - generalize s390 too. I think commenting s390-32 outlier in patch description should be enough. I see little point of generalizing s390 now, however if a future port decide to use the same strategy I think it might worth it. > > To be serious, the benefit of removing all custom implementations of > fadvise() belongs to your patch, not to the function fadvise() itself. > And it should be underlined at right place. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella 2016-08-22 15:08 ` Yury Norov @ 2016-08-24 3:53 ` Yury Norov 2016-08-24 14:40 ` Adhemerval Zanella 2016-09-25 10:42 ` Yury Norov 2 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-24 3:53 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:49AM -0300, Adhemerval Zanella wrote: Ah, forgot to notice... [...] > diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h > index 6ca607e..628d27f 100644 > --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h > @@ -27,6 +27,13 @@ > # undef __ASSUME_SET_ROBUST_LIST > #endif > > +/* ARM fadvise64_64 reorganize the syscall arguments. */ > +#define __ASSUME_FADVISE64_64_6ARG 1 [...] > diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c > index 093d707..869a642 100644 > --- a/sysdeps/unix/sysv/linux/posix_fadvise.c > +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c > @@ -22,27 +22,46 @@ > /* Advice the system about the expected behaviour of the application with > respect to the file associated with FD. */ > > +#ifndef __OFF_T_MATCHES_OFF64_T > + > +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument > + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. > + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. > + > + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit > + fadvise64_64 without the padding 0 after fd. > + > + s390 implements fadvice64_64 using a specific struct with arguments > + packed inside. This is the only implementation handled in arch-specific > + code. */ > + > int > posix_fadvise (int fd, off_t offset, off_t len, int advise) > { > -#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64) > INTERNAL_SYSCALL_DECL (err); > # ifdef __NR_fadvise64 > - int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd, > - __LONG_LONG_PAIR (offset >> 31, offset), len, > - advise); > + int ret = INTERNAL_SYSCALL_CALL (fadvise64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + len, advise); > # else > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, > - __LONG_LONG_PAIR ((long) (offset >> 31), > - (long) offset), > - __LONG_LONG_PAIR ((long) (len >> 31), > - (long) len), > - advise); > +# ifdef __ASSUME_FADVISE64_64_6ARG You should define __ASSUME_FADVISE64_64_6ARG for all ports, and use #if instead of #ifdef. For all new options you introduce. This is coding style rule. :( ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-24 3:53 ` Yury Norov @ 2016-08-24 14:40 ` Adhemerval Zanella 0 siblings, 0 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-24 14:40 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha On 24/08/2016 00:52, Yury Norov wrote: > On Fri, Aug 19, 2016 at 11:41:49AM -0300, Adhemerval Zanella wrote: > Ah, forgot to notice... > > [...] > >> diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h >> index 6ca607e..628d27f 100644 >> --- a/sysdeps/unix/sysv/linux/arm/kernel-features.h >> +++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h >> @@ -27,6 +27,13 @@ >> # undef __ASSUME_SET_ROBUST_LIST >> #endif >> >> +/* ARM fadvise64_64 reorganize the syscall arguments. */ >> +#define __ASSUME_FADVISE64_64_6ARG 1 > > [...] > >> diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c >> index 093d707..869a642 100644 >> --- a/sysdeps/unix/sysv/linux/posix_fadvise.c >> +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c >> @@ -22,27 +22,46 @@ >> /* Advice the system about the expected behaviour of the application with >> respect to the file associated with FD. */ >> >> +#ifndef __OFF_T_MATCHES_OFF64_T >> + >> +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument >> + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. >> + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. >> + >> + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit >> + fadvise64_64 without the padding 0 after fd. >> + >> + s390 implements fadvice64_64 using a specific struct with arguments >> + packed inside. This is the only implementation handled in arch-specific >> + code. */ >> + >> int >> posix_fadvise (int fd, off_t offset, off_t len, int advise) >> { >> -#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64) >> INTERNAL_SYSCALL_DECL (err); >> # ifdef __NR_fadvise64 >> - int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd, >> - __LONG_LONG_PAIR (offset >> 31, offset), len, >> - advise); >> + int ret = INTERNAL_SYSCALL_CALL (fadvise64, err, fd, >> + __ALIGNMENT_ARG SYSCALL_LL (offset), >> + len, advise); >> # else >> - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, >> - __LONG_LONG_PAIR ((long) (offset >> 31), >> - (long) offset), >> - __LONG_LONG_PAIR ((long) (len >> 31), >> - (long) len), >> - advise); >> +# ifdef __ASSUME_FADVISE64_64_6ARG > > You should define __ASSUME_FADVISE64_64_6ARG for all ports, > and use #if instead of #ifdef. > > For all new options you introduce. This is coding style rule. :( > My understanding is this is not the general idea of kernel-features.h current organization. It is included several times in object build and the idea is to have linux default behaviour in default Linux file with ports undefining non-supported features. There were some cleanup recently in this directions by increasing the minimum kernel version supported. So I the way to follow kernel-features conventions is to invert current logic and add: diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 1d3b554..362c2ef 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -147,3 +147,6 @@ separate syscalls were only added later. */ #define __ASSUME_SENDMSG_SYSCALL 1 #define __ASSUME_RECVMSG_SYSCALL 1 + +#define __ASSUME_FADVISE64_64_DEFAULT_ARG 1 +#define __ASSUME_FADVISE64_64_ALIGN 1 And set fallocate.c to act as: # ifdef __ASSUME_FADVISE64_64_DEFAULT_ARG # ifndef __ASSUME_FADVISE64_64_ALIGN # undef __ALIGNMENT_ARG # define __ALIGNMENT_ARG # endif int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, __ALIGNMENT_ARG SYSCALL_LL (offset), SYSCALL_LL (len), advise); # else int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, __ALIGNMENT_ARG SYSCALL_LL (offset), SYSCALL_LL (len)); # endif I would strongly prefer to *not* have to define two new define on every kernel-features.h and even create extra files for ports that do not require such header (as for aarch64). ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella 2016-08-22 15:08 ` Yury Norov 2016-08-24 3:53 ` Yury Norov @ 2016-09-25 10:42 ` Yury Norov 2016-09-26 19:44 ` Adhemerval Zanella 2 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-09-25 10:42 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:49AM -0300, Adhemerval Zanella wrote: > diff --git a/sysdeps/unix/sysv/linux/posix_fadvise.c b/sysdeps/unix/sysv/linux/posix_fadvise.c > index 093d707..869a642 100644 > --- a/sysdeps/unix/sysv/linux/posix_fadvise.c > +++ b/sysdeps/unix/sysv/linux/posix_fadvise.c > @@ -22,27 +22,46 @@ > /* Advice the system about the expected behaviour of the application with > respect to the file associated with FD. */ > > +#ifndef __OFF_T_MATCHES_OFF64_T > + > +/* Both arm and powerpc implements fadvise64_64 with last 'advise' argument > + just after 'fd' to avoid the requirement of implementing 7-arg syscalls. > + ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64. > + > + tile requires __ASSUME_ALIGNED_REGISTER_PAIRS but implements the 32-bit > + fadvise64_64 without the padding 0 after fd. > + > + s390 implements fadvice64_64 using a specific struct with arguments > + packed inside. This is the only implementation handled in arch-specific > + code. */ > + > int > posix_fadvise (int fd, off_t offset, off_t len, int advise) > { > -#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64) > INTERNAL_SYSCALL_DECL (err); > # ifdef __NR_fadvise64 > - int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd, > - __LONG_LONG_PAIR (offset >> 31, offset), len, > - advise); > + int ret = INTERNAL_SYSCALL_CALL (fadvise64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + len, advise); > # else > - int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, > - __LONG_LONG_PAIR ((long) (offset >> 31), > - (long) offset), > - __LONG_LONG_PAIR ((long) (len >> 31), > - (long) len), > - advise); > +# ifdef __ASSUME_FADVISE64_64_6ARG > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, advise, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + SYSCALL_LL (len)); > +# else > + > +# ifdef __ASSUME_FADVISE64_64_NO_ALIGN > +# undef __ALIGNMENT_ARG > +# define __ALIGNMENT_ARG > +# endif > + > + int ret = INTERNAL_SYSCALL_CALL (fadvise64_64, err, fd, > + __ALIGNMENT_ARG SYSCALL_LL (offset), > + SYSCALL_LL (len), advise); > +# endif > # endif > if (INTERNAL_SYSCALL_ERROR_P (ret, err)) > return INTERNAL_SYSCALL_ERRNO (ret, err); > return 0; > -#else > - return ENOSYS; > -#endif > } > +#endif /* __OFF_T_MATCHES_OFF64_T */ [...] > diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h > index 9425e1c..ded0e43 100644 > --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h > +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h > @@ -23,4 +23,5 @@ > pairs to start with an even-number register. */ > #ifndef _LP64 > # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 > +# define __ASSUME_FADVISE64_64_NO_ALIGN 1 > #endif Hi Adhemerval, In discussion to the readahead() consolidation patch [1] you recommend not to add new __ASSUME_ options, and have exceptional implementation for tile. But in this patch for posix_fadvise() consolidation you add new __ASSUME_FADVISE64_64_NO_ALIGN. This cases are very similar, so I think, to be consistent, you'd also rework posix_fadvise() too. [1] https://sourceware.org/ml/libc-alpha/2016-09/msg00494.html Yury. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] Consolidate posix_fadvise implementations 2016-09-25 10:42 ` Yury Norov @ 2016-09-26 19:44 ` Adhemerval Zanella 0 siblings, 0 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-09-26 19:44 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha On 25/09/2016 03:42, Yury Norov wrote: >> diff --git a/sysdeps/unix/sysv/linux/tile/kernel-features.h b/sysdeps/unix/sysv/linux/tile/kernel-features.h >> index 9425e1c..ded0e43 100644 >> --- a/sysdeps/unix/sysv/linux/tile/kernel-features.h >> +++ b/sysdeps/unix/sysv/linux/tile/kernel-features.h >> @@ -23,4 +23,5 @@ >> pairs to start with an even-number register. */ >> #ifndef _LP64 >> # define __ASSUME_ALIGNED_REGISTER_PAIRS 1 >> +# define __ASSUME_FADVISE64_64_NO_ALIGN 1 >> #endif > > Hi Adhemerval, > > In discussion to the readahead() consolidation patch [1] you recommend > not to add new __ASSUME_ options, and have exceptional implementation > for tile. But in this patch for posix_fadvise() consolidation you add > new __ASSUME_FADVISE64_64_NO_ALIGN. This cases are very similar, so I > think, to be consistent, you'd also rework posix_fadvise() too. > > [1] https://sourceware.org/ml/libc-alpha/2016-09/msg00494.html > > Yury. > There is no direct rule on where to add of not an __ASSUME define, my understanding it is more a rule of thumb depending of the case. But you do have a point and thinking twice current glibc internal header organization does not allow to redefine __ALIGNMENT flags easily (sysdep.h headers are included many time without guards). So I think __ASSUME is indeed a better alternative, sorry for the noise. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 2/4] Consolidate fallocate{64} implementations 2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella 2016-08-19 14:42 ` [PATCH 3/4] Consolidate posix_fallocate{64} implementations Adhemerval Zanella 2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella @ 2016-08-19 14:42 ` Adhemerval Zanella 2016-08-22 15:14 ` Yury Norov 2016-08-19 14:42 ` [PATCH 1/4] Add INTERNAL_SYSCALL_CALL Adhemerval Zanella 2016-08-22 14:31 ` [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Yury Norov 4 siblings, 1 reply; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-19 14:42 UTC (permalink / raw) To: libc-alpha This patch consolidates all the fallocate{64} implementation for Linux in only one (sysdeps/unix/sysv/linux/fallocate{64}.c). It also removes the syscall from the auto-generation using assembly macros. The new macro SYSCALL_LL{64} is used to handle the offset argument. Checked on x86_64, x32, i386, aarch64, and ppc64le. * sysdeps/unix/sysv/linux/Makefile (test): Add tst-fallocate and tst-fallocate64. * sysdeps/unix/sysv/linux/tst-fallocate.c: New file. * sysdeps/unix/sysv/linux/tst-fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/tst-fallocate-common.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c: Remove file. * sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (fallocate): Remove syscall auto-generation. * sysdeps/unix/sysv/linux/fallocate.c (fallocate): Use SYSCALL_LL macro on offset argument. * sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use SYSCALL_LL64 on offset argument. --- ChangeLog | 18 +++++ sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/fallocate.c | 11 +-- sysdeps/unix/sysv/linux/fallocate64.c | 14 ++-- .../unix/sysv/linux/mips/mips64/n32/fallocate.c | 33 -------- .../unix/sysv/linux/mips/mips64/n32/fallocate64.c | 33 -------- .../unix/sysv/linux/mips/mips64/n64/fallocate.c | 1 - .../unix/sysv/linux/mips/mips64/n64/fallocate64.c | 1 - sysdeps/unix/sysv/linux/tst-fallocate-common.c | 88 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/tst-fallocate.c | 25 ++++++ sysdeps/unix/sysv/linux/tst-fallocate64.c | 54 +++++++++++++ sysdeps/unix/sysv/linux/wordsize-64/fallocate.c | 34 --------- sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c | 1 - sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 1 - 14 files changed, 195 insertions(+), 122 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate-common.c create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate.c create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index f0b052d..4ece07c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -42,7 +42,8 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ bits/socket_type.h bits/syscall.h bits/sysctl.h \ bits/mman-linux.h -tests += tst-clone tst-clone2 tst-fanotify tst-personality +tests += tst-clone tst-clone2 tst-fanotify tst-personality tst-fallocate \ + tst-fallocate64 # Generate the list of SYS_* macros for the system calls (__NR_* macros). diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c index 6a58a5f..a38e9a6 100644 --- a/sysdeps/unix/sysv/linux/fallocate.c +++ b/sysdeps/unix/sysv/linux/fallocate.c @@ -19,17 +19,12 @@ #include <fcntl.h> #include <sysdep-cancel.h> - +#ifndef __OFF_T_MATCHES_OFF64_T /* Reserve storage for the data of the file associated with FD. */ int fallocate (int fd, int mode, __off_t offset, __off_t len) { -#ifdef __NR_fallocate return SYSCALL_CANCEL (fallocate, fd, mode, - __LONG_LONG_PAIR (offset >> 31, offset), - __LONG_LONG_PAIR (len >> 31, len)); -#else - __set_errno (ENOSYS); - return -1; -#endif + SYSCALL_LL (offset), SYSCALL_LL (len)); } +#endif diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c index 8e76d6f..d466095 100644 --- a/sysdeps/unix/sysv/linux/fallocate64.c +++ b/sysdeps/unix/sysv/linux/fallocate64.c @@ -24,14 +24,10 @@ int fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) { -#ifdef __NR_fallocate return SYSCALL_CANCEL (fallocate, fd, mode, - __LONG_LONG_PAIR ((long int) (offset >> 32), - (long int) offset), - __LONG_LONG_PAIR ((long int) (len >> 32), - (long int) len)); -#else - __set_errno (ENOSYS); - return -1; -#endif + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); } + +#ifdef __OFF_T_MATCHES_OFF64_T +weak_alias (fallocate64, fallocate) +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c deleted file mode 100644 index 4e432f4..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep-cancel.h> - - -/* Reserve storage for the data of the file associated with FD. */ -int -fallocate (int fd, int mode, __off_t offset, __off_t len) -{ -#ifdef __NR_fallocate - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); -#else - __set_errno (ENOSYS); - return -1; -#endif -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c deleted file mode 100644 index 95c9eab..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep-cancel.h> - - -/* Reserve storage for the data of the file associated with FD. */ -int -fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) -{ -#ifdef __NR_fallocate - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); -#else - __set_errno (ENOSYS); - return -1; -#endif -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c deleted file mode 100644 index d3b7218..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/wordsize-64/fallocate.c> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c deleted file mode 100644 index fb2b681..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c +++ /dev/null @@ -1 +0,0 @@ -/* fallocate64 is in fallocate.c */ diff --git a/sysdeps/unix/sysv/linux/tst-fallocate-common.c b/sysdeps/unix/sysv/linux/tst-fallocate-common.c new file mode 100644 index 0000000..cceaa1d --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-fallocate-common.c @@ -0,0 +1,88 @@ +/* Basic fallocate test (no specific flags is checked). + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +static void do_prepare (void); +#define PREPARE(argc, argv) do_prepare () +static int do_test (void); +#define TEST_FUNCTION do_test () + +#define TIMEOUT 20 /* sec. */ + +#include <test-skeleton.c> + +static char *temp_filename; +static int temp_fd; + +void +do_prepare (void) +{ + temp_fd = create_temp_file ("tst-fallocate.", &temp_filename); + if (temp_fd == -1) + { + printf ("cannot create temporary file: %m\n"); + exit (1); + } +} + +#define FAIL(str) \ + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) + +static int +do_test_with_offset (off_t offset) +{ + int ret; + struct stat finfo; + char bwrite[1024] = { 0xf0 }; + char bread[1024]; + + /* It tries to fallocate 1024 bytes from 'offset' and then write 1024 bytes. + After both operation rewind the file descriptor and read 1024 bytes + and check if both buffer have the same contents. */ + ret = fallocate (temp_fd, 0, offset, 1024); + if (ret == -1) + FAIL ("fallocate failed"); + + ret = fstat (temp_fd, &finfo); + if (ret == -1) + FAIL ("fstat failed"); + + if (finfo.st_size < (offset + 1024)) + FAIL ("size of first fallocate less than expected (1024)"); + + if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1) + FAIL ("fseek (0, SEEK_SET) failed"); + + if (write (temp_fd, bwrite, 1024) != 1024) + FAIL ("fail trying to write 1024 bytes"); + + if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1) + FAIL ("fseek (0, SEEK_SET) failed"); + + if (read (temp_fd, bread, 1024) != 1024) + FAIL ("fail trying to read 1024 bytes"); + + if (memcmp (bwrite, bread, 1024) != 0) + FAIL ("buffer writted different than buffer readed"); + + return 0; +} diff --git a/sysdeps/unix/sysv/linux/tst-fallocate.c b/sysdeps/unix/sysv/linux/tst-fallocate.c new file mode 100644 index 0000000..ec3867c --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-fallocate.c @@ -0,0 +1,25 @@ +/* Basic fallocate test (no specific flags is checked). + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#include "tst-fallocate-common.c" + +static int +do_test (void) +{ + return do_test_with_offset (0); +} diff --git a/sysdeps/unix/sysv/linux/tst-fallocate64.c b/sysdeps/unix/sysv/linux/tst-fallocate64.c new file mode 100644 index 0000000..78bcb8c --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-fallocate64.c @@ -0,0 +1,54 @@ +/* Basic fallocate64 test (no specific flags is checked). + Copyright (C) 2016 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 + <http://www.gnu.org/licenses/>. */ + +#define _FILE_OFFSET_BITS 64 +#include "tst-fallocate-common.c" + +static int +do_test (void) +{ + ssize_t ret; + + ret = do_test_with_offset (0); + if (ret == -1) + return 1; + + off_t base_offset = UINT32_MAX + 2048LL; + ret = do_test_with_offset (base_offset); + if (ret == -1) + return 1; + + struct stat st; + if (fstat (temp_fd, &st) == -1) + { + printf ("error: fstat on temporary file failed: %m"); + return 1; + } + + /* The file size should >= base_offset plus bytes written. */ + off_t expected_value = base_offset + ret; + if (st.st_size < expected_value) + { + printf ("error: file size less than expected (%jd > %jd)\n", + (intmax_t) expected_value, (intmax_t) st.st_size); + return 1; + } + + return 0; +} + diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c deleted file mode 100644 index c1dd0b4..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2007-2016 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <fcntl.h> -#include <sysdep-cancel.h> - - -/* Reserve storage for the data of the file associated with FD. */ -int -fallocate (int fd, int mode, __off_t offset, __off_t len) -{ -#ifdef __NR_fallocate - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); -#else - __set_errno (ENOSYS); - return -1; -#endif -} -strong_alias (fallocate, fallocate64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c deleted file mode 100644 index df33112..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c +++ /dev/null @@ -1 +0,0 @@ -/* fallocate64 is in posix_fallocate.c */ diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list index dce4302..8cccb1d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list @@ -1,6 +1,5 @@ # File name Caller Syscall name # args Strong name Weak names -fallocate - fallocate Ci:iiii fallocate fallocate64 gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday personality EXTRA personality Ei:i __personality personality posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64 -- 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/4] Consolidate fallocate{64} implementations 2016-08-19 14:42 ` [PATCH 2/4] Consolidate fallocate{64} implementations Adhemerval Zanella @ 2016-08-22 15:14 ` Yury Norov 2016-08-23 19:21 ` Adhemerval Zanella 0 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-22 15:14 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:47AM -0300, Adhemerval Zanella wrote: > This patch consolidates all the fallocate{64} implementation for Linux > in only one (sysdeps/unix/sysv/linux/fallocate{64}.c). It also removes the > syscall from the auto-generation using assembly macros. > > The new macro SYSCALL_LL{64} is used to handle the offset argument. > > Checked on x86_64, x32, i386, aarch64, and ppc64le. > > * sysdeps/unix/sysv/linux/Makefile (test): Add tst-fallocate and > tst-fallocate64. > * sysdeps/unix/sysv/linux/tst-fallocate.c: New file. > * sysdeps/unix/sysv/linux/tst-fallocate64.c: Likewise. > * sysdeps/unix/sysv/linux/tst-fallocate-common.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c: Remove file. > * sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c: Likewise. > * sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c: Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise. > * sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c: Likewise. > * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (fallocate): Remove > syscall auto-generation. > * sysdeps/unix/sysv/linux/fallocate.c (fallocate): Use SYSCALL_LL > macro on offset argument. > * sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use > SYSCALL_LL64 on offset argument. > --- > ChangeLog | 18 +++++ > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/fallocate.c | 11 +-- > sysdeps/unix/sysv/linux/fallocate64.c | 14 ++-- > .../unix/sysv/linux/mips/mips64/n32/fallocate.c | 33 -------- > .../unix/sysv/linux/mips/mips64/n32/fallocate64.c | 33 -------- > .../unix/sysv/linux/mips/mips64/n64/fallocate.c | 1 - > .../unix/sysv/linux/mips/mips64/n64/fallocate64.c | 1 - > sysdeps/unix/sysv/linux/tst-fallocate-common.c | 88 ++++++++++++++++++++++ > sysdeps/unix/sysv/linux/tst-fallocate.c | 25 ++++++ > sysdeps/unix/sysv/linux/tst-fallocate64.c | 54 +++++++++++++ > sysdeps/unix/sysv/linux/wordsize-64/fallocate.c | 34 --------- > sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c | 1 - > sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 1 - > 14 files changed, 195 insertions(+), 122 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate-common.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index f0b052d..4ece07c 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -42,7 +42,8 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ > bits/socket_type.h bits/syscall.h bits/sysctl.h \ > bits/mman-linux.h > > -tests += tst-clone tst-clone2 tst-fanotify tst-personality > +tests += tst-clone tst-clone2 tst-fanotify tst-personality tst-fallocate \ > + tst-fallocate64 > > # Generate the list of SYS_* macros for the system calls (__NR_* macros). > > diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c > index 6a58a5f..a38e9a6 100644 > --- a/sysdeps/unix/sysv/linux/fallocate.c > +++ b/sysdeps/unix/sysv/linux/fallocate.c > @@ -19,17 +19,12 @@ > #include <fcntl.h> > #include <sysdep-cancel.h> > > - > +#ifndef __OFF_T_MATCHES_OFF64_T > /* Reserve storage for the data of the file associated with FD. */ > int > fallocate (int fd, int mode, __off_t offset, __off_t len) > { > -#ifdef __NR_fallocate > return SYSCALL_CANCEL (fallocate, fd, mode, > - __LONG_LONG_PAIR (offset >> 31, offset), > - __LONG_LONG_PAIR (len >> 31, len)); > -#else > - __set_errno (ENOSYS); > - return -1; > -#endif > + SYSCALL_LL (offset), SYSCALL_LL (len)); > } > +#endif > diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c > index 8e76d6f..d466095 100644 > --- a/sysdeps/unix/sysv/linux/fallocate64.c > +++ b/sysdeps/unix/sysv/linux/fallocate64.c > @@ -24,14 +24,10 @@ > int > fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) > { > -#ifdef __NR_fallocate > return SYSCALL_CANCEL (fallocate, fd, mode, > - __LONG_LONG_PAIR ((long int) (offset >> 32), > - (long int) offset), > - __LONG_LONG_PAIR ((long int) (len >> 32), > - (long int) len)); > -#else > - __set_errno (ENOSYS); > - return -1; > -#endif > + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); > } > + > +#ifdef __OFF_T_MATCHES_OFF64_T > +weak_alias (fallocate64, fallocate) > +#endif > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c > deleted file mode 100644 > index 4e432f4..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep-cancel.h> > - > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -fallocate (int fd, int mode, __off_t offset, __off_t len) > -{ > -#ifdef __NR_fallocate > - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); > -#else > - __set_errno (ENOSYS); > - return -1; > -#endif > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c > deleted file mode 100644 > index 95c9eab..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c > +++ /dev/null > @@ -1,33 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep-cancel.h> > - > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) > -{ > -#ifdef __NR_fallocate > - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); > -#else > - __set_errno (ENOSYS); > - return -1; > -#endif > -} > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c > deleted file mode 100644 > index d3b7218..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include <sysdeps/unix/sysv/linux/wordsize-64/fallocate.c> > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c > deleted file mode 100644 > index fb2b681..0000000 > --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* fallocate64 is in fallocate.c */ > diff --git a/sysdeps/unix/sysv/linux/tst-fallocate-common.c b/sysdeps/unix/sysv/linux/tst-fallocate-common.c > new file mode 100644 > index 0000000..cceaa1d > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/tst-fallocate-common.c > @@ -0,0 +1,88 @@ > +/* Basic fallocate test (no specific flags is checked). > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#include <fcntl.h> > +#include <sys/types.h> > +#include <sys/stat.h> > +#include <unistd.h> > + > +static void do_prepare (void); > +#define PREPARE(argc, argv) do_prepare () Trailing whitespace. > +static int do_test (void); > +#define TEST_FUNCTION do_test () > + > +#define TIMEOUT 20 /* sec. */ > + > +#include <test-skeleton.c> > + > +static char *temp_filename; > +static int temp_fd; > + > +void > +do_prepare (void) > +{ > + temp_fd = create_temp_file ("tst-fallocate.", &temp_filename); > + if (temp_fd == -1) > + { > + printf ("cannot create temporary file: %m\n"); > + exit (1); > + } > +} > + > +#define FAIL(str) \ > + do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0) > + > +static int > +do_test_with_offset (off_t offset) > +{ > + int ret; > + struct stat finfo; > + char bwrite[1024] = { 0xf0 }; > + char bread[1024]; > + > + /* It tries to fallocate 1024 bytes from 'offset' and then write 1024 bytes. > + After both operation rewind the file descriptor and read 1024 bytes > + and check if both buffer have the same contents. */ > + ret = fallocate (temp_fd, 0, offset, 1024); > + if (ret == -1) > + FAIL ("fallocate failed"); > + > + ret = fstat (temp_fd, &finfo); > + if (ret == -1) > + FAIL ("fstat failed"); > + > + if (finfo.st_size < (offset + 1024)) > + FAIL ("size of first fallocate less than expected (1024)"); > + > + if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1) > + FAIL ("fseek (0, SEEK_SET) failed"); > + > + if (write (temp_fd, bwrite, 1024) != 1024) > + FAIL ("fail trying to write 1024 bytes"); > + > + if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1) > + FAIL ("fseek (0, SEEK_SET) failed"); > + > + if (read (temp_fd, bread, 1024) != 1024) > + FAIL ("fail trying to read 1024 bytes"); > + > + if (memcmp (bwrite, bread, 1024) != 0) > + FAIL ("buffer writted different than buffer readed"); > + > + return 0; > +} > diff --git a/sysdeps/unix/sysv/linux/tst-fallocate.c b/sysdeps/unix/sysv/linux/tst-fallocate.c > new file mode 100644 > index 0000000..ec3867c > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/tst-fallocate.c > @@ -0,0 +1,25 @@ > +/* Basic fallocate test (no specific flags is checked). > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#include "tst-fallocate-common.c" > + > +static int > +do_test (void) > +{ > + return do_test_with_offset (0); > +} > diff --git a/sysdeps/unix/sysv/linux/tst-fallocate64.c b/sysdeps/unix/sysv/linux/tst-fallocate64.c > new file mode 100644 > index 0000000..78bcb8c > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/tst-fallocate64.c > @@ -0,0 +1,54 @@ > +/* Basic fallocate64 test (no specific flags is checked). > + Copyright (C) 2016 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 > + <http://www.gnu.org/licenses/>. */ > + > +#define _FILE_OFFSET_BITS 64 > +#include "tst-fallocate-common.c" > + > +static int > +do_test (void) > +{ > + ssize_t ret; > + > + ret = do_test_with_offset (0); > + if (ret == -1) > + return 1; > + > + off_t base_offset = UINT32_MAX + 2048LL; > + ret = do_test_with_offset (base_offset); > + if (ret == -1) > + return 1; > + > + struct stat st; > + if (fstat (temp_fd, &st) == -1) > + { > + printf ("error: fstat on temporary file failed: %m"); > + return 1; > + } > + > + /* The file size should >= base_offset plus bytes written. */ > + off_t expected_value = base_offset + ret; > + if (st.st_size < expected_value) > + { > + printf ("error: file size less than expected (%jd > %jd)\n", > + (intmax_t) expected_value, (intmax_t) st.st_size); > + return 1; > + } > + > + return 0; > +} > + > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c > deleted file mode 100644 > index c1dd0b4..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c > +++ /dev/null > @@ -1,34 +0,0 @@ > -/* Copyright (C) 2007-2016 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 > - <http://www.gnu.org/licenses/>. */ > - > -#include <errno.h> > -#include <fcntl.h> > -#include <sysdep-cancel.h> > - > - > -/* Reserve storage for the data of the file associated with FD. */ > -int > -fallocate (int fd, int mode, __off_t offset, __off_t len) > -{ > -#ifdef __NR_fallocate > - return SYSCALL_CANCEL (fallocate, fd, mode, offset, len); > -#else > - __set_errno (ENOSYS); > - return -1; > -#endif > -} > -strong_alias (fallocate, fallocate64) > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c > deleted file mode 100644 > index df33112..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* fallocate64 is in posix_fallocate.c */ > diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > index dce4302..8cccb1d 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list > @@ -1,6 +1,5 @@ > # File name Caller Syscall name # args Strong name Weak names > > -fallocate - fallocate Ci:iiii fallocate fallocate64 > gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday > personality EXTRA personality Ei:i __personality personality > posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64 > -- > 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/4] Consolidate fallocate{64} implementations 2016-08-22 15:14 ` Yury Norov @ 2016-08-23 19:21 ` Adhemerval Zanella 0 siblings, 0 replies; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-23 19:21 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha Thanks for the review, comments below. >> diff --git a/sysdeps/unix/sysv/linux/tst-fallocate-common.c b/sysdeps/unix/sysv/linux/tst-fallocate-common.c >> new file mode 100644 >> index 0000000..cceaa1d >> --- /dev/null >> +++ b/sysdeps/unix/sysv/linux/tst-fallocate-common.c >> @@ -0,0 +1,88 @@ >> +/* Basic fallocate test (no specific flags is checked). >> + Copyright (C) 2016 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 >> + <http://www.gnu.org/licenses/>. */ >> + >> +#include <fcntl.h> >> +#include <sys/types.h> >> +#include <sys/stat.h> >> +#include <unistd.h> >> + >> +static void do_prepare (void); >> +#define PREPARE(argc, argv) do_prepare () > > Trailing whitespace. > Ack, I will fix it. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/4] Add INTERNAL_SYSCALL_CALL 2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella ` (2 preceding siblings ...) 2016-08-19 14:42 ` [PATCH 2/4] Consolidate fallocate{64} implementations Adhemerval Zanella @ 2016-08-19 14:42 ` Adhemerval Zanella 2016-08-22 15:28 ` Yury Norov 2016-08-22 14:31 ` [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Yury Norov 4 siblings, 1 reply; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-19 14:42 UTC (permalink / raw) To: libc-alpha This patch adds two new macros for internal and inline syscall to use within GLIBC: INTERNAL_SYSCALL_CALL and INLINE_SYSCALL_CALL. They are similar to the old INTERNAL_SYSCALL and INLINE_SYSCALL with the difference the new macros accept a variable argument call and do not require to pass the expected argument size. The advantage is it is possible to use variable argument macros like SYSCALL_LL{64} without the need to also handle the argument size. So for an ABI where SYSCALL_LL might split the argument in high and low parts, instead of: INTERNAL_SYSCALL_DECL (err); #if ... INTERNAL_SYSCALL (syscall, err, 2, SYSCALL_LL (len)); #else INTERNAL_SYSCALL (syscall, err, 1, SYSCALL_LL (len)); #endif It will be just: INTERNAL_SYSCALL_CALL (syscall, err, SYSCALL_LL (len)); The INLINE_SYSCALL_CALL follows the same semanthic regarding the argument and is similar to INLINE_SYSCALL regarding setting errno. * sysdeps/unix/sysdep.h (__INTERNAL_SYSCALL0): New macro. (__INTERNAL_SYSCALL1): Likewise. (__INTERNAL_SYSCALL2): Likewise. (__INTERNAL_SYSCALL3): Likewise. (__INTERNAL_SYSCALL4): Likewise. (__INTERNAL_SYSCALL5): Likewise. (__INTERNAL_SYSCALL6): Likewise. (__INTERNAL_SYSCALL7): Likewise. (__INTERNAL_SYSCALL_NARGS_X): Likewise. (__INTERNAL_SYSCALL_NARGS): Likewise. (__INTERNAL_SYSCALL_CONCAT_X): Likewise. (__INTERNAL_SYSCALL_CONCAT): Likewise. (__INTERNAL_SYSCALL_DISP): Likewise. (INTERNAL_SYSCALL_CALL): Likewise. (__SYSCALL_CALL): Rename to INLINE_SYSCALL_CALL. (SYSCALL_CANCEL): Replace __SYSCALL_CALL with INLINE_SYSCALL_CALL. --- sysdeps/unix/sysdep.h | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h index 94a2ce0..2253603 100644 --- a/sysdeps/unix/sysdep.h +++ b/sysdeps/unix/sysdep.h @@ -24,6 +24,37 @@ #define SYSCALL__(name, args) PSEUDO (__##name, name, args) #define SYSCALL(name, args) PSEUDO (name, name, args) +#define __INTERNAL_SYSCALL0(name, err) \ + INTERNAL_SYSCALL (name, err, 0) +#define __INTERNAL_SYSCALL1(name, err, a1) \ + INTERNAL_SYSCALL (name, err, 1, a1) +#define __INTERNAL_SYSCALL2(name, err, a1, a2) \ + INTERNAL_SYSCALL (name, err, 2, a1, a2) +#define __INTERNAL_SYSCALL3(name, err, a1, a2, a3) \ + INTERNAL_SYSCALL (name, err, 3, a1, a2, a3) +#define __INTERNAL_SYSCALL4(name, err, a1, a2, a3, a4) \ + INTERNAL_SYSCALL (name, err, 4, a1, a2, a3, a4) +#define __INTERNAL_SYSCALL5(name, err, a1, a2, a3, a4, a5) \ + INTERNAL_SYSCALL (name, err, 5, a1, a2, a3, a4, a5) +#define __INTERNAL_SYSCALL6(name, err, a1, a2, a3, a4, a5, a6) \ + INTERNAL_SYSCALL (name, err, 6, a1, a2, a3, a4, a5, a6) +#define __INTERNAL_SYSCALL7(name, err, a1, a2, a3, a4, a5, a6, a7) \ + INTERNAL_SYSCALL (name, err, 7, a1, a2, a3, a4, a5, a6, a7) + +#define __INTERNAL_SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n +#define __INTERNAL_SYSCALL_NARGS(...) \ + __INTERNAL_SYSCALL_NARGS_X (__VA_ARGS__,7,6,5,4,3,2,1,0,) +#define __INTERNAL_SYSCALL_CONCAT_X(a,b) a##b +#define __INTERNAL_SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X (a, b) +#define __INTERNAL_SYSCALL_DISP(b,err,...) \ + __INTERNAL_SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(err,__VA_ARGS__) + +/* Issue a syscall defined by syscall number plus any other argument required. + It is similar to INLINE_SYSCALL macro, but without the need to pass the + expected argument number as second parameter. */ +#define INTERNAL_SYSCALL_CALL(nr, err, ...) \ + __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, nr, err, __VA_ARGS__) + #define __SYSCALL0(name) \ INLINE_SYSCALL (name, 0) #define __SYSCALL1(name, a1) \ @@ -49,17 +80,22 @@ #define __SYSCALL_DISP(b,...) \ __SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__) -#define __SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) +/* Issue a syscall defined by syscall number plus any other argument required. + Any error will be handled using arch defined macros and errno will be se + accordingly. + It is similar to INLINE_SYSCALL macro, but without the need to pass the + expected argument number as second parameter. */ +#define INLINE_SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) #define SYSCALL_CANCEL(...) \ ({ \ long int sc_ret; \ if (SINGLE_THREAD_P) \ - sc_ret = __SYSCALL_CALL (__VA_ARGS__); \ + sc_ret = INLINE_SYSCALL_CALL (__VA_ARGS__); \ else \ { \ int sc_cancel_oldtype = LIBC_CANCEL_ASYNC (); \ - sc_ret = __SYSCALL_CALL (__VA_ARGS__); \ + sc_ret = INLINE_SYSCALL_CALL (__VA_ARGS__); \ LIBC_CANCEL_RESET (sc_cancel_oldtype); \ } \ sc_ret; \ -- 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] Add INTERNAL_SYSCALL_CALL 2016-08-19 14:42 ` [PATCH 1/4] Add INTERNAL_SYSCALL_CALL Adhemerval Zanella @ 2016-08-22 15:28 ` Yury Norov 2016-08-23 19:16 ` Adhemerval Zanella 0 siblings, 1 reply; 21+ messages in thread From: Yury Norov @ 2016-08-22 15:28 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Fri, Aug 19, 2016 at 11:41:46AM -0300, Adhemerval Zanella wrote: > This patch adds two new macros for internal and inline syscall to use > within GLIBC: INTERNAL_SYSCALL_CALL and INLINE_SYSCALL_CALL. They are > similar to the old INTERNAL_SYSCALL and INLINE_SYSCALL with the difference > the new macros accept a variable argument call and do not require to pass > the expected argument size. > > The advantage is it is possible to use variable argument macros like > SYSCALL_LL{64} without the need to also handle the argument size. So > for an ABI where SYSCALL_LL might split the argument in high and low > parts, instead of: > > INTERNAL_SYSCALL_DECL (err); > #if ... > INTERNAL_SYSCALL (syscall, err, 2, SYSCALL_LL (len)); > #else > INTERNAL_SYSCALL (syscall, err, 1, SYSCALL_LL (len)); > #endif > > It will be just: > > INTERNAL_SYSCALL_CALL (syscall, err, SYSCALL_LL (len)); > > The INLINE_SYSCALL_CALL follows the same semanthic regarding the argument > and is similar to INLINE_SYSCALL regarding setting errno. > > * sysdeps/unix/sysdep.h (__INTERNAL_SYSCALL0): New macro. > (__INTERNAL_SYSCALL1): Likewise. > (__INTERNAL_SYSCALL2): Likewise. > (__INTERNAL_SYSCALL3): Likewise. > (__INTERNAL_SYSCALL4): Likewise. > (__INTERNAL_SYSCALL5): Likewise. > (__INTERNAL_SYSCALL6): Likewise. > (__INTERNAL_SYSCALL7): Likewise. > (__INTERNAL_SYSCALL_NARGS_X): Likewise. > (__INTERNAL_SYSCALL_NARGS): Likewise. > (__INTERNAL_SYSCALL_CONCAT_X): Likewise. > (__INTERNAL_SYSCALL_CONCAT): Likewise. > (__INTERNAL_SYSCALL_DISP): Likewise. > (INTERNAL_SYSCALL_CALL): Likewise. > (__SYSCALL_CALL): Rename to INLINE_SYSCALL_CALL. > (SYSCALL_CANCEL): Replace __SYSCALL_CALL with INLINE_SYSCALL_CALL. > --- > sysdeps/unix/sysdep.h | 42 +++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 56 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h > index 94a2ce0..2253603 100644 > --- a/sysdeps/unix/sysdep.h > +++ b/sysdeps/unix/sysdep.h > @@ -24,6 +24,37 @@ > #define SYSCALL__(name, args) PSEUDO (__##name, name, args) > #define SYSCALL(name, args) PSEUDO (name, name, args) > > +#define __INTERNAL_SYSCALL0(name, err) \ > + INTERNAL_SYSCALL (name, err, 0) > +#define __INTERNAL_SYSCALL1(name, err, a1) \ > + INTERNAL_SYSCALL (name, err, 1, a1) > +#define __INTERNAL_SYSCALL2(name, err, a1, a2) \ > + INTERNAL_SYSCALL (name, err, 2, a1, a2) > +#define __INTERNAL_SYSCALL3(name, err, a1, a2, a3) \ > + INTERNAL_SYSCALL (name, err, 3, a1, a2, a3) > +#define __INTERNAL_SYSCALL4(name, err, a1, a2, a3, a4) \ > + INTERNAL_SYSCALL (name, err, 4, a1, a2, a3, a4) > +#define __INTERNAL_SYSCALL5(name, err, a1, a2, a3, a4, a5) \ > + INTERNAL_SYSCALL (name, err, 5, a1, a2, a3, a4, a5) > +#define __INTERNAL_SYSCALL6(name, err, a1, a2, a3, a4, a5, a6) \ > + INTERNAL_SYSCALL (name, err, 6, a1, a2, a3, a4, a5, a6) > +#define __INTERNAL_SYSCALL7(name, err, a1, a2, a3, a4, a5, a6, a7) \ > + INTERNAL_SYSCALL (name, err, 7, a1, a2, a3, a4, a5, a6, a7) > + > +#define __INTERNAL_SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n Missed whitespaces after commas? > +#define __INTERNAL_SYSCALL_NARGS(...) \ > + __INTERNAL_SYSCALL_NARGS_X (__VA_ARGS__,7,6,5,4,3,2,1,0,) Same > +#define __INTERNAL_SYSCALL_CONCAT_X(a,b) a##b Same > +#define __INTERNAL_SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X (a, b) > +#define __INTERNAL_SYSCALL_DISP(b,err,...) \ > + __INTERNAL_SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(err,__VA_ARGS__) Missed whitespaces after commas and before opening braces? > + > +/* Issue a syscall defined by syscall number plus any other argument required. > + It is similar to INLINE_SYSCALL macro, but without the need to pass the Did you mean INTERNAL_SYSCALL macro? > + expected argument number as second parameter. */ > +#define INTERNAL_SYSCALL_CALL(nr, err, ...) \ > + __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, nr, err, __VA_ARGS__) > + > #define __SYSCALL0(name) \ > INLINE_SYSCALL (name, 0) > #define __SYSCALL1(name, a1) \ > @@ -49,17 +80,22 @@ > #define __SYSCALL_DISP(b,...) \ > __SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__) > > -#define __SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) > +/* Issue a syscall defined by syscall number plus any other argument required. > + Any error will be handled using arch defined macros and errno will be se > + accordingly. > + It is similar to INLINE_SYSCALL macro, but without the need to pass the > + expected argument number as second parameter. */ > +#define INLINE_SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) Missed whitespaces after commas and before opening braces? > > #define SYSCALL_CANCEL(...) \ > ({ \ > long int sc_ret; \ > if (SINGLE_THREAD_P) \ > - sc_ret = __SYSCALL_CALL (__VA_ARGS__); \ > + sc_ret = INLINE_SYSCALL_CALL (__VA_ARGS__); \ > else \ > { \ > int sc_cancel_oldtype = LIBC_CANCEL_ASYNC (); \ > - sc_ret = __SYSCALL_CALL (__VA_ARGS__); \ > + sc_ret = INLINE_SYSCALL_CALL (__VA_ARGS__); \ > LIBC_CANCEL_RESET (sc_cancel_oldtype); \ > } \ > sc_ret; \ > -- > 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] Add INTERNAL_SYSCALL_CALL 2016-08-22 15:28 ` Yury Norov @ 2016-08-23 19:16 ` Adhemerval Zanella 2016-08-23 19:20 ` Yury Norov 0 siblings, 1 reply; 21+ messages in thread From: Adhemerval Zanella @ 2016-08-23 19:16 UTC (permalink / raw) To: Yury Norov; +Cc: libc-alpha Thanks for review, comments below. On 22/08/2016 12:28, Yury Norov wrote: >> --- >> sysdeps/unix/sysdep.h | 42 +++++++++++++++++++++++++++++++++++++++--- >> 2 files changed, 56 insertions(+), 3 deletions(-) >> >> + >> +#define __INTERNAL_SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n > > Missed whitespaces after commas? > Ack. >> +#define __INTERNAL_SYSCALL_NARGS(...) \ >> + __INTERNAL_SYSCALL_NARGS_X (__VA_ARGS__,7,6,5,4,3,2,1,0,) > > Same > Ack. >> +#define __INTERNAL_SYSCALL_CONCAT_X(a,b) a##b > > Same > Ack. >> +#define __INTERNAL_SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X (a, b) >> +#define __INTERNAL_SYSCALL_DISP(b,err,...) \ >> + __INTERNAL_SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(err,__VA_ARGS__) > > Missed whitespaces after commas and before opening braces? > Ack. >> + >> +/* Issue a syscall defined by syscall number plus any other argument required. >> + It is similar to INLINE_SYSCALL macro, but without the need to pass the > > Did you mean INTERNAL_SYSCALL macro? > Yes, I will fix it. >> + expected argument number as second parameter. */ >> +#define INTERNAL_SYSCALL_CALL(nr, err, ...) \ >> + __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, nr, err, __VA_ARGS__) >> + >> #define __SYSCALL0(name) \ >> INLINE_SYSCALL (name, 0) >> #define __SYSCALL1(name, a1) \ >> @@ -49,17 +80,22 @@ >> #define __SYSCALL_DISP(b,...) \ >> __SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__) >> >> -#define __SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) >> +/* Issue a syscall defined by syscall number plus any other argument required. >> + Any error will be handled using arch defined macros and errno will be se >> + accordingly. >> + It is similar to INLINE_SYSCALL macro, but without the need to pass the >> + expected argument number as second parameter. */ >> +#define INLINE_SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) > > Missed whitespaces after commas and before opening braces? For INLINE_SYSCALL_DEFINITION you mean? I do not think so, 'indent' also shows no change for this specific snippet. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] Add INTERNAL_SYSCALL_CALL 2016-08-23 19:16 ` Adhemerval Zanella @ 2016-08-23 19:20 ` Yury Norov 0 siblings, 0 replies; 21+ messages in thread From: Yury Norov @ 2016-08-23 19:20 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha On Tue, Aug 23, 2016 at 04:15:55PM -0300, Adhemerval Zanella wrote: > Thanks for review, comments below. > > On 22/08/2016 12:28, Yury Norov wrote: > >> --- > >> sysdeps/unix/sysdep.h | 42 +++++++++++++++++++++++++++++++++++++++--- > >> 2 files changed, 56 insertions(+), 3 deletions(-) > >> > >> + > >> +#define __INTERNAL_SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n > > > > Missed whitespaces after commas? > > > > Ack. > > >> +#define __INTERNAL_SYSCALL_NARGS(...) \ > >> + __INTERNAL_SYSCALL_NARGS_X (__VA_ARGS__,7,6,5,4,3,2,1,0,) > > > > Same > > > > Ack. > > >> +#define __INTERNAL_SYSCALL_CONCAT_X(a,b) a##b > > > > Same > > > > Ack. > > >> +#define __INTERNAL_SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X (a, b) > >> +#define __INTERNAL_SYSCALL_DISP(b,err,...) \ > >> + __INTERNAL_SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(err,__VA_ARGS__) > > > > Missed whitespaces after commas and before opening braces? > > > > Ack. > > >> + > >> +/* Issue a syscall defined by syscall number plus any other argument required. > >> + It is similar to INLINE_SYSCALL macro, but without the need to pass the > > > > Did you mean INTERNAL_SYSCALL macro? > > > > Yes, I will fix it. > > >> + expected argument number as second parameter. */ > >> +#define INTERNAL_SYSCALL_CALL(nr, err, ...) \ > >> + __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL, nr, err, __VA_ARGS__) > >> + > >> #define __SYSCALL0(name) \ > >> INLINE_SYSCALL (name, 0) > >> #define __SYSCALL1(name, a1) \ > >> @@ -49,17 +80,22 @@ > >> #define __SYSCALL_DISP(b,...) \ > >> __SYSCALL_CONCAT (b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__) > >> > >> -#define __SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) > >> +/* Issue a syscall defined by syscall number plus any other argument required. > >> + Any error will be handled using arch defined macros and errno will be se > >> + accordingly. > >> + It is similar to INLINE_SYSCALL macro, but without the need to pass the > >> + expected argument number as second parameter. */ > >> +#define INLINE_SYSCALL_CALL(...) __SYSCALL_DISP (__SYSCALL, __VA_ARGS__) > > > > Missed whitespaces after commas and before opening braces? > > For INLINE_SYSCALL_DEFINITION you mean? I do not think so, 'indent' also > shows no change for this specific snippet. I missed. It was about __SYSCALL_DISP(), though you didn't touch it... ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation 2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella ` (3 preceding siblings ...) 2016-08-19 14:42 ` [PATCH 1/4] Add INTERNAL_SYSCALL_CALL Adhemerval Zanella @ 2016-08-22 14:31 ` Yury Norov 4 siblings, 0 replies; 21+ messages in thread From: Yury Norov @ 2016-08-22 14:31 UTC (permalink / raw) To: Adhemerval Zanella; +Cc: libc-alpha Hi, I tested it on my aarch64/ilp32, and found no regressions. Thank you for complete consolidation. Yury. Tested-by: Yury Norov <ynorov@caviumnetworks.com> (aarch64/ilp32) On Fri, Aug 19, 2016 at 11:41:45AM -0300, Adhemerval Zanella wrote: > This is a follow up patch from my previous one to consolidate Linux > implementation over architectures. As before, the general idea is to > remove the port proliferation of specific implementation and use a common > one plus arch-specific define to different behaviors. It also align > with my work on trying to remove the sysdep-cancel.h requiriment to > simplify the long-standing cancellation issue. > > For x32 this patch serie requires my previous {INLINE,INTERNAL}_SYSCALL > macro fix [1], although it is still possible to push them by still > enabling x32 to generate such syscall through syscalls.list. > > [1] https://sourceware.org/ml/libc-alpha/2016-08/msg00443.html > > Adhemerval Zanella (4): > Add INTERNAL_SYSCALL_CALL > Consolidate fallocate{64} implementations > Consolidate posix_fallocate{64} implementations > Consolidate posix_fadvise implementations > > ChangeLog | 92 +++++++++++++++++ > io/Makefile | 2 +- > io/tst-posix_fallocate-common.c | 92 +++++++++++++++++ > io/tst-posix_fallocate.c | 107 ++++--------------- > io/tst-posix_fallocate64.c | 44 ++++++++ > posix/Makefile | 3 +- > posix/tst-posix_fadvise-common.c | 113 +++++++++++++++++++++ > posix/tst-posix_fadvise.c | 25 +++++ > posix/tst-posix_fadvise64.c | 44 ++++++++ > sysdeps/unix/sysdep.h | 42 +++++++- > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/arm/kernel-features.h | 7 ++ > sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 38 ------- > sysdeps/unix/sysv/linux/fallocate.c | 11 +- > sysdeps/unix/sysv/linux/fallocate64.c | 14 +-- > .../sysv/linux/generic/wordsize-32/posix_fadvise.c | 37 ------- > sysdeps/unix/sysv/linux/i386/posix_fadvise64.S | 92 ----------------- > .../unix/sysv/linux/mips/mips32/posix_fadvise.c | 41 -------- > .../unix/sysv/linux/mips/mips32/posix_fadvise64.c | 60 ----------- > .../unix/sysv/linux/mips/mips64/n32/fallocate.c | 33 ------ > .../unix/sysv/linux/mips/mips64/n32/fallocate64.c | 33 ------ > .../sysv/linux/mips/mips64/n32/posix_fadvise.c | 37 ------- > .../sysv/linux/mips/mips64/n32/posix_fadvise64.c | 55 ---------- > .../sysv/linux/mips/mips64/n32/posix_fallocate.c | 37 ------- > .../sysv/linux/mips/mips64/n32/posix_fallocate64.c | 38 ------- > .../unix/sysv/linux/mips/mips64/n64/fallocate.c | 1 - > .../unix/sysv/linux/mips/mips64/n64/fallocate64.c | 1 - > .../sysv/linux/mips/mips64/n64/posix_fadvise.c | 50 --------- > .../sysv/linux/mips/mips64/n64/posix_fadvise64.c | 28 ++++- > .../sysv/linux/mips/mips64/n64/posix_fallocate.c | 1 - > .../sysv/linux/mips/mips64/n64/posix_fallocate64.c | 1 - > sysdeps/unix/sysv/linux/posix_fadvise.c | 45 +++++--- > sysdeps/unix/sysv/linux/posix_fadvise64.c | 52 +++++++--- > sysdeps/unix/sysv/linux/posix_fallocate.c | 6 +- > sysdeps/unix/sysv/linux/posix_fallocate64.c | 8 +- > sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 5 + > .../sysv/linux/powerpc/powerpc32/posix_fadvise.c | 39 ------- > .../sysv/linux/powerpc/powerpc32/posix_fadvise64.c | 55 ---------- > sysdeps/unix/sysv/linux/tile/kernel-features.h | 1 + > sysdeps/unix/sysv/linux/tst-fallocate-common.c | 88 ++++++++++++++++ > sysdeps/unix/sysv/linux/tst-fallocate.c | 25 +++++ > sysdeps/unix/sysv/linux/tst-fallocate64.c | 54 ++++++++++ > sysdeps/unix/sysv/linux/wordsize-64/fallocate.c | 34 ------- > sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c | 1 - > .../unix/sysv/linux/wordsize-64/posix_fadvise.c | 40 -------- > .../unix/sysv/linux/wordsize-64/posix_fadvise64.c | 1 - > .../unix/sysv/linux/wordsize-64/posix_fallocate.c | 46 --------- > .../sysv/linux/wordsize-64/posix_fallocate64.c | 1 - > sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 2 - > 49 files changed, 764 insertions(+), 921 deletions(-) > create mode 100644 io/tst-posix_fallocate-common.c > create mode 100644 io/tst-posix_fallocate64.c > create mode 100644 posix/tst-posix_fadvise-common.c > create mode 100644 posix/tst-posix_fadvise.c > create mode 100644 posix/tst-posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/arm/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/i386/posix_fadvise64.S > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate-common.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate.c > create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c > > -- > 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2016-09-26 19:44 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-19 14:42 [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Adhemerval Zanella
2016-08-19 14:42 ` [PATCH 3/4] Consolidate posix_fallocate{64} implementations Adhemerval Zanella
2016-08-22 14:35 ` Yury Norov
2016-08-23 19:22 ` Adhemerval Zanella
2016-08-19 14:42 ` [PATCH 4/4] Consolidate posix_fadvise implementations Adhemerval Zanella
2016-08-22 15:08 ` Yury Norov
2016-08-23 19:29 ` Adhemerval Zanella
2016-08-23 20:00 ` Yury Norov
2016-08-24 14:29 ` Adhemerval Zanella
2016-08-24 3:53 ` Yury Norov
2016-08-24 14:40 ` Adhemerval Zanella
2016-09-25 10:42 ` Yury Norov
2016-09-26 19:44 ` Adhemerval Zanella
2016-08-19 14:42 ` [PATCH 2/4] Consolidate fallocate{64} implementations Adhemerval Zanella
2016-08-22 15:14 ` Yury Norov
2016-08-23 19:21 ` Adhemerval Zanella
2016-08-19 14:42 ` [PATCH 1/4] Add INTERNAL_SYSCALL_CALL Adhemerval Zanella
2016-08-22 15:28 ` Yury Norov
2016-08-23 19:16 ` Adhemerval Zanella
2016-08-23 19:20 ` Yury Norov
2016-08-22 14:31 ` [PATCH 0/4] Linux fallocate, posix_fallocate, and posix_fadvise consolidation Yury Norov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).