From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Alistair Francis <alistair.francis@wdc.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 06/16] linux: Consolidate fxstatat{64}
Date: Fri, 24 Jul 2020 11:14:02 +0200 [thread overview]
Message-ID: <20200724111402.10ff4e20@jawa> (raw)
In-Reply-To: <20200723194641.1949404-7-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 29018 bytes --]
On Thu, 23 Jul 2020 16:46:31 -0300
Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:
> 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>
> ---
> sysdeps/unix/sysv/linux/Makefile | 3 +-
> sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c | 1 -
> sysdeps/unix/sysv/linux/alpha/fxstatat.c | 52 ---------------
> .../wordsize-32 => alpha}/fxstatat64.c | 35 +++++-----
> sysdeps/unix/sysv/linux/arm/fxstatat.c | 1 -
> sysdeps/unix/sysv/linux/fxstatat.c | 53 ++++++---------
> sysdeps/unix/sysv/linux/fxstatat64.c | 65
> +++++++++++-------- .../sysv/linux/generic/wordsize-32/fxstatat.c |
> 56 ---------------- sysdeps/unix/sysv/linux/hppa/fxstatat.c |
> 1 - sysdeps/unix/sysv/linux/i386/fxstatat.c | 54 ---------------
> sysdeps/unix/sysv/linux/m68k/fxstatat.c | 1 -
> sysdeps/unix/sysv/linux/microblaze/fxstatat.c | 1 -
> .../unix/sysv/linux/mips/mips32/fxstatat.c | 1 -
> .../{wordsize-64 => mips/mips64}/fxstatat.c | 33 +++-------
> .../unix/sysv/linux/mips/mips64/fxstatat64.c | 28 ++------
> .../sysv/linux/powerpc/powerpc32/fxstatat.c | 1 -
> .../unix/sysv/linux/s390/s390-32/fxstatat.c | 1 -
> sysdeps/unix/sysv/linux/sh/fxstatat.c | 1 -
> .../unix/sysv/linux/sparc/sparc32/fxstatat.c | 1 -
> .../sysv/linux/sparc/sparc64/dl-fxstatat64.c | 1 -
> .../unix/sysv/linux/sparc/sparc64/fxstatat.c | 1 -
> .../sysv/linux/wordsize-64/dl-fxstatat64.c | 1 -
> .../unix/sysv/linux/wordsize-64/fxstatat64.c | 1 -
> 23 files changed, 92 insertions(+), 301 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c
> delete mode 100644 sysdeps/unix/sysv/linux/alpha/fxstatat.c
> rename sysdeps/unix/sysv/linux/{generic/wordsize-32 =>
> alpha}/fxstatat64.c (53%) delete mode 100644
> sysdeps/unix/sysv/linux/arm/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c delete mode
> 100644 sysdeps/unix/sysv/linux/hppa/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/i386/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/m68k/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/microblaze/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c rename
> sysdeps/unix/sysv/linux/{wordsize-64 => mips/mips64}/fxstatat.c (56%)
> delete mode 100644
> sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c delete mode
> 100644 sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c delete mode
> 100644 sysdeps/unix/sysv/linux/sh/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c delete mode
> 100644 sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c delete mode
> 100644 sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c delete
> mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile
> b/sysdeps/unix/sysv/linux/Makefile index 9b2a253032..3c28adae0d 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -280,8 +280,7 @@ tests += tst-fallocate tst-fallocate64
> tst-o_path-locks endif
>
> ifeq ($(subdir),elf)
> -sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64
> dl-opendir \
> - dl-fxstatat64
> +sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64
> dl-opendir
> libof-lddlibc4 = lddlibc4
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c
> b/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c deleted file mode
> 100644 index 330b33f7c7..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "fxstatat.c"
> diff --git a/sysdeps/unix/sysv/linux/alpha/fxstatat.c
> b/sysdeps/unix/sysv/linux/alpha/fxstatat.c deleted file mode 100644
> index c5953d250a..0000000000
> --- a/sysdeps/unix/sysv/linux/alpha/fxstatat.c
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -/* Copyright (C) 2005-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 __fxstatat64 __fxstatat64_disable
> -
> -#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>
> -#include <xstatconv.h>
> -
> -#undef __fxstatat64
> -
> -/* Get information about the file NAME in BUF. */
> -int
> -__fxstatat (int vers, int fd, const char *file, struct stat *st, int
> flag) -{
> - int result, errno_out;
> -
> - /* ??? The __fxstatat entry point is new enough that it must be
> using
> - vers == _STAT_VER_KERNEL64. For the benefit of
> dl-fxstatat64.c, we
> - cannot actually check this, lest the compiler not optimize the
> rest
> - of the function away. */
> -
> - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag);
> - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> - return result;
> - errno_out = INTERNAL_SYSCALL_ERRNO (result);
> - __set_errno (errno_out);
> - return -1;
> -}
> -libc_hidden_def (__fxstatat)
> -strong_alias (__fxstatat, __fxstatat64);
> -libc_hidden_ver(__fxstatat, __fxstatat64);
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c
> b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c similarity index 53%
> rename from sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c
> rename to sysdeps/unix/sysv/linux/alpha/fxstatat64.c
> index 894f6dd396..f10c1d31e8 100644
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c
> +++ b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c
> @@ -1,7 +1,6 @@
> -/* __fxstatat64 () implementation.
> - Copyright (C) 2016-2020 Free Software Foundation, Inc.
> +/* fxstat 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
> @@ -17,21 +16,21 @@
> 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
> -
> +#define __fxstatat __redirect___fxstatat64
> #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)
> +#include <kernel_stat.h>
> +#include <sysdep.h>
> +#include <xstatconv.h>
> +
> +/* Get information about the file NAME in BUF. */
> +int
> +__fxstatat64 (int vers, int fd, const char *file, struct stat64 *st,
> int flag) +{
> + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag);
> +}
> +libc_hidden_def (__fxstatat64)
> +#if IS_IN(libc)
> +strong_alias (__fxstatat64, __fxstatat);
> +hidden_ver (__fxstatat64, __fxstatat)
> #endif
> diff --git a/sysdeps/unix/sysv/linux/arm/fxstatat.c
> b/sysdeps/unix/sysv/linux/arm/fxstatat.c deleted file mode 100644
> index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/arm/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/fxstatat.c
> b/sysdeps/unix/sysv/linux/fxstatat.c index 937fec45c2..0291a2c598
> 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c
> +++ b/sysdeps/unix/sysv/linux/fxstatat.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2005-2020 Free Software Foundation, Inc.
> +/* fxstatat used on fstatat, Linux implementation.
> + Copyright (C) 2005-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
> @@ -15,48 +16,36 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -/* Ho hum, if fxstatat == fxstatat64 we must get rid of the
> prototype or gcc
> - will complain since they don't strictly match. */
> -#define __fxstatat64 __fxstatat64_disable
> -
> -#include <errno.h>
> -#include <fcntl.h>
> -#include <stddef.h>
> -#include <stdio.h>
> -#include <string.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. */
> +/* Get information about the file FD in BUF. */
> int
> __fxstatat (int vers, int fd, const char *file, struct stat *st, int
> flag) {
> - int result;
> #if STAT_IS_KERNEL_STAT
> -# define kst (*st)
> -#else
> - struct kernel_stat kst;
> -#endif
> -
> - result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);
> - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result)))
> + /* New kABIs which uses generic pre 64-bit time Linux ABI, e.g.
> + csky, nios2 */
> + if (vers == _STAT_VER_KERNEL)
> {
> -#if STAT_IS_KERNEL_STAT
> - return 0;
> + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag);
> + return r ?: stat_overflow (st);
> + }
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> #else
> - return __xstat_conv (vers, &kst, st);
> + /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k,
> mips32,
> + microblaze, s390, sh, powerpc32, and sparc32. */
> + struct stat64 st64;
> + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag);
> + return r ?: __xstat32_conv (vers, &st64, st);
> #endif
> - }
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO
> (result)); }
> libc_hidden_def (__fxstatat)
> -#if XSTAT_IS_XSTAT64
> -# undef __fxstatat64
> -strong_alias (__fxstatat, __fxstatat64);
> -libc_hidden_def (__fxstatat64)
> -#endif
> +
> +#endif /* XSTAT_IS_XSTAT64 */
> diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c
> b/sysdeps/unix/sysv/linux/fxstatat64.c index e24b456604..ac33ab4fc9
> 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c
> +++ b/sysdeps/unix/sysv/linux/fxstatat64.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2005-2020 Free Software Foundation, Inc.
> +/* fxstatat64 used on fstatat64, Linux implementation.
> + Copyright (C) 2005-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
> @@ -15,41 +16,53 @@
> 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 <string.h>
> +#define __fxstatat __redirect___fxstatat
> #include <sys/stat.h>
> +#undef __fxstatat
> +#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. */
> +/* Get information about the file FD in BUF. */
>
> int
> __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st,
> int flag) {
> - if (__glibc_unlikely (vers != _STAT_VER_LINUX))
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> -
> - int result;
> -
> -#ifdef __NR_fstatat64
> - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag);
> +#if XSTAT_IS_XSTAT64
> +# ifdef __NR_newfstatat
> + /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and
> + x86_64. */
> + if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
> + return INLINE_SYSCALL_CALL (newfstatat, fd, file, st, flag);
> +# elif defined __NR_fstatat64
> + /* 64-bit kABI outlier, e.g. sparc64. */
> + struct stat64 st64;
> + int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag);
> + return r ?: __xstat32_conv (vers, &st64, (struct stat *) st);
> +# 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, fd, file, AT_NO_AUTOMOUNT
> | flag,
> + STATX_BASIC_STATS, &tmp);
> + if (r == 0)
> + __cp_stat64_statx (st, &tmp);
> + return r;
> + }
> +# endif
> #else
> - struct statx tmp;
> -
> - result = INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT |
> flag,
> - STATX_BASIC_STATS, &tmp);
> - if (result == 0)
> - __cp_stat64_statx (st, &tmp);
> + /* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa,
> m68k,
> + microblaze, mips32, nios2, sh, powerpc32, and sparc32. */
> + if (vers == _STAT_VER_LINUX)
> + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag);
> #endif
> - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result)))
> - return 0;
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO
> (result));
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> }
> libc_hidden_def (__fxstatat64)
> +#if XSTAT_IS_XSTAT64 && IS_IN(libc)
> +strong_alias (__fxstatat64, __fxstatat);
> +hidden_ver (__fxstatat64, __fxstatat)
> +#endif
> 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/hppa/fxstatat.c
> b/sysdeps/unix/sysv/linux/hppa/fxstatat.c deleted file mode 100644
> index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c
> b/sysdeps/unix/sysv/linux/i386/fxstatat.c deleted file mode 100644
> index f720f6e429..0000000000
> --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -/* Copyright (C) 2005-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 fxstatat == fxstatat64 we must get rid of the
> prototype or gcc
> - will complain since they don't strictly match. */
> -#define __fxstatat64 __fxstatat64_disable
> -
> -#include <errno.h>
> -#include <fcntl.h>
> -#include <stddef.h>
> -#include <stdio.h>
> -#include <string.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 relative to FD in ST. */
> -int
> -__fxstatat (int vers, int fd, const char *file, struct stat *st, int
> flag) -{
> - int result;
> - struct stat64 st64;
> -
> - result = INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag);
> - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO
> (result));
> - else
> - return __xstat32_conv (vers, &st64, st);
> -}
> -libc_hidden_def (__fxstatat)
> -#if XSTAT_IS_XSTAT64
> -# undef __fxstatat64
> -strong_alias (__fxstatat, __fxstatat64);
> -libc_hidden_ver (__fxstatat, __fxstatat64)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/fxstatat.c
> b/sysdeps/unix/sysv/linux/m68k/fxstatat.c deleted file mode 100644
> index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c
> b/sysdeps/unix/sysv/linux/microblaze/fxstatat.c deleted file mode
> 100644 index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c
> b/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c deleted file mode
> 100644 index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c
> b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c similarity index 56%
> rename from sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c
> rename to sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c
> index b8f5ab562e..58410a1441 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2005-2020 Free Software Foundation, Inc.
> +/* fxstat using old-style Unix fstat 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
> @@ -15,34 +16,18 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -/* Ho hum, since fxstatat == fxstatat64 we must get rid of the
> - prototype or gcc will complain since they don't strictly match.
> */ -#define __fxstatat64 __fxstatat64_disable
> -
> -#include <errno.h>
> -#include <fcntl.h>
> -#include <stddef.h>
> -#include <stdio.h>
> -#include <string.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 relative to FD in ST. */
> +/* Get information about the file FD in BUF. */
> int
> __fxstatat (int vers, int fd, const char *file, struct stat *st, int
> flag) {
> - if (vers != _STAT_VER_KERNEL && vers != _STAT_VER_LINUX)
> - {
> - __set_errno (EINVAL);
> - return -1;
> - }
> -
> - return INLINE_SYSCALL (newfstatat, 4, fd, file, st, flag);
> + struct kernel_stat kst;
> + int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);
> + return r ?: __xstat_conv (vers, &kst, st);
> }
> libc_hidden_def (__fxstatat)
> -#undef __fxstatat64
> -strong_alias (__fxstatat, __fxstatat64);
> -strong_alias (__fxstatat64, __GI___fxstatat64)
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c
> b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index
> 62df5fb26c..e5416d8971 100644 ---
> a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++
> b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -15,17 +15,9 @@
> 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 <string.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. */
> @@ -33,22 +25,12 @@
> int
> __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st,
> int flag) {
> - if (__builtin_expect (vers != _STAT_VER_LINUX, 0))
> - {
> - __set_errno (EINVAL);
> - return -1;
> - }
> -
> - int result;
> - struct kernel_stat kst;
> -
> - result = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag);
> - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result)))
> - return __xstat64_conv (vers, &kst, st);
> - else
> + if (vers == _STAT_VER_LINUX)
> {
> - __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> - return -1;
> + struct kernel_stat kst;
> + int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst,
> flag);;
> + return r ?: __xstat64_conv (vers, &kst, st);
> }
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> }
> libc_hidden_def (__fxstatat64)
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c
> b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c deleted file
> mode 100644 index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c
> b/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c deleted file mode
> 100644 index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/sh/fxstatat.c
> b/sysdeps/unix/sysv/linux/sh/fxstatat.c deleted file mode 100644
> index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/sh/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c deleted file mode
> 100644 index 0f8b3135d8..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
> b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c deleted file
> mode 100644 index 330b33f7c7..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "fxstatat.c"
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c deleted file mode
> 100644 index db08af8e0f..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "../../i386/fxstatat.c"
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
> b/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c deleted file
> mode 100644 index 330b33f7c7..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "fxstatat.c"
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c
> b/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c deleted file mode
> 100644 index 05e7f413bb..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* fxstatat64 is in fxstatat.c */
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-07-24 9:14 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 19:46 [PATCH 00/16] Add y2038 support for stat functions Adhemerval Zanella via Libc-alpha
2020-07-23 19:46 ` [PATCH 01/16] linux: Always define STAT_IS_KERNEL_STAT Adhemerval Zanella via Libc-alpha
2020-07-24 8:17 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 02/16] linux: Define STAT64_IS_KERNEL_STAT64 Adhemerval Zanella via Libc-alpha
2020-07-24 8:20 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 03/16] linux: Consolidate xstat{64} Adhemerval Zanella via Libc-alpha
2020-07-23 20:51 ` Joseph Myers
2020-07-24 8:34 ` Lukasz Majewski
2020-09-09 14:46 ` Lukasz Majewski
2020-09-09 18:05 ` Adhemerval Zanella via Libc-alpha
2020-09-10 7:10 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 04/16] linux: Consolidate lxstat{64} Adhemerval Zanella via Libc-alpha
2020-07-24 8:43 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 05/16] linux: Consolidate fxstat{64} Adhemerval Zanella via Libc-alpha
2020-07-24 9:04 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 06/16] linux: Consolidate fxstatat{64} Adhemerval Zanella via Libc-alpha
2020-07-24 9:14 ` Lukasz Majewski [this message]
2020-07-23 19:46 ` [PATCH 07/16] Linux: Consolidate xmknod Adhemerval Zanella via Libc-alpha
2020-07-24 9:14 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 08/16] Remove internal usage of extensible stat functions Adhemerval Zanella via Libc-alpha
2020-07-24 9:16 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 09/16] Remove stat wrapper functions, move them to exported symbols Adhemerval Zanella via Libc-alpha
2020-07-24 9:23 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 10/16] Remove mknod wrapper functions, move them to symbols Adhemerval Zanella via Libc-alpha
2020-07-23 20:53 ` Joseph Myers
2020-07-23 20:58 ` Adhemerval Zanella via Libc-alpha
2020-07-23 21:01 ` Joseph Myers
2020-07-24 9:25 ` Lukasz Majewski
2020-10-12 22:27 ` Joseph Myers
2020-10-13 0:58 ` Adhemerval Zanella via Libc-alpha
2020-07-23 19:46 ` [PATCH 11/16] linux: Move the struct stat{64} to struct_stat.h Adhemerval Zanella via Libc-alpha
2020-07-24 9:27 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 12/16] linux: Implement {l}fstat{at} in terms of fstatat Adhemerval Zanella via Libc-alpha
2020-07-24 9:29 ` Lukasz Majewski
2020-07-23 19:46 ` [PATCH 13/16] linux: Disentangle fstatat from fxstatat Adhemerval Zanella via Libc-alpha
2020-07-24 9:39 ` Lukasz Majewski
2020-07-24 10:25 ` Florian Weimer via Libc-alpha
2020-07-24 14:39 ` Adhemerval Zanella via Libc-alpha
2020-07-23 19:46 ` [PATCH 14/16] linux: Move {f}xstat{at} to compat symbols Adhemerval Zanella via Libc-alpha
2020-07-24 9:40 ` Lukasz Majewski
2020-10-21 5:21 ` __xstat et al. as compat symbols (was: Re: [PATCH 14/16] linux: Move {f}xstat{at} to compat symbols) Florian Weimer via Libc-alpha
2020-10-21 11:59 ` Adhemerval Zanella via Libc-alpha
2020-10-21 12:57 ` __xstat et al. as compat symbols Florian Weimer via Libc-alpha
2020-10-21 13:09 ` Adhemerval Zanella via Libc-alpha
2020-10-22 10:08 ` Florian Weimer via Libc-alpha
2020-10-22 12:43 ` Adhemerval Zanella via Libc-alpha
2020-10-22 15:37 ` Florian Weimer via Libc-alpha
2020-10-22 16:40 ` Adhemerval Zanella via Libc-alpha
2020-10-22 18:04 ` Adhemerval Zanella via Libc-alpha
2020-07-23 19:46 ` [PATCH 15/16] linux: Add {f}stat{at} y2038 support Adhemerval Zanella via Libc-alpha
2020-07-23 20:55 ` Joseph Myers
2020-07-23 21:00 ` Adhemerval Zanella via Libc-alpha
2020-07-24 10:53 ` Lukasz Majewski
2020-07-30 12:42 ` Adhemerval Zanella via Libc-alpha
2020-08-02 19:46 ` Maciej W. Rozycki via Libc-alpha
2020-10-06 9:48 ` Lukasz Majewski
2020-10-07 12:52 ` Adhemerval Zanella via Libc-alpha
2020-10-07 14:25 ` Adhemerval Zanella via Libc-alpha
2020-10-07 20:20 ` Lukasz Majewski
2020-10-07 21:01 ` Adhemerval Zanella via Libc-alpha
2020-10-07 21:07 ` Adhemerval Zanella via Libc-alpha
2020-10-08 7:57 ` Lukasz Majewski
2020-10-09 14:05 ` Adhemerval Zanella via Libc-alpha
2020-10-09 15:39 ` Lukasz Majewski
2020-10-09 20:06 ` Adhemerval Zanella via Libc-alpha
2020-10-13 13:58 ` Lukasz Majewski
2020-10-13 14:18 ` Adhemerval Zanella via Libc-alpha
2020-10-13 14:23 ` H.J. Lu via Libc-alpha
2020-10-13 14:27 ` Adhemerval Zanella via Libc-alpha
2020-10-13 18:14 ` Adhemerval Zanella via Libc-alpha
2020-10-13 21:20 ` Lukasz Majewski
2020-10-13 21:40 ` Lukasz Majewski
2020-10-14 13:15 ` Lukasz Majewski
2020-10-14 13:39 ` Adhemerval Zanella via Libc-alpha
2020-07-23 19:46 ` [PATCH 16/16] linux: Move xmknoda{at} to compat symbols Adhemerval Zanella via Libc-alpha
2020-07-24 10:30 ` Florian Weimer via Libc-alpha
2020-07-24 12:34 ` Adhemerval Zanella via Libc-alpha
2020-07-24 12:43 ` Florian Weimer via Libc-alpha
2020-07-24 12:49 ` Adhemerval Zanella via Libc-alpha
2020-07-24 10:43 ` Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724111402.10ff4e20@jawa \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).