diff mbox

Consolidate fallocate/fallocate64 implementations

Message ID 1467056073-8061-1-git-send-email-adhemerval.zanella@linaro.org
State Superseded
Headers show

Commit Message

Adhemerval Zanella June 27, 2016, 7:34 p.m. UTC
This patch consolidates all the fallocate{64} implementation for Linux
in only one (sysdeps/unix/sysv/linux/fallocate{64}.c).  It also removes the
syscall from the auto-generation using assembly macros.

The new macro SYSCALL_LL{64} is used to handle the offset argument, using
the same strategy used in previous p{read,write}{64} consolidation:

  1. Each architecture/ABI defines if its a ILP32 (__ASSUME_WORDSIZE64_ILP32)
     and if off64_t differs in size of off_t (__ASSUME_OFF_DIFF_OFF64).
     Currently, x32 defines __ASSUME_WORDSIZE64_ILP32 and only MIPS64-n32
     defines both __ASSUME_WORDSIZE64_ILP32 and __ASSUME_OFF_DIFF_OFF64.

  2. For the default function implementation (without the 64 suffix)
     the symbol will be built if is 32-bits (__WORDSIZE == 64) or
     if off_t differs in size from off64_t (__ASSUME_OFF_DIFF_OFF64).

     It means that for architecture that only pass 64-bit off_t this
     symbol won't be build.

  3. The 64 variant of the function implementation (with the 64 suffix)
     will be always build and a weak alias for the non-suffix variant
     will be created if __WORDSIZE == 64 and if size of off64_t differs
     from off_t.

Checked on x86_64, x32, i386, aarch64, and ppc64le.

	* sysdeps/unix/sysv/linux/fallocate.c (fallocate): Use SYSCALL_LL
	macro on offset argument.
	* sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use
	SYSCALL_LL64 on offset argument.
	* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c: Remove file.
	* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c: Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (fallocate): Remove
	syscall auto-generation.
	* sysdeps/unix/sysv/linux/Makefile (test): Add tst-fallocate and
	tst-fallocate64.
	* sysdeps/unix/sysv/linux/tst-fallocate.c: New file.
	* sysdeps/unix/sysv/linux/tst-fallocate64.c: Likewise.
---
 ChangeLog                                          |  19 ++++
 sysdeps/unix/sysv/linux/Makefile                   |   3 +-
 sysdeps/unix/sysv/linux/fallocate.c                |  11 +-
 sysdeps/unix/sysv/linux/fallocate64.c              |  14 +--
 .../unix/sysv/linux/mips/mips64/n32/fallocate.c    |  33 ------
 .../unix/sysv/linux/mips/mips64/n32/fallocate64.c  |  33 ------
 .../unix/sysv/linux/mips/mips64/n64/fallocate.c    |   1 -
 .../unix/sysv/linux/mips/mips64/n64/fallocate64.c  |   1 -
 sysdeps/unix/sysv/linux/tst-fallocate.c            | 117 +++++++++++++++++++++
 sysdeps/unix/sysv/linux/tst-fallocate64.c          |  21 ++++
 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c    |  34 ------
 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c  |   1 -
 sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list   |   1 -
 13 files changed, 167 insertions(+), 122 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c
 create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate.c
 create mode 100644 sysdeps/unix/sysv/linux/tst-fallocate64.c
 delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
 delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c

Comments

Arnd Bergmann June 27, 2016, 9:43 p.m. UTC | #1
On Monday, June 27, 2016 4:34:33 PM CEST Adhemerval Zanella wrote:
> diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
> index 6a58a5f..e648a73 100644
> --- a/sysdeps/unix/sysv/linux/fallocate.c
> +++ b/sysdeps/unix/sysv/linux/fallocate.c
> @@ -19,17 +19,12 @@
>  #include <fcntl.h>
>  #include <sysdep-cancel.h>
>  
> +#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
>  /* Reserve storage for the data of the file associated with FD.  */
>  int
>  fallocate (int fd, int mode, __off_t offset, __off_t len)
>  {
>    return SYSCALL_CANCEL (fallocate, fd, mode,
> +                        SYSCALL_LL (offset), SYSCALL_LL (len));
>  }
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c
> index 8e76d6f..176caa8 100644
> --- a/sysdeps/unix/sysv/linux/fallocate64.c
> +++ b/sysdeps/unix/sysv/linux/fallocate64.c
> @@ -24,14 +24,10 @@
>  int
>  fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
>  {
>    return SYSCALL_CANCEL (fallocate, fd, mode,
> +                        SYSCALL_LL64 (offset), SYSCALL_LL64 (len));
>  }
> +
> +#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
> +weak_alias (fallocate64, fallocate)
> +#endif
> 

How should this work for new 32-bit architectures when they do
not set __ASSUME_OFF_DIFF_OFF64?

It looks like you have two identical implementations then, though
you would want to have just one of them plus an alias.

Maybe the "__WORDSIZE == 64" check can simply be dropped and all
existing 32-bit architectures set __ASSUME_OFF_DIFF_OFF64 instead?

	Arnd
Adhemerval Zanella June 27, 2016, 10:53 p.m. UTC | #2
On 27/06/2016 18:43, Arnd Bergmann wrote:
> On Monday, June 27, 2016 4:34:33 PM CEST Adhemerval Zanella wrote:
>> diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
>> index 6a58a5f..e648a73 100644
>> --- a/sysdeps/unix/sysv/linux/fallocate.c
>> +++ b/sysdeps/unix/sysv/linux/fallocate.c
>> @@ -19,17 +19,12 @@
>>  #include <fcntl.h>
>>  #include <sysdep-cancel.h>
>>  
>> +#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
>>  /* Reserve storage for the data of the file associated with FD.  */
>>  int
>>  fallocate (int fd, int mode, __off_t offset, __off_t len)
>>  {
>>    return SYSCALL_CANCEL (fallocate, fd, mode,
>> +                        SYSCALL_LL (offset), SYSCALL_LL (len));
>>  }
>> +#endif
>> diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c
>> index 8e76d6f..176caa8 100644
>> --- a/sysdeps/unix/sysv/linux/fallocate64.c
>> +++ b/sysdeps/unix/sysv/linux/fallocate64.c
>> @@ -24,14 +24,10 @@
>>  int
>>  fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
>>  {
>>    return SYSCALL_CANCEL (fallocate, fd, mode,
>> +                        SYSCALL_LL64 (offset), SYSCALL_LL64 (len));
>>  }
>> +
>> +#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
>> +weak_alias (fallocate64, fallocate)
>> +#endif
>>
> 
> How should this work for new 32-bit architectures when they do
> not set __ASSUME_OFF_DIFF_OFF64?
> 
> It looks like you have two identical implementations then, though
> you would want to have just one of them plus an alias.
> 
> Maybe the "__WORDSIZE == 64" check can simply be dropped and all
> existing 32-bit architectures set __ASSUME_OFF_DIFF_OFF64 instead?
> 
> 	Arnd
> 

It was something that crossed my mind just after I sent the patch.
And it is not wrong itself, although suboptimal as you noted
(glibc will provide fallocate and fallocate64 which will be same the
implementation).

I think for fallocate we can just use

fallocate.c
#if __WORDSIZE != 64 && !defined __ASSUME_WORDSIZE64_ILP32
/* build fallocate */
#endif

and

fallocate64.c

/* build fallocate64 */
#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
weak_alias (fallocate64, fallocate)
#endif

It will avoid building fallocate for ILP32 architectures with
off and off64_t with the same size.
Adhemerval Zanella June 27, 2016, 11:12 p.m. UTC | #3
On 27/06/2016 19:53, Adhemerval Zanella wrote:
> 
> 
> On 27/06/2016 18:43, Arnd Bergmann wrote:
>> On Monday, June 27, 2016 4:34:33 PM CEST Adhemerval Zanella wrote:
>>> diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
>>> index 6a58a5f..e648a73 100644
>>> --- a/sysdeps/unix/sysv/linux/fallocate.c
>>> +++ b/sysdeps/unix/sysv/linux/fallocate.c
>>> @@ -19,17 +19,12 @@
>>>  #include <fcntl.h>
>>>  #include <sysdep-cancel.h>
>>>  
>>> +#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
>>>  /* Reserve storage for the data of the file associated with FD.  */
>>>  int
>>>  fallocate (int fd, int mode, __off_t offset, __off_t len)
>>>  {
>>>    return SYSCALL_CANCEL (fallocate, fd, mode,
>>> +                        SYSCALL_LL (offset), SYSCALL_LL (len));
>>>  }
>>> +#endif
>>> diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c
>>> index 8e76d6f..176caa8 100644
>>> --- a/sysdeps/unix/sysv/linux/fallocate64.c
>>> +++ b/sysdeps/unix/sysv/linux/fallocate64.c
>>> @@ -24,14 +24,10 @@
>>>  int
>>>  fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
>>>  {
>>>    return SYSCALL_CANCEL (fallocate, fd, mode,
>>> +                        SYSCALL_LL64 (offset), SYSCALL_LL64 (len));
>>>  }
>>> +
>>> +#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
>>> +weak_alias (fallocate64, fallocate)
>>> +#endif
>>>
>>
>> How should this work for new 32-bit architectures when they do
>> not set __ASSUME_OFF_DIFF_OFF64?
>>
>> It looks like you have two identical implementations then, though
>> you would want to have just one of them plus an alias.
>>
>> Maybe the "__WORDSIZE == 64" check can simply be dropped and all
>> existing 32-bit architectures set __ASSUME_OFF_DIFF_OFF64 instead?
>>
>> 	Arnd
>>
> 
> It was something that crossed my mind just after I sent the patch.
> And it is not wrong itself, although suboptimal as you noted
> (glibc will provide fallocate and fallocate64 which will be same the
> implementation).
> 
> I think for fallocate we can just use
> 
> fallocate.c
> #if __WORDSIZE != 64 && !defined __ASSUME_WORDSIZE64_ILP32
> /* build fallocate */
> #endif
> 
> and
> 
> fallocate64.c
> 
> /* build fallocate64 */
> #if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
> weak_alias (fallocate64, fallocate)
> #endif
> 
> It will avoid building fallocate for ILP32 architectures with
> off and off64_t with the same size.
> 

My mistake here, I was with the wrong assumption aarch64/ilp32 was
following the already supported ilp32 architectures for passing
off_t/off64_t (I still reading all the discussion for ilp32).

I see now correct way is indeed what Yuri Norov has suggested in
the previous [1] thread:

fallocate.c
#ifndef __OFF_T_MATCHES_OFF64_T
/* build fallocate */
#endif

and

fallocate64.c

/* build fallocate64 */
#ifdef __OFF_T_MATCHES_OFF64_T
weak_alias (fallocate64, fallocate)
#endif


I am assuming here aarch64/ilp32 is not defining __ASSUME_WORDSIZE64_ILP32
(which I plan to check in the patchset).

[1] https://sourceware.org/ml/libc-alpha/2016-06/msg00958.html
Arnd Bergmann June 28, 2016, 8:46 a.m. UTC | #4
On Monday, June 27, 2016 8:12:29 PM CEST Adhemerval Zanella wrote:
> 
> My mistake here, I was with the wrong assumption aarch64/ilp32 was
> following the already supported ilp32 architectures for passing
> off_t/off64_t (I still reading all the discussion for ilp32).
> 
> I see now correct way is indeed what Yuri Norov has suggested in
> the previous [1] thread:
> 
> fallocate.c
> #ifndef __OFF_T_MATCHES_OFF64_T
> /* build fallocate */
> #endif
> 
> and
> 
> fallocate64.c
> 
> /* build fallocate64 */
> #ifdef __OFF_T_MATCHES_OFF64_T
> weak_alias (fallocate64, fallocate)
> #endif

Right.

> I am assuming here aarch64/ilp32 is not defining __ASSUME_WORDSIZE64_ILP32
> (which I plan to check in the patchset).

Correct, that is the idea. We've gone back and forth on this quite a bit,
but this is the latest iteration after several reviewers pointed out that
handling the passing of 64-bit arguments for a small number of syscalls
adds a significant complexity for all other syscalls in the kernel since
it requires zeroing the upper register halves for almost all syscalls
without a way to do it during the syscall entry.

	Arnd
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 0847c8d..8118f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@ 
+2016-06-27  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/fallocate.c (fallocate): Use SYSCALL_LL
+	macro on offset argument.
+	* sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use
+	SYSCALL_LL64 on offset argument.
+	* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c: Remove file.
+	* sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c: Likewise.
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/wordsize-64/fallocate.c: Likewise.
+	* sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (fallocate): Remove
+	syscall auto-generation.
+	* sysdeps/unix/sysv/linux/Makefile (test): Add tst-fallocate and
+	tst-fallocate64.
+	* sysdeps/unix/sysv/linux/tst-fallocate.c: New file.
+	* sysdeps/unix/sysv/linux/tst-fallocate64.c: Likewise.
+
 2016-06-21  Aurelien Jarno  <aurelien@aurel32.net>
 
 	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 35e1ed4..d966a5f 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -42,7 +42,8 @@  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  bits/socket_type.h bits/syscall.h bits/sysctl.h \
 		  bits/mman-linux.h
 
-tests += tst-clone tst-clone2 tst-fanotify tst-personality
+tests += tst-clone tst-clone2 tst-fanotify tst-personality tst-fallocate \
+	 tst-fallocate64
 
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
 
diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
index 6a58a5f..e648a73 100644
--- a/sysdeps/unix/sysv/linux/fallocate.c
+++ b/sysdeps/unix/sysv/linux/fallocate.c
@@ -19,17 +19,12 @@ 
 #include <fcntl.h>
 #include <sysdep-cancel.h>
 
-
+#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
 /* Reserve storage for the data of the file associated with FD.  */
 int
 fallocate (int fd, int mode, __off_t offset, __off_t len)
 {
-#ifdef __NR_fallocate
   return SYSCALL_CANCEL (fallocate, fd, mode,
-			 __LONG_LONG_PAIR (offset >> 31, offset),
-			 __LONG_LONG_PAIR (len >> 31, len));
-#else
-  __set_errno (ENOSYS);
-  return -1;
-#endif
+			 SYSCALL_LL (offset), SYSCALL_LL (len));
 }
+#endif
diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c
index 8e76d6f..176caa8 100644
--- a/sysdeps/unix/sysv/linux/fallocate64.c
+++ b/sysdeps/unix/sysv/linux/fallocate64.c
@@ -24,14 +24,10 @@ 
 int
 fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
 {
-#ifdef __NR_fallocate
   return SYSCALL_CANCEL (fallocate, fd, mode,
-			 __LONG_LONG_PAIR ((long int) (offset >> 32),
-					   (long int) offset),
-			 __LONG_LONG_PAIR ((long int) (len >> 32),
-					   (long int) len));
-#else
-  __set_errno (ENOSYS);
-  return -1;
-#endif
+			 SYSCALL_LL64 (offset), SYSCALL_LL64 (len));
 }
+
+#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
+weak_alias (fallocate64, fallocate)
+#endif
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c
deleted file mode 100644
index 4e432f4..0000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate.c
+++ /dev/null
@@ -1,33 +0,0 @@ 
-/* Copyright (C) 2007-2016 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sysdep-cancel.h>
-
-
-/* Reserve storage for the data of the file associated with FD.  */
-int
-fallocate (int fd, int mode, __off_t offset, __off_t len)
-{
-#ifdef __NR_fallocate
-  return SYSCALL_CANCEL (fallocate, fd, mode, offset, len);
-#else
-  __set_errno (ENOSYS);
-  return -1;
-#endif
-}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c
deleted file mode 100644
index 95c9eab..0000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/fallocate64.c
+++ /dev/null
@@ -1,33 +0,0 @@ 
-/* Copyright (C) 2007-2016 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sysdep-cancel.h>
-
-
-/* Reserve storage for the data of the file associated with FD.  */
-int
-fallocate64 (int fd, int mode, __off64_t offset, __off64_t len)
-{
-#ifdef __NR_fallocate
-  return SYSCALL_CANCEL (fallocate, fd, mode, offset, len);
-#else
-  __set_errno (ENOSYS);
-  return -1;
-#endif
-}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c
deleted file mode 100644
index d3b7218..0000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sysdeps/unix/sysv/linux/wordsize-64/fallocate.c>
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c
deleted file mode 100644
index fb2b681..0000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/fallocate64.c
+++ /dev/null
@@ -1 +0,0 @@ 
-/* fallocate64 is in fallocate.c */
diff --git a/sysdeps/unix/sysv/linux/tst-fallocate.c b/sysdeps/unix/sysv/linux/tst-fallocate.c
new file mode 100644
index 0000000..f1718e0
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-fallocate.c
@@ -0,0 +1,117 @@ 
+/* Basic fallocate test (no specific flags is checked).
+   Copyright (C) 2016 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/* Allow testing of the 64-bit versions as well.  */
+#ifndef FALLOCATE
+# define FALLOCATE fallocate
+#endif
+
+static void do_prepare (void);
+static int do_test (void);
+#define PREPARE(argc, argv)     do_prepare ()
+#define TEST_FUNCTION           do_test ()
+#include "../test-skeleton.c"
+
+static char *temp_filename;
+static int temp_fd;
+
+void
+do_prepare (void)
+{
+  temp_fd = create_temp_file ("tst-fallocate.", &temp_filename);
+  if (temp_fd == -1)
+    {
+      printf ("cannot create temporary file: %m\n");
+      exit (1);
+    }
+}
+
+#define FAIL(str) \
+  do { printf ("error: %s (line %d)\n", str, __LINE__); return 1; } while (0)
+
+int
+do_test (void)
+{
+  int ret;
+  struct stat finfo;
+  char buffer[1024] = { 0xf0 };
+  char buf2read[1024];
+
+  /* It tries to fallocate 1024 bytes from offset 0 and then write 1024 bytes.
+     After both operation rewind the file descriptor and read 1024 bytes
+     and check if both buffer have the same contents.  */
+  ret = FALLOCATE (temp_fd, 0, 0, 1024);
+  if (ret == -1)
+    FAIL ("fallocate failed");
+
+  ret = fstat (temp_fd, &finfo);
+  if (ret == -1)
+    FAIL ("fstat failed");
+
+  if (finfo.st_size < 1024)
+    FAIL ("size of first fallocate less than expected (1024)");
+
+  if (lseek (temp_fd, 0, SEEK_SET) == (off_t) -1)
+    FAIL ("fseek (0, SEEK_SET) failed");
+
+  if (write (temp_fd, buffer, 1024) != 1024)
+    FAIL ("fail trying to write 1024 bytes");
+
+  if (lseek (temp_fd, 0, SEEK_SET) == (off_t) -1)
+    FAIL ("fseek (0, SEEK_SET) failed");
+
+  if (read (temp_fd, buf2read, 1024) != 1024)
+    FAIL ("fail trying to read 1024 bytes");
+
+  if (memcmp (buffer, buf2read, 1024) != 0)
+    FAIL ("buffer writted different than buffer readed");
+
+  /* It issues the same test as before but using a 1024 bytes offset.  */
+  ret = FALLOCATE (temp_fd, 0, 1024, 2048);
+  if (ret == -1)
+    FAIL ("fallocate failed");
+
+  ret = fstat (temp_fd, &finfo);
+  if (ret == -1)
+    FAIL ("fstat failed");
+
+  if (finfo.st_size < (1024 + 2048))
+    FAIL ("size of second fallocate less than expected (1024 + 2048)");
+
+  if (lseek (temp_fd, 2048, SEEK_SET) == (off_t) -1)
+    FAIL ("fseek (2048, SEEK_SET) failed");
+
+  if (write (temp_fd, buffer, 1024) != 1024)
+    FAIL ("fail trying to write 1024 bytes");
+
+  if (lseek (temp_fd, 2048, SEEK_SET) == (off_t) -1)
+    FAIL ("fseek (2048, SEEK_SET) failed");
+
+  if (read (temp_fd, buf2read, 1024) != 1024)
+    FAIL ("fail trying to read 1024 bytes");
+
+  if (memcmp (buffer, buf2read, 1024) != 0)
+    FAIL ("buffer writted different than buffer readed");
+
+  return 0;
+}
diff --git a/sysdeps/unix/sysv/linux/tst-fallocate64.c b/sysdeps/unix/sysv/linux/tst-fallocate64.c
new file mode 100644
index 0000000..649f653
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-fallocate64.c
@@ -0,0 +1,21 @@ 
+/* Basic fallocate64 test (no specific flags is checked).
+   Copyright (C) 2016 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
+   <http://www.gnu.org/licenses/>.  */
+
+#define FALLOCATE fallocate64
+
+#include "tst-fallocate.c"
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
deleted file mode 100644
index c1dd0b4..0000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate.c
+++ /dev/null
@@ -1,34 +0,0 @@ 
-/* Copyright (C) 2007-2016 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sysdep-cancel.h>
-
-
-/* Reserve storage for the data of the file associated with FD.  */
-int
-fallocate (int fd, int mode, __off_t offset, __off_t len)
-{
-#ifdef __NR_fallocate
-  return SYSCALL_CANCEL (fallocate, fd, mode, offset, len);
-#else
-  __set_errno (ENOSYS);
-  return -1;
-#endif
-}
-strong_alias (fallocate, fallocate64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c b/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c
deleted file mode 100644
index df33112..0000000
--- a/sysdeps/unix/sysv/linux/wordsize-64/fallocate64.c
+++ /dev/null
@@ -1 +0,0 @@ 
-/* fallocate64 is in posix_fallocate.c */
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list
index dce4302..8cccb1d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list
@@ -1,6 +1,5 @@ 
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-fallocate	-	fallocate	Ci:iiii	fallocate	fallocate64
 gettimeofday	-	gettimeofday:__vdso_gettimeofday@LINUX_2.6	i:pP	__gettimeofday	gettimeofday
 personality	EXTRA	personality	Ei:i	__personality	personality
 posix_fadvise	-	fadvise64	Vi:iiii	posix_fadvise	posix_fadvise64