diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-15 16:34:47 +0000 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-11 14:35:20 -0300 |
commit | 5febe6a38ff2f87bdb8dd971632c97c916eafd9a (patch) | |
tree | bd57e798673dae821922e3449a1fa118d6bc65cf /sysdeps/unix/sysv/linux/generic | |
parent | 4f40e6adc4d00176bf11d7ad51dd67234c8cecc7 (diff) | |
download | glibc-5febe6a38ff2f87bdb8dd971632c97c916eafd9a.tar.gz |
linux: Consolidate fxstat{64}
The LFS support is implemented on fxstat64.c, instead of fxstat.c for
64-bit architectures. The fxstat.c implements the non-LFS and it is
a no-op for !XSTAT_IS_XSTAT64.
The generic non-LFS implementation handles two cases:
1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
nios): it issuess __NR_fstat64 plus handle the overflow on st_ino,
st_size, or st_blocks. It only handles _STAT_VER_KERNEL.
2. Old KABIs with old non-LFS support (arm, i386, hppa, m68k,
microblaze, s390, sh, powerpc, and sparc32). For _STAT_VER_KERNEL
it issues __NR_fstat, otherwise it calls __NR_fstat64 and convert
to non-LFS stat struct and handle possible overflows on st_ino,
st_size, or st_blocks.
Also non-LFS mips is an outlier and it has its own implementation since
_STAT_VER_LINUX requires a different conversion function (it uses the
kernel_stat as the sysissues argument since its exported ABI is
different than the kernel one for both non-LFS and LFS implementation).
The generic LFS implementation handles multiple cases:
1. XSTAT_IS_XSTAT64 being 1:
1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, riscv64, and
x86_64): it issuess __NR_fstat for _STAT_VER_KERNEL or
_STAT_VER_LINUX.
1.2. Old 64-bit kABI with defines __NR_fstat64 instead of __NR_fstat
(sparc64): it issues __NR_fstat for _STAT_VER_KERNEL or
__NR_fstat64 and convert to struct stat64.
1.3. New 32-bit kABIs with only 64-bit time_t support (arc and
riscv32): it issuess __NR_statx and covert to struct stat64.
2. Old ABIs with XSTAT_IS_XSTAT64 being 0 (arm, csky, i386, hppa,
m68k, microblaze, mips32, nios2, sh, powerpc32, and sparc32): it
issues __NR_fstat64.
Also, two special cases requires specific implementations:
1. alpha: it requires to handle _STAT_VER_KERNEL64 to issues
__NR_fstat64 and use the kernel_stat with __NR_fstat otherwise.
2. mips64: as for non-LFS implementation its ABIs differ from
glibc exported one, which requires an specific conversion
function to handle the kernel_stat.
Checked with a build for all affected ABIs. I also checked on x86_64,
i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'sysdeps/unix/sysv/linux/generic')
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c | 57 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c | 36 |
2 files changed, 0 insertions, 93 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c deleted file mode 100644 index 850450e1e8..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2011-2020 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 - <https://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <stddef.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <kernel_stat.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -#if !XSTAT_IS_XSTAT64 -#include "overflow.h" -#include <statx_cp.h> - -/* Get information about the file FD in BUF. */ -int -__fxstat (int vers, int fd, struct stat *buf) -{ - if (vers == _STAT_VER_KERNEL) - { -# ifdef __NR_fstat64 - int rc = INLINE_SYSCALL (fstat64, 2, fd, buf); -# else - struct statx tmp; - int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, - STATX_BASIC_STATS, &tmp); - if (rc == 0) - __cp_stat64_statx ((struct stat64 *)buf, &tmp); -# endif - return rc ?: stat_overflow (buf); - } - - errno = EINVAL; - return -1; -} - -hidden_def (__fxstat) -weak_alias (__fxstat, _fxstat); -#endif diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c deleted file mode 100644 index b4a2a5b417..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c +++ /dev/null @@ -1,36 +0,0 @@ -/* __fxstat64 () implementation. - Copyright (C) 2016-2020 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 - <https://www.gnu.org/licenses/>. */ - -/* Hide the prototypes for __fxstat and _fxstat so that GCC will not - complain about the different function signatures if they are aliased - to __fxstat64. If XSTAT_IS_XSTAT64 is set to non-zero then the stat and - stat64 structures have an identical layout but different type names. */ - -#define __fxstat __fxstat_disable -#define _fxstat _fxstat_disable - -#include <sysdeps/unix/sysv/linux/fxstat64.c> - -#undef __fxstat -#undef _fxstat -#if XSTAT_IS_XSTAT64 -weak_alias (__fxstat64, __fxstat) -weak_alias (__fxstat64, _fxstat) -hidden_ver (__fxstat64, __fxstat) -#endif |