From 71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 13 Jul 2020 09:13:12 -0300 Subject: 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 --- sysdeps/unix/sysv/linux/xstat64.c | 61 ++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 7 deletions(-) (limited to 'sysdeps/unix/sysv/linux/xstat64.c') diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index 16c6e69..919d98c 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -16,24 +16,71 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#define __xstat __redirect___xstat #include +#undef __xstat +#include #include - #include -#include +#include +#include /* Get information about the file NAME in BUF. */ int ___xstat64 (int vers, const char *name, struct stat64 *buf) { - int result; - result = INLINE_SYSCALL (stat64, 2, name, buf); - return result; +#if XSTAT_IS_XSTAT64 +# ifdef __NR_stat64 + /* 64-bit kABI outlier, e.g. sparc64. */ + if (vers == _STAT_VER_KERNEL) + return INLINE_SYSCALL_CALL (stat, name, buf); + else + { + struct stat64 st64; + int r = INLINE_SYSCALL_CALL (stat64, name, &st64); + return r ?: __xstat32_conv (vers, &st64, (struct stat *) buf); + } +# elif defined __NR_stat + /* Old 64-bit kABI, e.g. ia64, powerpc64*, s390x, and x86_64. */ + if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX) + return INLINE_SYSCALL_CALL (stat, name, buf); +# elif defined __NR_newfstatat + /* New kABIs which uses generic 64-bit Linux ABI, e.g. aarch64, riscv64. */ + if (vers == _STAT_VER_KERNEL) + return INLINE_SYSCALL_CALL (newfstatat, AT_FDCWD, name, buf, 0); +# else + /* New 32-bit kABIs with only 64-bit time_t support, e.g. arc, riscv32. */ + if (vers == _STAT_VER_KERNEL) + { + struct statx tmp; + int r = INLINE_SYSCALL_CALL (statx, AT_FDCWD, name, AT_NO_AUTOMOUNT, + STATX_BASIC_STATS, &tmp); + if (r == 0) + __cp_stat64_statx (buf, &tmp); + return r; + } +# endif +#else +# if STAT_IS_KERNEL_STAT + /* New kABIs which uses generic pre 64-bit time Linux ABI, + e.g. csky, nios2 */ + if (vers == _STAT_VER_KERNEL) + return INLINE_SYSCALL_CALL (fstatat64, AT_FDCWD, name, buf, 0); +# else + /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, + microblaze, s390, sh, mips32, powerpc32, and sparc32. */ + return INLINE_SYSCALL_CALL (stat64, name, buf); +# endif /* STAT_IS_KERNEL_STAT */ +#endif /* XSTAT_IS_XSTAT64 */ + + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } +#if XSTAT_IS_XSTAT64 +weak_alias (___xstat64, __xstat); +weak_alias (___xstat64, __GI___xstat); +#endif #include -- cgit v1.1