qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: Consolidate fxstatat{64} 

The LFS support is implemented on fxstat64.c, instead of fxstat.c for
64-bit architectures.  The fxstatat.c implements the non-LFS and it is
a no-op for !XSTAT_IS_XSTAT64.

The generic non-LFS implementation handles two cases:

  1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
     nios): it issues __NR_fstatat64 plus handle the overflow on st_ino,
     st_size, or st_blocks.  It only handles _STAT_VER_KERNEL.

  2. Old kABIs with old non-LFS support (arm, i386, hppa, m68k, mips32,
     microblaze, s390, sh, powerpc, and sparc32).  it issues
     __NR_fstatat64 and convert to non-LFS stat struct based on the
     version.

Also non-LFS mips64 is an outlier and it has its own implementation
since _STAT_VER_LINUX requires a different conversion function (it
uses the kernel_stat as the sysissues argument since its exported ABI
is different than the kernel one for both non-LFS and LFS
implementation).

The generic LFS implementation handles multiple cases:

  1. XSTAT_IS_XSTAT64 being 1:

    1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, riscv64, and
         x86_64): it issues __NR_newfstatat for _STAT_VER_KERNEL or
         _STAT_VER_LINUX.

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

    1.3. New 32-bit kABIs with only 64-bit time_t support (arc and
	 riscv32): it issues __NR_statx and covert to struct stat64.

  2. Old ABIs with XSTAT_IS_XSTAT64 being 0 (arm, csky, i386, hppa, m68k,
     microblaze, mips32, nios2, sh, powerpc32, and sparc32): it issues
     __NR_fstat64.

Also, two special cases requires specific implementations:

  1. alpha: it uses the __NR_fstatat64 syscall instead.

  2. mips64: as for non-LFS implementation its ABIs differ from
     glibc exported one, which requires an specific conversion
     function to handle the kernel_stat.

Checked with a build for all affected ABIs. I also checked on x86_64,
i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2020-07-15 18:05:52 +00:00
parent 5febe6a38f
commit 5f85cc2f47
23 changed files with 93 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/unix/sysv/linux/Makefile
View File

@ -281,8 +281,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

1
sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c
View File

@ -1 +0,0 @@
#include "fxstatat.c"

52
sysdeps/unix/sysv/linux/alpha/fxstatat.c
View File

@ -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);

35
sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c → sysdeps/unix/sysv/linux/alpha/fxstatat64.c
View File

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

1
sysdeps/unix/sysv/linux/arm/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

55
sysdeps/unix/sysv/linux/fxstatat.c
View File

@ -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;
#else
return __xstat_conv (vers, &kst, st);
#endif
int r = INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag);
return r ?: stat_overflow (st);
}
return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result));
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
#else
/* 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
}
libc_hidden_def (__fxstatat)
#if XSTAT_IS_XSTAT64
# undef __fxstatat64
strong_alias (__fxstatat, __fxstatat64);
libc_hidden_def (__fxstatat64)
#endif
#endif /* XSTAT_IS_XSTAT64 */

65
sysdeps/unix/sysv/linux/fxstatat64.c
View File

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

56
sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
View File

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

1
sysdeps/unix/sysv/linux/hppa/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

54
sysdeps/unix/sysv/linux/i386/fxstatat.c
View File

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

1
sysdeps/unix/sysv/linux/m68k/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/microblaze/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

33
sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c → sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c
View File

@ -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)

28
sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c
View File

@ -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))
if (vers == _STAT_VER_LINUX)
{
__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
{
__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)

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/sh/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/i386/fxstatat.c>

1
sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
View File

@ -1 +0,0 @@
#include "fxstatat.c"

1
sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c
View File

@ -1 +0,0 @@
#include "../../i386/fxstatat.c"

1
sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c
View File

@ -1 +0,0 @@
#include "fxstatat.c"

1
sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c
View File

@ -1 +0,0 @@
/* fxstatat64 is in fxstatat.c */