diff mbox series

[03/16] linux: Consolidate xstat{64}

Message ID 20200723194641.1949404-4-adhemerval.zanella@linaro.org
State Committed
Headers
Series Add y2038 support for stat functions |

Commit Message

Adhemerval Zanella Netto July 23, 2020, 7:46 p.m. UTC 
  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, sparc64, x86_64): it
         issues __NR_stat for _STAT_VER_KERNEL or _STAT_VER_LINUX.

    1.2. New kABIs which uses generic 64-bit Linux ABI (aarch64 and
         riscv64): it issues __NR_newfstatat and only for
         _STAT_VER_KERNEL.

    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:

    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.
---
 sysdeps/unix/sysv/linux/alpha/xstat.c         | 57 ----------------
 .../{generic/xstat.c => alpha/xstat64.c}      | 47 ++++++-------
 sysdeps/unix/sysv/linux/arm/xstat.c           |  1 -
 .../sysv/linux/generic/wordsize-32/xstat.c    | 54 ---------------
 .../sysv/linux/generic/wordsize-32/xstat64.c  | 63 -----------------
 sysdeps/unix/sysv/linux/hppa/xstat.c          |  1 -
 sysdeps/unix/sysv/linux/i386/xstat.c          | 59 ----------------
 sysdeps/unix/sysv/linux/m68k/xstat.c          |  1 -
 sysdeps/unix/sysv/linux/microblaze/xstat.c    |  1 -
 sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 16 +----
 .../sysv/linux/{wordsize-64 => mips}/xstat.c  | 32 +++++----
 .../unix/sysv/linux/powerpc/powerpc32/xstat.c |  1 -
 sysdeps/unix/sysv/linux/s390/s390-32/xstat.c  |  1 -
 sysdeps/unix/sysv/linux/sh/xstat.c            |  1 -
 sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c |  1 -
 sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c |  1 -
 sysdeps/unix/sysv/linux/wordsize-64/xstat64.c |  1 -
 sysdeps/unix/sysv/linux/xstat.c               | 60 +++++++++--------
 sysdeps/unix/sysv/linux/xstat64.c             | 51 ++++++++++++--
 sysdeps/unix/sysv/linux/xstatover.h           | 67 +++++++++++++++++++
 20 files changed, 184 insertions(+), 332 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/alpha/xstat.c
 rename sysdeps/unix/sysv/linux/{generic/xstat.c => alpha/xstat64.c} (57%)
 delete mode 100644 sysdeps/unix/sysv/linux/arm/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c
 delete mode 100644 sysdeps/unix/sysv/linux/hppa/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/i386/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/m68k/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/microblaze/xstat.c
 rename sysdeps/unix/sysv/linux/{wordsize-64 => mips}/xstat.c (67%)
 delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/sh/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
 delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
 create mode 100644 sysdeps/unix/sysv/linux/xstatover.h

Comments

Joseph Myers July 23, 2020, 8:51 p.m. UTC | #1 
On Thu, 23 Jul 2020, Adhemerval Zanella via Libc-alpha wrote:

> 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 other key MIPS peculiarity is that n64 has struct stat and struct 
stat64 with different layout even though off_t etc. are 64-bit by default.  
And thus n64 cannot use sysdeps/unix/sysv/linux/wordsize-64 (not sure if 
any other incompatibilities prevent use of that directory).
Lukasz Majewski July 24, 2020, 8:34 a.m. UTC | #2 
On Thu, 23 Jul 2020 16:46:28 -0300
Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:

> 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, sparc64, x86_64):
> it issues __NR_stat for _STAT_VER_KERNEL or _STAT_VER_LINUX.
> 
>     1.2. New kABIs which uses generic 64-bit Linux ABI (aarch64 and
>          riscv64): it issues __NR_newfstatat and only for
>          _STAT_VER_KERNEL.
> 
>     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:
> 
>     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>

> ---
>  sysdeps/unix/sysv/linux/alpha/xstat.c         | 57 ----------------
>  .../{generic/xstat.c => alpha/xstat64.c}      | 47 ++++++-------
>  sysdeps/unix/sysv/linux/arm/xstat.c           |  1 -
>  .../sysv/linux/generic/wordsize-32/xstat.c    | 54 ---------------
>  .../sysv/linux/generic/wordsize-32/xstat64.c  | 63 -----------------
>  sysdeps/unix/sysv/linux/hppa/xstat.c          |  1 -
>  sysdeps/unix/sysv/linux/i386/xstat.c          | 59 ----------------
>  sysdeps/unix/sysv/linux/m68k/xstat.c          |  1 -
>  sysdeps/unix/sysv/linux/microblaze/xstat.c    |  1 -
>  sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 16 +----
>  .../sysv/linux/{wordsize-64 => mips}/xstat.c  | 32 +++++----
>  .../unix/sysv/linux/powerpc/powerpc32/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/s390/s390-32/xstat.c  |  1 -
>  sysdeps/unix/sysv/linux/sh/xstat.c            |  1 -
>  sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/wordsize-64/xstat64.c |  1 -
>  sysdeps/unix/sysv/linux/xstat.c               | 60 +++++++++--------
>  sysdeps/unix/sysv/linux/xstat64.c             | 51 ++++++++++++--
>  sysdeps/unix/sysv/linux/xstatover.h           | 67
> +++++++++++++++++++ 20 files changed, 184 insertions(+), 332
> deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/xstat.c
>  rename sysdeps/unix/sysv/linux/{generic/xstat.c => alpha/xstat64.c}
> (57%) delete mode 100644 sysdeps/unix/sysv/linux/arm/xstat.c
>  delete mode 100644
> sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c delete
> mode 100644 sysdeps/unix/sysv/linux/hppa/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/i386/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/m68k/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/microblaze/xstat.c rename
> sysdeps/unix/sysv/linux/{wordsize-64 => mips}/xstat.c (67%) delete
> mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c delete
> mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/xstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/sh/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/wordsize-64/xstat64.c create mode 100644
> sysdeps/unix/sysv/linux/xstatover.h
> 
> diff --git a/sysdeps/unix/sysv/linux/alpha/xstat.c
> b/sysdeps/unix/sysv/linux/alpha/xstat.c deleted file mode 100644
> index 3ba1ae1811..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/xstat.c
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -/* xstat using old-style Unix stat system call.
> -   Copyright (C) 2004-2020 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
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -#include <xstatconv.h>
> -
> -#undef __xstat64
> -
> -
> -/* Get information about the file NAME in BUF.  */
> -int
> -__xstat (int vers, const char *name, struct stat *buf)
> -{
> -  int result;
> -  struct kernel_stat kbuf;
> -
> -  if (vers == _STAT_VER_KERNEL64)
> -    {
> -      result = INTERNAL_SYSCALL_CALL (stat64, name, buf);
> -      if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> -	return result;
> -      __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> -      return -1;
> -    }
> -
> -  result = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> -  if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> -    return __xstat_conv (vers, &kbuf, buf);
> -  __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> -  return -1;
> -}
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> diff --git a/sysdeps/unix/sysv/linux/generic/xstat.c
> b/sysdeps/unix/sysv/linux/alpha/xstat64.c similarity index 57%
> rename from sysdeps/unix/sysv/linux/generic/xstat.c
> rename to sysdeps/unix/sysv/linux/alpha/xstat64.c
> index 2eb27a6f91..ac1af53780 100644
> --- a/sysdeps/unix/sysv/linux/generic/xstat.c
> +++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c
> @@ -1,6 +1,6 @@
> -/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
> +/* xstat using old-style Unix stat system call.
> +   Copyright (C) 2004-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
> @@ -16,33 +16,34 @@
>     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>
> +#define __xstat __redirect___xstat
>  #include <sys/stat.h>
> +#undef __xstat
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
>  int
> -__xstat (int vers, const char *name, struct stat *buf)
> +__xstat64 (int vers, const char *name, struct stat64 *buf)
>  {
> -  if (vers == _STAT_VER_KERNEL)
> -    return INLINE_SYSCALL (newfstatat, 4, AT_FDCWD, name, buf, 0);
> -
> -  errno = EINVAL;
> -  return -1;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL64:
> +      return INLINE_SYSCALL_CALL (stat64, name, buf);
> +
> +    default:
> +      {
> +        struct kernel_stat kbuf;
> +	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> +	if (r == 0)
> +	  return __xstat_conv (vers, &kbuf, buf);
> +	return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
> +      }
> +    }
>  }
> +weak_alias (__xstat64, __xstat);
> +weak_alias (__xstat64, __GI___xstat);
>  
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> +hidden_def (__xstat64)
> diff --git a/sysdeps/unix/sysv/linux/arm/xstat.c
> b/sysdeps/unix/sysv/linux/arm/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/arm/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> 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/hppa/xstat.c
> b/sysdeps/unix/sysv/linux/hppa/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c
> b/sysdeps/unix/sysv/linux/i386/xstat.c deleted file mode 100644
> index 96f67168ac..0000000000
> --- a/sysdeps/unix/sysv/linux/i386/xstat.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/* xstat using old-style Unix stat system call.
> -   Copyright (C) 1991-2020 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
> -   <https://www.gnu.org/licenses/>.  */
> -
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -
> -#include <xstatconv.h>
> -
> -
> -/* Get information about the file NAME in BUF.  */
> -int
> -__xstat (int vers, const char *name, struct stat *buf)
> -{
> -  int result;
> -
> -  if (vers == _STAT_VER_KERNEL)
> -    return INLINE_SYSCALL (stat, 2, name, buf);
> -
> -  {
> -    struct stat64 buf64;
> -
> -    result = INTERNAL_SYSCALL_CALL (stat64, name, &buf64);
> -    if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
> -      return INLINE_SYSCALL_ERROR_RETURN_VALUE
> (INTERNAL_SYSCALL_ERRNO (result));
> -    else
> -      return __xstat32_conv (vers, &buf64, buf);
> -  }
> -}
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -# undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/xstat.c
> b/sysdeps/unix/sysv/linux/m68k/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/microblaze/xstat.c
> b/sysdeps/unix/sysv/linux/microblaze/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/microblaze/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
> b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c index
> 7eee9e67d4..99b03c7593 100644 ---
> a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c +++
> b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -1,4 +1,4 @@
> -/* xstat64 using 64-bit MIPS stat system call.
> +/* xstat64 using Linux stat64 system call.
>     Copyright (C) 1991-2020 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>  
> @@ -16,14 +16,9 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> -
>  #include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
> @@ -31,14 +26,9 @@
>  int
>  __xstat64 (int vers, const char *name, struct stat64 *buf)
>  {
> -  int result;
>    struct kernel_stat kbuf;
> -
> -  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
> -  if (result == 0)
> -    result = __xstat64_conv (vers, &kbuf, buf);
> -
> -  return result;
> +  int r = INLINE_SYSCALL_CALL (stat, name, &kbuf);
> +  return r ?: __xstat64_conv (vers, &kbuf, buf);
>  }
>  
>  hidden_def (__xstat64)
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> b/sysdeps/unix/sysv/linux/mips/xstat.c similarity index 67%
> rename from sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> rename to sysdeps/unix/sysv/linux/mips/xstat.c
> index 438d54d291..835691cf89 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> +++ b/sysdeps/unix/sysv/linux/mips/xstat.c
> @@ -16,29 +16,27 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -/* Ho hum, since xstat == xstat64 we must get rid of the prototype
> or gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
> -
> +#include <fcntl.h>
> +#include <kernel_stat.h>
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
>  int
>  __xstat (int vers, const char *name, struct stat *buf)
>  {
> -  if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
> -    return INLINE_SYSCALL (stat, 2, name, buf);
> -
> -  __set_errno (EINVAL);
> -  return -1;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL:
> +      return INLINE_SYSCALL_CALL (stat, name, buf);
> +
> +    default:
> +      {
> +	struct kernel_stat kbuf;
> +	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> +	return r ?: __xstat_conv (vers, &kbuf, buf);
> +      }
> +    }
>  }
>  hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
> b/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
> b/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sh/xstat.c
> b/sysdeps/unix/sysv/linux/sh/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/sh/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c deleted file mode
> 100644 index c3b00cb1d4..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "../../i386/xstat.c"
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
> b/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c deleted file mode
> 100644 index e7acd3b45e..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* xstat64 is in xstat.c */
> diff --git a/sysdeps/unix/sysv/linux/xstat.c
> b/sysdeps/unix/sysv/linux/xstat.c index 76c90e20c7..0ae52b1901 100644
> --- a/sysdeps/unix/sysv/linux/xstat.c
> +++ b/sysdeps/unix/sysv/linux/xstat.c
> @@ -16,44 +16,46 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
>  
> -#include <xstatconv.h>
> +#if !XSTAT_IS_XSTAT64
> +# include <xstatconv.h>
> +# include <xstatover.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 (stat, 2, name, buf);
> -
> -#if STAT_IS_KERNEL_STAT
> -  return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> -#else
> -  struct kernel_stat kbuf;
> -  int result;
> -
> -  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
> -  if (result == 0)
> -    result = __xstat_conv (vers, &kbuf, buf);
> -
> -  return result;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL:
> +      {
> +# if STAT_IS_KERNEL_STAT
> +	/* New kABIs which uses generic pre 64-bit time Linux ABI,
> +	   e.g. csky, nios2  */
> +	int r = INLINE_SYSCALL_CALL (fstatat64, AT_FDCWD, name, buf,
> 0);
> +	return r ?: stat_overflow (buf);
> +# else
> +	/* Old kABIs with old non-LFS support, e.g. arm, i386, hppa,
> m68k,
> +	   microblaze, s390, sh, powerpc, and sparc32.  */
> +	return INLINE_SYSCALL_CALL (stat, name, buf);
> +# endif
> +      }
> +
> +    default:
> +      {
> +# if STAT_IS_KERNEL_STAT
> +	return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> +# else
> +	struct stat64 buf64;
> +	int r = INLINE_SYSCALL_CALL (stat64, name, &buf64);
> +	return r ?: __xstat32_conv (vers, &buf64, buf);
>  #endif
> +      }
> +    }
>  }
>  hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> +#endif /* XSTAT_IS_XSTAT64  */
> diff --git a/sysdeps/unix/sysv/linux/xstat64.c
> b/sysdeps/unix/sysv/linux/xstat64.c index 16c6e69710..4feb55f429
> 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c
> +++ b/sysdeps/unix/sysv/linux/xstat64.c
> @@ -16,24 +16,61 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <stddef.h>
> +#define __xstat __redirect___xstat
>  #include <sys/stat.h>
> +#undef __xstat
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
> +#include <statx_cp.h>
>  
>  /* 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
> +# if defined __NR_stat
> +  /* Old 64-bit kABI, e.g. ia64, powerpc64*, s390x, sparc64, 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 <shlib-compat.h>
>  
> diff --git a/sysdeps/unix/sysv/linux/xstatover.h
> b/sysdeps/unix/sysv/linux/xstatover.h new file mode 100644
> index 0000000000..20178114f9
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/xstatover.h
> @@ -0,0 +1,67 @@
> +/* Overflow tests for stat, statfs, and lseek functions.
> +   Copyright (C) 2020 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
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <sys/stat.h>
> +#include <sys/statfs.h>
> +
> +/* Test for overflows of structures where we ask the kernel to fill
> them
> +   in with standard 64-bit syscalls but return them through APIs that
> +   only expose the low 32 bits of some fields.  */
> +
> +static inline off_t lseek_overflow (loff_t res)
> +{
> +  off_t retval = (off_t) res;
> +  if (retval == res)
> +    return retval;
> +
> +  __set_errno (EOVERFLOW);
> +  return (off_t) -1;
> +}
> +
> +static inline int stat_overflow (struct stat *buf)
> +{
> +#if defined __INO_T_MATCHES_INO64_T || !STAT_IS_KERNEL_STAT
> +  return 0;
> +#else
> +  if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0
> +      && buf->__st_blocks_pad == 0)
> +    return 0;
> +
> +  __set_errno (EOVERFLOW);
> +  return -1;
> +#endif
> +}
> +
> +/* Note that f_files and f_ffree may validly be a sign-extended -1.
> */ +static inline int statfs_overflow (struct statfs *buf)
> +{
> +#if __STATFS_MATCHES_STATFS64 || !STAT_IS_KERNEL_STAT
> +  return 0;
> +#else
> +  if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0
> +      && buf->__f_bavail_pad == 0
> +      && (buf->__f_files_pad == 0
> +	  || (buf->f_files == -1U && buf->__f_files_pad == -1))
> +      && (buf->__f_ffree_pad == 0
> +	  || (buf->f_ffree == -1U && buf->__f_ffree_pad == -1)))
> +    return 0;
> +
> +  __set_errno (EOVERFLOW);
> +  return -1;
> +#endif
> +}




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Lukasz Majewski Sept. 9, 2020, 2:46 p.m. UTC | #3 
Hi Adhemerval,

> 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.
> 

Do we have any more input for this patch series? In other words - when
it can find its way to -master?

> 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, sparc64, x86_64):
> it issues __NR_stat for _STAT_VER_KERNEL or _STAT_VER_LINUX.
> 
>     1.2. New kABIs which uses generic 64-bit Linux ABI (aarch64 and
>          riscv64): it issues __NR_newfstatat and only for
>          _STAT_VER_KERNEL.
> 
>     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:
> 
>     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.
> ---
>  sysdeps/unix/sysv/linux/alpha/xstat.c         | 57 ----------------
>  .../{generic/xstat.c => alpha/xstat64.c}      | 47 ++++++-------
>  sysdeps/unix/sysv/linux/arm/xstat.c           |  1 -
>  .../sysv/linux/generic/wordsize-32/xstat.c    | 54 ---------------
>  .../sysv/linux/generic/wordsize-32/xstat64.c  | 63 -----------------
>  sysdeps/unix/sysv/linux/hppa/xstat.c          |  1 -
>  sysdeps/unix/sysv/linux/i386/xstat.c          | 59 ----------------
>  sysdeps/unix/sysv/linux/m68k/xstat.c          |  1 -
>  sysdeps/unix/sysv/linux/microblaze/xstat.c    |  1 -
>  sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 16 +----
>  .../sysv/linux/{wordsize-64 => mips}/xstat.c  | 32 +++++----
>  .../unix/sysv/linux/powerpc/powerpc32/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/s390/s390-32/xstat.c  |  1 -
>  sysdeps/unix/sysv/linux/sh/xstat.c            |  1 -
>  sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c |  1 -
>  sysdeps/unix/sysv/linux/wordsize-64/xstat64.c |  1 -
>  sysdeps/unix/sysv/linux/xstat.c               | 60 +++++++++--------
>  sysdeps/unix/sysv/linux/xstat64.c             | 51 ++++++++++++--
>  sysdeps/unix/sysv/linux/xstatover.h           | 67
> +++++++++++++++++++ 20 files changed, 184 insertions(+), 332
> deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/xstat.c
>  rename sysdeps/unix/sysv/linux/{generic/xstat.c => alpha/xstat64.c}
> (57%) delete mode 100644 sysdeps/unix/sysv/linux/arm/xstat.c
>  delete mode 100644
> sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c delete
> mode 100644 sysdeps/unix/sysv/linux/hppa/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/i386/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/m68k/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/microblaze/xstat.c rename
> sysdeps/unix/sysv/linux/{wordsize-64 => mips}/xstat.c (67%) delete
> mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c delete
> mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/xstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/sh/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c delete mode 100644
> sysdeps/unix/sysv/linux/wordsize-64/xstat64.c create mode 100644
> sysdeps/unix/sysv/linux/xstatover.h
> 
> diff --git a/sysdeps/unix/sysv/linux/alpha/xstat.c
> b/sysdeps/unix/sysv/linux/alpha/xstat.c deleted file mode 100644
> index 3ba1ae1811..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/xstat.c
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -/* xstat using old-style Unix stat system call.
> -   Copyright (C) 2004-2020 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
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -#include <xstatconv.h>
> -
> -#undef __xstat64
> -
> -
> -/* Get information about the file NAME in BUF.  */
> -int
> -__xstat (int vers, const char *name, struct stat *buf)
> -{
> -  int result;
> -  struct kernel_stat kbuf;
> -
> -  if (vers == _STAT_VER_KERNEL64)
> -    {
> -      result = INTERNAL_SYSCALL_CALL (stat64, name, buf);
> -      if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> -	return result;
> -      __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> -      return -1;
> -    }
> -
> -  result = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> -  if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> -    return __xstat_conv (vers, &kbuf, buf);
> -  __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> -  return -1;
> -}
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> diff --git a/sysdeps/unix/sysv/linux/generic/xstat.c
> b/sysdeps/unix/sysv/linux/alpha/xstat64.c similarity index 57%
> rename from sysdeps/unix/sysv/linux/generic/xstat.c
> rename to sysdeps/unix/sysv/linux/alpha/xstat64.c
> index 2eb27a6f91..ac1af53780 100644
> --- a/sysdeps/unix/sysv/linux/generic/xstat.c
> +++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c
> @@ -1,6 +1,6 @@
> -/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
> +/* xstat using old-style Unix stat system call.
> +   Copyright (C) 2004-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
> @@ -16,33 +16,34 @@
>     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>
> +#define __xstat __redirect___xstat
>  #include <sys/stat.h>
> +#undef __xstat
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
>  int
> -__xstat (int vers, const char *name, struct stat *buf)
> +__xstat64 (int vers, const char *name, struct stat64 *buf)
>  {
> -  if (vers == _STAT_VER_KERNEL)
> -    return INLINE_SYSCALL (newfstatat, 4, AT_FDCWD, name, buf, 0);
> -
> -  errno = EINVAL;
> -  return -1;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL64:
> +      return INLINE_SYSCALL_CALL (stat64, name, buf);
> +
> +    default:
> +      {
> +        struct kernel_stat kbuf;
> +	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> +	if (r == 0)
> +	  return __xstat_conv (vers, &kbuf, buf);
> +	return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
> +      }
> +    }
>  }
> +weak_alias (__xstat64, __xstat);
> +weak_alias (__xstat64, __GI___xstat);
>  
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> +hidden_def (__xstat64)
> diff --git a/sysdeps/unix/sysv/linux/arm/xstat.c
> b/sysdeps/unix/sysv/linux/arm/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/arm/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> 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/hppa/xstat.c
> b/sysdeps/unix/sysv/linux/hppa/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c
> b/sysdeps/unix/sysv/linux/i386/xstat.c deleted file mode 100644
> index 96f67168ac..0000000000
> --- a/sysdeps/unix/sysv/linux/i386/xstat.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/* xstat using old-style Unix stat system call.
> -   Copyright (C) 1991-2020 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
> -   <https://www.gnu.org/licenses/>.  */
> -
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -
> -#include <xstatconv.h>
> -
> -
> -/* Get information about the file NAME in BUF.  */
> -int
> -__xstat (int vers, const char *name, struct stat *buf)
> -{
> -  int result;
> -
> -  if (vers == _STAT_VER_KERNEL)
> -    return INLINE_SYSCALL (stat, 2, name, buf);
> -
> -  {
> -    struct stat64 buf64;
> -
> -    result = INTERNAL_SYSCALL_CALL (stat64, name, &buf64);
> -    if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
> -      return INLINE_SYSCALL_ERROR_RETURN_VALUE
> (INTERNAL_SYSCALL_ERRNO (result));
> -    else
> -      return __xstat32_conv (vers, &buf64, buf);
> -  }
> -}
> -hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -# undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/xstat.c
> b/sysdeps/unix/sysv/linux/m68k/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/microblaze/xstat.c
> b/sysdeps/unix/sysv/linux/microblaze/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/microblaze/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
> b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c index
> 7eee9e67d4..99b03c7593 100644 ---
> a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c +++
> b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -1,4 +1,4 @@
> -/* xstat64 using 64-bit MIPS stat system call.
> +/* xstat64 using Linux stat64 system call.
>     Copyright (C) 1991-2020 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>  
> @@ -16,14 +16,9 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> -
>  #include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
> @@ -31,14 +26,9 @@
>  int
>  __xstat64 (int vers, const char *name, struct stat64 *buf)
>  {
> -  int result;
>    struct kernel_stat kbuf;
> -
> -  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
> -  if (result == 0)
> -    result = __xstat64_conv (vers, &kbuf, buf);
> -
> -  return result;
> +  int r = INLINE_SYSCALL_CALL (stat, name, &kbuf);
> +  return r ?: __xstat64_conv (vers, &kbuf, buf);
>  }
>  
>  hidden_def (__xstat64)
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> b/sysdeps/unix/sysv/linux/mips/xstat.c similarity index 67%
> rename from sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> rename to sysdeps/unix/sysv/linux/mips/xstat.c
> index 438d54d291..835691cf89 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c
> +++ b/sysdeps/unix/sysv/linux/mips/xstat.c
> @@ -16,29 +16,27 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -/* Ho hum, since xstat == xstat64 we must get rid of the prototype
> or gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
> -
> +#include <fcntl.h>
> +#include <kernel_stat.h>
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
>  
>  /* Get information about the file NAME in BUF.  */
>  int
>  __xstat (int vers, const char *name, struct stat *buf)
>  {
> -  if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
> -    return INLINE_SYSCALL (stat, 2, name, buf);
> -
> -  __set_errno (EINVAL);
> -  return -1;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL:
> +      return INLINE_SYSCALL_CALL (stat, name, buf);
> +
> +    default:
> +      {
> +	struct kernel_stat kbuf;
> +	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
> +	return r ?: __xstat_conv (vers, &kbuf, buf);
> +      }
> +    }
>  }
>  hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
> b/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
> b/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sh/xstat.c
> b/sysdeps/unix/sysv/linux/sh/xstat.c deleted file mode 100644
> index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/sh/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c deleted file mode
> 100644 index e9869f5508..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/xstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c deleted file mode
> 100644 index c3b00cb1d4..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "../../i386/xstat.c"
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
> b/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c deleted file mode
> 100644 index e7acd3b45e..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* xstat64 is in xstat.c */
> diff --git a/sysdeps/unix/sysv/linux/xstat.c
> b/sysdeps/unix/sysv/linux/xstat.c index 76c90e20c7..0ae52b1901 100644
> --- a/sysdeps/unix/sysv/linux/xstat.c
> +++ b/sysdeps/unix/sysv/linux/xstat.c
> @@ -16,44 +16,46 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> -   will complain since they don't strictly match.  */
> -#define __xstat64 __xstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
>  #include <sys/stat.h>
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
>  
> -#include <xstatconv.h>
> +#if !XSTAT_IS_XSTAT64
> +# include <xstatconv.h>
> +# include <xstatover.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 (stat, 2, name, buf);
> -
> -#if STAT_IS_KERNEL_STAT
> -  return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> -#else
> -  struct kernel_stat kbuf;
> -  int result;
> -
> -  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
> -  if (result == 0)
> -    result = __xstat_conv (vers, &kbuf, buf);
> -
> -  return result;
> +  switch (vers)
> +    {
> +    case _STAT_VER_KERNEL:
> +      {
> +# if STAT_IS_KERNEL_STAT
> +	/* New kABIs which uses generic pre 64-bit time Linux ABI,
> +	   e.g. csky, nios2  */
> +	int r = INLINE_SYSCALL_CALL (fstatat64, AT_FDCWD, name, buf,
> 0);
> +	return r ?: stat_overflow (buf);
> +# else
> +	/* Old kABIs with old non-LFS support, e.g. arm, i386, hppa,
> m68k,
> +	   microblaze, s390, sh, powerpc, and sparc32.  */
> +	return INLINE_SYSCALL_CALL (stat, name, buf);
> +# endif
> +      }
> +
> +    default:
> +      {
> +# if STAT_IS_KERNEL_STAT
> +	return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> +# else
> +	struct stat64 buf64;
> +	int r = INLINE_SYSCALL_CALL (stat64, name, &buf64);
> +	return r ?: __xstat32_conv (vers, &buf64, buf);
>  #endif
> +      }
> +    }
>  }
>  hidden_def (__xstat)
> -weak_alias (__xstat, _xstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __xstat64
> -strong_alias (__xstat, __xstat64);
> -hidden_ver (__xstat, __xstat64)
> -#endif
> +#endif /* XSTAT_IS_XSTAT64  */
> diff --git a/sysdeps/unix/sysv/linux/xstat64.c
> b/sysdeps/unix/sysv/linux/xstat64.c index 16c6e69710..4feb55f429
> 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c
> +++ b/sysdeps/unix/sysv/linux/xstat64.c
> @@ -16,24 +16,61 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <stddef.h>
> +#define __xstat __redirect___xstat
>  #include <sys/stat.h>
> +#undef __xstat
> +#include <fcntl.h>
>  #include <kernel_stat.h>
> -
>  #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
> +#include <statx_cp.h>
>  
>  /* 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
> +# if defined __NR_stat
> +  /* Old 64-bit kABI, e.g. ia64, powerpc64*, s390x, sparc64, 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 <shlib-compat.h>
>  
> diff --git a/sysdeps/unix/sysv/linux/xstatover.h
> b/sysdeps/unix/sysv/linux/xstatover.h new file mode 100644
> index 0000000000..20178114f9
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/xstatover.h
> @@ -0,0 +1,67 @@
> +/* Overflow tests for stat, statfs, and lseek functions.
> +   Copyright (C) 2020 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
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#include <sys/stat.h>
> +#include <sys/statfs.h>
> +
> +/* Test for overflows of structures where we ask the kernel to fill
> them
> +   in with standard 64-bit syscalls but return them through APIs that
> +   only expose the low 32 bits of some fields.  */
> +
> +static inline off_t lseek_overflow (loff_t res)
> +{
> +  off_t retval = (off_t) res;
> +  if (retval == res)
> +    return retval;
> +
> +  __set_errno (EOVERFLOW);
> +  return (off_t) -1;
> +}
> +
> +static inline int stat_overflow (struct stat *buf)
> +{
> +#if defined __INO_T_MATCHES_INO64_T || !STAT_IS_KERNEL_STAT
> +  return 0;
> +#else
> +  if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0
> +      && buf->__st_blocks_pad == 0)
> +    return 0;
> +
> +  __set_errno (EOVERFLOW);
> +  return -1;
> +#endif
> +}
> +
> +/* Note that f_files and f_ffree may validly be a sign-extended -1.
> */ +static inline int statfs_overflow (struct statfs *buf)
> +{
> +#if __STATFS_MATCHES_STATFS64 || !STAT_IS_KERNEL_STAT
> +  return 0;
> +#else
> +  if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0
> +      && buf->__f_bavail_pad == 0
> +      && (buf->__f_files_pad == 0
> +	  || (buf->f_files == -1U && buf->__f_files_pad == -1))
> +      && (buf->__f_ffree_pad == 0
> +	  || (buf->f_ffree == -1U && buf->__f_ffree_pad == -1)))
> +    return 0;
> +
> +  __set_errno (EOVERFLOW);
> +  return -1;
> +#endif
> +}




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Adhemerval Zanella Netto Sept. 9, 2020, 6:05 p.m. UTC | #4 
On 09/09/2020 11:46, Lukasz Majewski wrote:
> Hi Adhemerval,
> 
>> 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.
>>
> 
> Do we have any more input for this patch series? In other words - when
> it can find its way to -master?

I will rebase this patchset and do some re-testing on different platforms
to check for regressions.  I have addressed the remarks done by Joseph
and Florian, but I am not sure if they are planning to do more reviews.

I think patches from 01 to 08 should be ok to go, they are mostly
refactoring. I will double check if any syscall is changed over all the
support architectures and commit them. 

I will resend the 08 to 16 with the changes I added, mainly the rewrite of
some descriptor and the removal of the combination of 64-bit times with 
32-bit offsets (it is not supposed to be supported).

I do like to get this done on 2.33, as well with all other remaining work
for y2038 support.
Lukasz Majewski Sept. 10, 2020, 7:10 a.m. UTC | #5 
Hi Adhemerval,

> On 09/09/2020 11:46, Lukasz Majewski wrote:
> > Hi Adhemerval,
> >   
> >> 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.
> >>  
> > 
> > Do we have any more input for this patch series? In other words -
> > when it can find its way to -master?  
> 
> I will rebase this patchset and do some re-testing on different
> platforms to check for regressions.  I have addressed the remarks
> done by Joseph and Florian, but I am not sure if they are planning to
> do more reviews.

Thanks for the status update.

> 
> I think patches from 01 to 08 should be ok to go, they are mostly
> refactoring. I will double check if any syscall is changed over all
> the support architectures and commit them. 

Great, thanks.

> 
> I will resend the 08 to 16 with the changes I added, mainly the
> rewrite of some descriptor and the removal of the combination of
> 64-bit times with 32-bit offsets (it is not supposed to be supported).

Ok.

> 
> I do like to get this done on 2.33, as well with all other remaining
> work for y2038 support.
> 
> 

I do have pthread_rwlock_{clock|timed}{rd|wr}lock 64 bit support on my
queue as well (despite sem_{clock|timed}wait, for which I will wait a
few days and then commit it).

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/alpha/xstat.c b/sysdeps/unix/sysv/linux/alpha/xstat.c
deleted file mode 100644
index 3ba1ae1811..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/xstat.c
+++ /dev/null
@@ -1,57 +0,0 @@ 
-/* xstat using old-style Unix stat system call.
-   Copyright (C) 2004-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#define __xstat64 __xstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <kernel_stat.h>
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <xstatconv.h>
-
-#undef __xstat64
-
-
-/* Get information about the file NAME in BUF.  */
-int
-__xstat (int vers, const char *name, struct stat *buf)
-{
-  int result;
-  struct kernel_stat kbuf;
-
-  if (vers == _STAT_VER_KERNEL64)
-    {
-      result = INTERNAL_SYSCALL_CALL (stat64, name, buf);
-      if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
-	return result;
-      __set_errno (INTERNAL_SYSCALL_ERRNO (result));
-      return -1;
-    }
-
-  result = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
-  if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
-    return __xstat_conv (vers, &kbuf, buf);
-  __set_errno (INTERNAL_SYSCALL_ERRNO (result));
-  return -1;
-}
-hidden_def (__xstat)
-weak_alias (__xstat, _xstat);
-strong_alias (__xstat, __xstat64);
-hidden_ver (__xstat, __xstat64)
diff --git a/sysdeps/unix/sysv/linux/generic/xstat.c b/sysdeps/unix/sysv/linux/alpha/xstat64.c
similarity index 57%
rename from sysdeps/unix/sysv/linux/generic/xstat.c
rename to sysdeps/unix/sysv/linux/alpha/xstat64.c
index 2eb27a6f91..ac1af53780 100644
--- a/sysdeps/unix/sysv/linux/generic/xstat.c
+++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c
@@ -1,6 +1,6 @@ 
-/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
+/* xstat using old-style Unix stat system call.
+   Copyright (C) 2004-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
@@ -16,33 +16,34 @@ 
    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>
+#define __xstat __redirect___xstat
 #include <sys/stat.h>
+#undef __xstat
+#include <fcntl.h>
 #include <kernel_stat.h>
-
 #include <sysdep.h>
-#include <sys/syscall.h>
+#include <xstatconv.h>
 
 /* Get information about the file NAME in BUF.  */
 int
-__xstat (int vers, const char *name, struct stat *buf)
+__xstat64 (int vers, const char *name, struct stat64 *buf)
 {
-  if (vers == _STAT_VER_KERNEL)
-    return INLINE_SYSCALL (newfstatat, 4, AT_FDCWD, name, buf, 0);
-
-  errno = EINVAL;
-  return -1;
+  switch (vers)
+    {
+    case _STAT_VER_KERNEL64:
+      return INLINE_SYSCALL_CALL (stat64, name, buf);
+
+    default:
+      {
+        struct kernel_stat kbuf;
+	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
+	if (r == 0)
+	  return __xstat_conv (vers, &kbuf, buf);
+	return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
+      }
+    }
 }
+weak_alias (__xstat64, __xstat);
+weak_alias (__xstat64, __GI___xstat);
 
-hidden_def (__xstat)
-weak_alias (__xstat, _xstat);
-#if XSTAT_IS_XSTAT64
-#undef __xstat64
-strong_alias (__xstat, __xstat64);
-hidden_ver (__xstat, __xstat64)
-#endif
+hidden_def (__xstat64)
diff --git a/sysdeps/unix/sysv/linux/arm/xstat.c b/sysdeps/unix/sysv/linux/arm/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/arm/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
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/hppa/xstat.c b/sysdeps/unix/sysv/linux/hppa/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/hppa/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c
deleted file mode 100644
index 96f67168ac..0000000000
--- a/sysdeps/unix/sysv/linux/i386/xstat.c
+++ /dev/null
@@ -1,59 +0,0 @@ 
-/* xstat using old-style Unix stat system call.
-   Copyright (C) 1991-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
-   will complain since they don't strictly match.  */
-#define __xstat64 __xstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <kernel_stat.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <xstatconv.h>
-
-
-/* Get information about the file NAME in BUF.  */
-int
-__xstat (int vers, const char *name, struct stat *buf)
-{
-  int result;
-
-  if (vers == _STAT_VER_KERNEL)
-    return INLINE_SYSCALL (stat, 2, name, buf);
-
-  {
-    struct stat64 buf64;
-
-    result = INTERNAL_SYSCALL_CALL (stat64, name, &buf64);
-    if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
-      return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result));
-    else
-      return __xstat32_conv (vers, &buf64, buf);
-  }
-}
-hidden_def (__xstat)
-weak_alias (__xstat, _xstat);
-#if XSTAT_IS_XSTAT64
-# undef __xstat64
-strong_alias (__xstat, __xstat64);
-hidden_ver (__xstat, __xstat64)
-#endif
diff --git a/sysdeps/unix/sysv/linux/m68k/xstat.c b/sysdeps/unix/sysv/linux/m68k/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/microblaze/xstat.c b/sysdeps/unix/sysv/linux/microblaze/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/microblaze/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
index 7eee9e67d4..99b03c7593 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
+++ b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c
@@ -1,4 +1,4 @@ 
-/* xstat64 using 64-bit MIPS stat system call.
+/* xstat64 using Linux stat64 system call.
    Copyright (C) 1991-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,14 +16,9 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/stat.h>
 #include <kernel_stat.h>
-
 #include <sysdep.h>
-#include <sys/syscall.h>
-
 #include <xstatconv.h>
 
 /* Get information about the file NAME in BUF.  */
@@ -31,14 +26,9 @@ 
 int
 __xstat64 (int vers, const char *name, struct stat64 *buf)
 {
-  int result;
   struct kernel_stat kbuf;
-
-  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
-  if (result == 0)
-    result = __xstat64_conv (vers, &kbuf, buf);
-
-  return result;
+  int r = INLINE_SYSCALL_CALL (stat, name, &kbuf);
+  return r ?: __xstat64_conv (vers, &kbuf, buf);
 }
 
 hidden_def (__xstat64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c b/sysdeps/unix/sysv/linux/mips/xstat.c
similarity index 67%
rename from sysdeps/unix/sysv/linux/wordsize-64/xstat.c
rename to sysdeps/unix/sysv/linux/mips/xstat.c
index 438d54d291..835691cf89 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c
+++ b/sysdeps/unix/sysv/linux/mips/xstat.c
@@ -16,29 +16,27 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-/* Ho hum, since xstat == xstat64 we must get rid of the prototype or gcc
-   will complain since they don't strictly match.  */
-#define __xstat64 __xstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
 #include <sys/stat.h>
-
+#include <fcntl.h>
+#include <kernel_stat.h>
 #include <sysdep.h>
-#include <sys/syscall.h>
+#include <xstatconv.h>
 
 /* Get information about the file NAME in BUF.  */
 int
 __xstat (int vers, const char *name, struct stat *buf)
 {
-  if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
-    return INLINE_SYSCALL (stat, 2, name, buf);
-
-  __set_errno (EINVAL);
-  return -1;
+  switch (vers)
+    {
+    case _STAT_VER_KERNEL:
+      return INLINE_SYSCALL_CALL (stat, name, buf);
+
+    default:
+      {
+	struct kernel_stat kbuf;
+	int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf);
+	return r ?: __xstat_conv (vers, &kbuf, buf);
+      }
+    }
 }
 hidden_def (__xstat)
-weak_alias (__xstat, _xstat);
-#undef __xstat64
-strong_alias (__xstat, __xstat64);
-hidden_ver (__xstat, __xstat64)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c b/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/sh/xstat.c b/sysdeps/unix/sysv/linux/sh/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/sh/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c b/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
deleted file mode 100644
index e9869f5508..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/i386/xstat.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c b/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
deleted file mode 100644
index c3b00cb1d4..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstat.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include "../../i386/xstat.c"
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c b/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
deleted file mode 100644
index e7acd3b45e..0000000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/xstat64.c
+++ /dev/null
@@ -1 +0,0 @@ 
-/* xstat64 is in xstat.c */
diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c
index 76c90e20c7..0ae52b1901 100644
--- a/sysdeps/unix/sysv/linux/xstat.c
+++ b/sysdeps/unix/sysv/linux/xstat.c
@@ -16,44 +16,46 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
-   will complain since they don't strictly match.  */
-#define __xstat64 __xstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <kernel_stat.h>
-
 #include <sysdep.h>
-#include <sys/syscall.h>
 
-#include <xstatconv.h>
+#if !XSTAT_IS_XSTAT64
+# include <xstatconv.h>
+# include <xstatover.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 (stat, 2, name, buf);
-
-#if STAT_IS_KERNEL_STAT
-  return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
-#else
-  struct kernel_stat kbuf;
-  int result;
-
-  result = INLINE_SYSCALL (stat, 2, name, &kbuf);
-  if (result == 0)
-    result = __xstat_conv (vers, &kbuf, buf);
-
-  return result;
+  switch (vers)
+    {
+    case _STAT_VER_KERNEL:
+      {
+# if STAT_IS_KERNEL_STAT
+	/* New kABIs which uses generic pre 64-bit time Linux ABI,
+	   e.g. csky, nios2  */
+	int r = INLINE_SYSCALL_CALL (fstatat64, AT_FDCWD, name, buf, 0);
+	return r ?: stat_overflow (buf);
+# else
+	/* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k,
+	   microblaze, s390, sh, powerpc, and sparc32.  */
+	return INLINE_SYSCALL_CALL (stat, name, buf);
+# endif
+      }
+
+    default:
+      {
+# if STAT_IS_KERNEL_STAT
+	return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+# else
+	struct stat64 buf64;
+	int r = INLINE_SYSCALL_CALL (stat64, name, &buf64);
+	return r ?: __xstat32_conv (vers, &buf64, buf);
 #endif
+      }
+    }
 }
 hidden_def (__xstat)
-weak_alias (__xstat, _xstat);
-#if XSTAT_IS_XSTAT64
-#undef __xstat64
-strong_alias (__xstat, __xstat64);
-hidden_ver (__xstat, __xstat64)
-#endif
+#endif /* XSTAT_IS_XSTAT64  */
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index 16c6e69710..4feb55f429 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -16,24 +16,61 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <stddef.h>
+#define __xstat __redirect___xstat
 #include <sys/stat.h>
+#undef __xstat
+#include <fcntl.h>
 #include <kernel_stat.h>
-
 #include <sysdep.h>
-#include <sys/syscall.h>
+#include <xstatconv.h>
+#include <statx_cp.h>
 
 /* 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
+# if defined __NR_stat
+  /* Old 64-bit kABI, e.g. ia64, powerpc64*, s390x, sparc64, 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 <shlib-compat.h>
 
diff --git a/sysdeps/unix/sysv/linux/xstatover.h b/sysdeps/unix/sysv/linux/xstatover.h
new file mode 100644
index 0000000000..20178114f9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/xstatover.h
@@ -0,0 +1,67 @@ 
+/* Overflow tests for stat, statfs, and lseek functions.
+   Copyright (C) 2020 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <sys/stat.h>
+#include <sys/statfs.h>
+
+/* Test for overflows of structures where we ask the kernel to fill them
+   in with standard 64-bit syscalls but return them through APIs that
+   only expose the low 32 bits of some fields.  */
+
+static inline off_t lseek_overflow (loff_t res)
+{
+  off_t retval = (off_t) res;
+  if (retval == res)
+    return retval;
+
+  __set_errno (EOVERFLOW);
+  return (off_t) -1;
+}
+
+static inline int stat_overflow (struct stat *buf)
+{
+#if defined __INO_T_MATCHES_INO64_T || !STAT_IS_KERNEL_STAT
+  return 0;
+#else
+  if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0
+      && buf->__st_blocks_pad == 0)
+    return 0;
+
+  __set_errno (EOVERFLOW);
+  return -1;
+#endif
+}
+
+/* Note that f_files and f_ffree may validly be a sign-extended -1.  */
+static inline int statfs_overflow (struct statfs *buf)
+{
+#if __STATFS_MATCHES_STATFS64 || !STAT_IS_KERNEL_STAT
+  return 0;
+#else
+  if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0
+      && buf->__f_bavail_pad == 0
+      && (buf->__f_files_pad == 0
+	  || (buf->f_files == -1U && buf->__f_files_pad == -1))
+      && (buf->__f_ffree_pad == 0
+	  || (buf->f_ffree == -1U && buf->__f_ffree_pad == -1)))
+    return 0;
+
+  __set_errno (EOVERFLOW);
+  return -1;
+#endif
+}