about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/generic
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-07-15 18:05:52 +0000
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-09-11 14:35:24 -0300
commit5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a (patch)
tree195d87fa01218b0ae52066d215ecbd1528e329ce /sysdeps/unix/sysv/linux/generic
parent5febe6a38ff2f87bdb8dd971632c97c916eafd9a (diff)
downloadglibc-5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a.tar.gz
glibc-5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a.tar.xz
glibc-5f85cc2f4712da0d8dd6f9ebf5f7c563e5b6ff3a.zip
linux: Consolidate fxstatat{64}
The LFS support is implemented on fxstat64.c, instead of fxstat.c for
64-bit architectures.  The fxstatat.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 issues __NR_fstatat64 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, mips32,
     microblaze, s390, sh, powerpc, and sparc32).  it issues
     __NR_fstatat64 and convert to non-LFS stat struct based on the
     version.

Also non-LFS mips64 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 issues __NR_newfstatat for _STAT_VER_KERNEL or
         _STAT_VER_LINUX.

    1.2. 64-bit kABI outlier (sparc64): it issuess fstatat64 with a
         temporary stat64 and convert to output stat64 based on the
         input version (and using a sparc64 specific __xstat32_conv).

    1.3. 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 (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 uses the __NR_fstatat64 syscall instead.

  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/fxstatat.c56
-rw-r--r--sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c37
2 files changed, 0 insertions, 93 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
deleted file mode 100644
index 8df65ebea0..0000000000
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
+++ /dev/null
@@ -1,56 +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 <fcntl.h>
-#include <stddef.h>
-#include <stdio.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
-__fxstatat (int vers, int fd, const char *file, struct stat *buf, int flag)
-{
-  if (vers == _STAT_VER_KERNEL)
-    {
-# ifdef __NR_fstatat64
-      int rc = INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag);
-# else
-      struct statx tmp;
-      int rc = INLINE_SYSCALL (statx, 5, fd, file,
-                               AT_NO_AUTOMOUNT | flag,
-                               STATX_BASIC_STATS, &tmp);
-      if (rc == 0)
-        __cp_stat64_statx ((struct stat64 *)buf, &tmp);
-# endif
-      return rc ?: stat_overflow (buf);
-    }
-
-  errno = EINVAL;
-  return -1;
-}
-libc_hidden_def (__fxstatat)
-#endif
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c
deleted file mode 100644
index 894f6dd396..0000000000
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* __fxstatat64 () 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 prototype for __fxstatat so that GCC will not complain about
-   the different function signature if it is aliased to  __fxstatat64.
-   If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64 structures
-   have an identical layout but different type names.  */
-
-#define __fxstatat __fxstatat_disable
-
-#include <sys/stat.h>
-#undef _STAT_VER_LINUX
-#define _STAT_VER_LINUX _STAT_VER_KERNEL
-
-#include <sysdeps/unix/sysv/linux/fxstatat64.c>
-
-#undef __fxstatat
-#if XSTAT_IS_XSTAT64
-weak_alias (__fxstatat64, __fxstatat)
-libc_hidden_ver (__fxstatat64, __fxstatat)
-#endif