mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 02:03:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux: Consolidate fxstat{64}

Browse Source 
The LFS support is implemented on fxstat64.c, instead of fxstat.c for
64-bit architectures.  The fxstat.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 issuess __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_fstat, otherwise it calls __NR_fstat64 and convert
     to non-LFS stat struct and handle possible overflows on st_ino,
     st_size, or st_blocks.

Also 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 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 issuess __NR_fstat for _STAT_VER_KERNEL or
	 _STAT_VER_LINUX.

    1.2. Old 64-bit kABI with defines __NR_fstat64 instead of __NR_fstat
         (sparc64): it issues __NR_fstat for _STAT_VER_KERNEL or
         __NR_fstat64 and convert to struct stat64.

    1.3. New 32-bit kABIs with only 64-bit time_t support (arc and
	 riscv32): it issuess __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 requires to handle _STAT_VER_KERNEL64 to issues
     __NR_fstat64 and use the kernel_stat with __NR_fstat 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>
This commit is contained in:
Adhemerval Zanella 2020-07-15 16:34:47 +00:00
parent 4f40e6adc4
commit 5febe6a38f
18 changed files with 105 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sysdeps/unix/sysv/linux/alpha/fxstat.c → sysdeps/unix/sysv/linux/alpha/fxstat64.c
View File

@ -1,4 +1,4 @@
/* fxstat using old-style Unix stat system call.
/* fxstat64 using old-style Unix stat system call.
Copyright (C) 2004-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -16,42 +16,32 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
#define __fxstat64 __fxstat64_disable
#include <errno.h>
#include <stddef.h>
#define __fxstat __redirect___fxstat64
#include <sys/stat.h>
#undef __fxstat
#include <kernel_stat.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <xstatconv.h>
#undef __fxstat64
/* Get information about the file NAME in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
__fxstat64 (int vers, int fd, struct stat64 *buf)
{
int result;
struct kernel_stat kbuf;
if (vers == _STAT_VER_KERNEL64)
switch (vers)
{
result = INTERNAL_SYSCALL_CALL (fstat64, fd, buf);
if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
return result;
__set_errno (INTERNAL_SYSCALL_ERRNO (result));
return -1;
}
case _STAT_VER_KERNEL64:
return INLINE_SYSCALL_CALL (fstat64, fd, buf);
result = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
return __xstat_conv (vers, &kbuf, buf);
__set_errno (INTERNAL_SYSCALL_ERRNO (result));
return -1;
default:
{
struct kernel_stat kbuf;
int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
if (r == 0)
return __xstat_conv (vers, &kbuf, buf);
return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
}
}
}
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)
hidden_def (__fxstat64)
strong_alias (__fxstat64, __fxstat);
hidden_ver (__fxstat64, __fxstat)

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

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

60
sysdeps/unix/sysv/linux/fxstat.c
View File

@ -16,46 +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 __fxstat64 __fxstat64_disable
#include <errno.h>
#include <stddef.h>
#include <sys/types.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 FD in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL)
return INLINE_SYSCALL (fstat, 2, fd, buf);
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 (fstat64, fd, buf);
return r ?: stat_overflow (buf);
# else
/* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k,
microblaze, s390, sh, powerpc, and sparc. */
return INLINE_SYSCALL_CALL (fstat, fd, buf);
# endif
}
#if STAT_IS_KERNEL_STAT
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
#else
struct kernel_stat kbuf;
int result;
result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
if (result == 0)
result = __xstat_conv (vers, &kbuf, buf);
return result;
default:
{
# if STAT_IS_KERNEL_STAT
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
# else
struct stat64 buf64;
int r = INLINE_SYSCALL_CALL (fstat64, fd, &buf64);
return r ?: __xstat32_conv (vers, &buf64, buf);
#endif
}
}
}
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
#if XSTAT_IS_XSTAT64
#undef __fxstat64
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)
#endif
#endif /* XSTAT_IS_XSTAT64 */

53
sysdeps/unix/sysv/linux/fxstat64.c
View File

@ -16,15 +16,13 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <stddef.h>
#include <fcntl.h>
#define __fxstat __redirect___fxstat
#include <sys/stat.h>
#undef __fxstat
#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 FD in BUF. */
@ -32,17 +30,37 @@
int
___fxstat64 (int vers, int fd, struct stat64 *buf)
{
int result;
#ifdef __NR_fstat64
result = INLINE_SYSCALL (fstat64, 2, fd, buf);
#else
#if XSTAT_IS_XSTAT64
# ifdef __NR_fstat64
/* 64-bit kABI outlier, e.g. sparc64. */
if (vers == _STAT_VER_KERNEL)
return INLINE_SYSCALL_CALL (fstat, fd, buf);
else
{
struct stat64 st64;
int r = INLINE_SYSCALL_CALL (fstat64, fd, &st64);
return r ?: __xstat32_conv (vers, &st64, (struct stat *) buf);
}
# elif defined __NR_fstat
/* 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 (fstat, fd, buf);
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
# else
/* New 32-bit kABIs with only 64-bit time_t support, e.g. arc, riscv32. */
struct statx tmp;
result = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS,
&tmp);
if (result == 0)
int r = INLINE_SYSCALL_CALL (statx, fd, "", AT_EMPTY_PATH,
STATX_BASIC_STATS, &tmp);
if (r == 0)
__cp_stat64_statx (buf, &tmp);
#endif
return result;
return r;
# endif
#else
/* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa, m68k,
microblaze, mips32, nios2, sh, powerpc32, and sparc32. */
return INLINE_SYSCALL_CALL (fstat64, fd, buf);
#endif /* XSTAT_IS_XSTAT64 */
}
#include <shlib-compat.h>
@ -56,3 +74,8 @@ hidden_ver (___fxstat64, __fxstat64)
strong_alias (___fxstat64, __fxstat64)
hidden_def (__fxstat64)
#endif
#if XSTAT_IS_XSTAT64
strong_alias (__fxstat64, __fxstat);
hidden_ver (__fxstat64, __fxstat)
#endif

57
sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
View File

@ -1,57 +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/types.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 FD in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL)
{
# ifdef __NR_fstat64
int rc = INLINE_SYSCALL (fstat64, 2, fd, buf);
# else
struct statx tmp;
int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH,
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 (__fxstat)
weak_alias (__fxstat, _fxstat);
#endif

36
sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c
View File

@ -1,36 +0,0 @@
/* __fxstat64 () implementation.
Copyright (C) 2016-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
/* Hide the prototypes for __fxstat and _fxstat so that GCC will not
complain about the different function signatures if they are aliased
to __fxstat64. If XSTAT_IS_XSTAT64 is set to non-zero then the stat and
stat64 structures have an identical layout but different type names. */
#define __fxstat __fxstat_disable
#define _fxstat _fxstat_disable
#include <sysdeps/unix/sysv/linux/fxstat64.c>
#undef __fxstat
#undef _fxstat
#if XSTAT_IS_XSTAT64
weak_alias (__fxstat64, __fxstat)
weak_alias (__fxstat64, _fxstat)
hidden_ver (__fxstat64, __fxstat)
#endif

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

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

59
sysdeps/unix/sysv/linux/i386/fxstat.c
View File

@ -1,59 +0,0 @@
/* 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
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 __fxstat64 __fxstat64_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 FD in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
int result;
if (vers == _STAT_VER_KERNEL)
return INLINE_SYSCALL (fstat, 2, fd, buf);
{
struct stat64 buf64;
result = INTERNAL_SYSCALL_CALL (fstat64, fd, &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 (__fxstat)
weak_alias (__fxstat, _fxstat);
#if XSTAT_IS_XSTAT64
#undef __fxstat64
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)
#endif

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

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

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

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

35
sysdeps/unix/sysv/linux/wordsize-64/fxstat.c → sysdeps/unix/sysv/linux/mips/fxstat.c
View File

@ -1,4 +1,4 @@
/* fxstat using old-style Unix fstat system call.
/* fxstat using old-style Unix stat system call.
Copyright (C) 1991-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -16,30 +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 __fxstat64 __fxstat64_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 FD in BUF. */
/* Get information about the file NAME in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
return INLINE_SYSCALL (fstat, 2, fd, buf);
switch (vers)
{
case _STAT_VER_KERNEL:
return INLINE_SYSCALL_CALL (fstat, fd, buf);
__set_errno (EINVAL);
return -1;
default:
{
struct kernel_stat kbuf;
int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
return r ?: __xstat_conv (vers, &kbuf, buf);
}
}
}
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
#undef __fxstat64
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)

13
sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c
View File

@ -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 FD in BUF. */
@ -31,14 +26,10 @@
int
__fxstat64 (int vers, int fd, struct stat64 *buf)
{
int result;
struct kernel_stat kbuf;
int r = INLINE_SYSCALL_CALL (fstat, fd, &kbuf);
return r ?: __xstat64_conv (vers, &kbuf, buf);
result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
if (result == 0)
result = __xstat64_conv (vers, &kbuf, buf);
return result;
}
hidden_def (__fxstat64)

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

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

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

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

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

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

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

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

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

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

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

@ -1 +0,0 @@
/* fxstat64 is in fxstat.c */