From 96b7fe424371f19dd360eb2ab356ff85d2775344 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 6 Jul 2016 08:52:11 -0300 Subject: Consolidate posix_fadvise implementations This patch consolidates mostly of the Linux posix_fadvise{64} implementations on sysdeps/unix/sysv/linux/posix_fadvise{64}.c. It still keeps arch-specific files for: * S390-32: it uses a packed structure to pass all the arguments on syscall. It is the only supported port that implements __NR_fadvise64_64 in this way. * ARM: it does not implement __NR_fadvise64 (as other 32-bits ports), so posix_fadvise calls internal posix_fadvise64 symbol. * MIPS64 n64: it requires a different version number that other ports. The new macro SYSCALL_LL{64} is used to handle the offset argument and INTERNAL_SYSCALL_CALL to handle passing the correct number of expect arguments. The default Linux adds two new defines a port can use to control how __NR_fadvise64_64 passes the kernel arguments: * __ASSUME_FADVISE64_64_6ARG: the 'advise' argument is moved on second position. This is the case of powerpc32 and arm to avoid implement 7 argument syscall. * __ASSUME_FADVISE64_64_NO_ALIGN: for ABIs that defines __ASSUME_ALIGNED_REGISTER_PAIRS packs the offset without the leading '0'. This is the case of tile 32 bits. ARM also defines __NR_fadvise64_64 as __NR_arm_fadvise64_64 (which is also handled on arch kernel-feature.h). Tested on x86_64, x32, i686, armhf, and aarch64. * posix/Makefile (tests): Add tst-posix_fadvise and tst-posix_fadvise64. * posix/tst-posix_fadvise.c: New file. * posix/tst-posix_fadvise64.c: Likewise. * posix/tst-posix_fadvise-common.c: Likewise. * sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_FADVISE64_64_6ARG): Define. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h [!__powerpc64__] (__ASSUME_FADVISE64_64_6ARG): Add define. * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c: Remove file. * sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: Alias to __posix_fadvise64_l32. (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l32]: Add compat definition to posix_fadvise64. (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: Add versioned definition to posix_fadvise64. * sysdeps/unix/sysv/linux/posix_fadvise.c (posix_fadvise): Build iff __OFF_T_MATCHES_OFF64_T is defined, use INTERNAL_SYSCALL_CALL, add __ASSUME_FADVISE64_64_6ARG/__ASSUME_FADVISE64_64_NO_ALIGN support. * sysdeps/unix/sysv/linux/posix_fadvise64.c (posix_fadvise64): Add __ASSUME_FADVISE64_64_NO_ALIGN support and use INTERNAL_SYSCALL_CALL. --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index d43c932b10..21a2a133fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,41 @@ 2016-10-07 Adhemerval Zanella + * posix/Makefile (tests): Add tst-posix_fadvise and tst-posix_fadvise64. + * posix/tst-posix_fadvise.c: New file. + * posix/tst-posix_fadvise64.c: Likewise. + * posix/tst-posix_fadvise-common.c: Likewise. + * sysdeps/unix/sysv/linux/arm/kernel-features.h + (__ASSUME_FADVISE64_64_6ARG): Define. + * sysdeps/unix/sysv/linux/powerpc/kernel-features.h + [!__powerpc64__] (__ASSUME_FADVISE64_64_6ARG): Define. + * sysdeps/unix/sysv/linux/tile/kernel-features.h + [!LP64] (__ASSUME_FADVISE64_64_NO_ALIGN): Define. + * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c: Remove file. + * sysdeps/unix/sysv/linux/generic/wordsize-32/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/i386/posix_fadvise64.S: Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/posix_fadvise64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fadvise64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c: + Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c: Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise64.c + (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: + Alias to __posix_fadvise64_l32. + (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l32]: + Add compat definition to posix_fadvise64. + (SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) [__posix_fadvise64_l64]: + Add versioned definition to posix_fadvise64. + * sysdeps/unix/sysv/linux/posix_fadvise.c (posix_fadvise): Build iff + __OFF_T_MATCHES_OFF64_T is defined, use INTERNAL_SYSCALL_CALL, add + __ASSUME_FADVISE64_64_6ARG/__ASSUME_FADVISE64_64_NO_ALIGN support. + * sysdeps/unix/sysv/linux/posix_fadvise64.c (posix_fadvise64): Add + __ASSUME_FADVISE64_64_NO_ALIGN support and use INTERNAL_SYSCALL_CALL. + * io/Makefile (tests): Add tst-posix_fallocate and tst-posix_fallocate64. * io/tst-posix_fallocate-common.c: New file. -- cgit 1.4.1