diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-13 09:13:12 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-11 14:35:13 -0300 |
commit | 71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08 (patch) | |
tree | f56f4b1004df49d31c5af7ad581356612d2da39c /sysdeps/unix/sysv/linux/generic | |
parent | 0b1c222cd04b0de2fec1b116a68df9118ec1c540 (diff) | |
download | glibc-71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08.tar.gz |
linux: Consolidate xstat{64}
The LFS support is implemented on xstat64.c, instead of xstat.c for
64-bit architectures. The xstat.c implements the non-LFS it is
no-op for !XSTAT_IS_XSTAT64.
The generic non-LFS implementation handle two cases:
1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
nios): it issues __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_stat, otherwise it issues __NR_stat64 and convert
to non-LFS stat struct handling possible overflows on st_ino,
st_size, or st_blocks.
Also the 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 syscall 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. Old 64-bit kABI (ia64, powerpc64*, s390x, x86_64): it
issues __NR_stat for _STAT_VER_KERNEL or _STAT_VER_LINUX.
1.2. Old 64-bit kABI with defines __NR_stat64 instead of __NR_stat
(sparc64): it issues __NR_stat for _STAT_VER_KERNEL or
__NR_stat64 and convert to struct stat64.
1.3. New kABIs which uses generic 64-bit Linux ABI (aarch64 and
riscv64): it issues __NR_newfstatat and only for
_STAT_VER_KERNEL.
1.4. New 32-bit kABIs with only 64-bit time_t support (arc and
riscv32): it issues __NR_statx and covert to struct stat64.
2. Old ABIs with XSTAT_IS_XSTAT64 being 0:
2.1. New kABIs which uses generic pre 64-bit time Linux ABI (csky
and nios2): it issues __NR_fstatat64 for _STAT_VER_KERNEL.
2.2. Old kABIs with old non-LFS support (arm, i386, hppa, m68k,
microblaze, s390, sh, mips32, powerpc32, and sparc32): it
issues __NR_stat64.
Also, two special cases requires specific LFS implementations:
1. alpha: it requires to handle _STAT_VER_KERNEL64 to call __NR_stat64
or use the kernel_stat with __NR_stat 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/xstat.c | 54 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c | 63 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/xstat.c | 48 |
3 files changed, 0 insertions, 165 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c deleted file mode 100644 index a4a921c1ea..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c +++ /dev/null @@ -1,54 +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/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 NAME in BUF. */ -int -__xstat (int vers, const char *name, struct stat *buf) -{ - if (vers == _STAT_VER_KERNEL) - { -# ifdef __NR_fstatat64 - int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); -# else - struct statx tmp; - int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT, - 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 (__xstat) -#endif diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c deleted file mode 100644 index 0848b5a4b4..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c +++ /dev/null @@ -1,63 +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/>. */ - -/* Hide the prototype for __xstat so that GCC will not complain about - the different function signature if it is aliased to __xstat64. - If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64 - structures have an identical layout but different type names. */ - -#define __xstat __xstat_disable - -#include <errno.h> -#include <stddef.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <kernel_stat.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -#include <statx_cp.h> - -/* Get information about the file NAME in BUF. */ -int -__xstat64 (int vers, const char *name, struct stat64 *buf) -{ - if (vers == _STAT_VER_KERNEL) - { -#ifdef __NR_fstatat64 - return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0); -#else - struct statx tmp; - int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT, - STATX_BASIC_STATS, &tmp); - if (rc == 0) - __cp_stat64_statx (buf, &tmp); - return rc; -#endif - } - errno = EINVAL; - return -1; -} -hidden_def (__xstat64) - -#undef __xstat -#if XSTAT_IS_XSTAT64 -strong_alias (__xstat64, __xstat) -hidden_ver (__xstat64, __xstat) -#endif diff --git a/sysdeps/unix/sysv/linux/generic/xstat.c b/sysdeps/unix/sysv/linux/generic/xstat.c deleted file mode 100644 index 2eb27a6f91..0000000000 --- a/sysdeps/unix/sysv/linux/generic/xstat.c +++ /dev/null @@ -1,48 +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/>. */ - -/* Ignore prototype to avoid error if we alias __xstat and __xstat64. */ -#define __xstat64 __xstat64_disable - -#include <errno.h> -#include <stddef.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <kernel_stat.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Get information about the file NAME in BUF. */ -int -__xstat (int vers, const char *name, struct stat *buf) -{ - if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (newfstatat, 4, AT_FDCWD, name, buf, 0); - - errno = EINVAL; - return -1; -} - -hidden_def (__xstat) -weak_alias (__xstat, _xstat); -#if XSTAT_IS_XSTAT64 -#undef __xstat64 -strong_alias (__xstat, __xstat64); -hidden_ver (__xstat, __xstat64) -#endif |