Consolidate fallocate{64} implementations
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. Checked on x86_64, x32, i386, aarch64, and ppc64le. * 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. * sysdeps/unix/sysv/linux/tst-fallocate-common.c: Likewise. * 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/fallocate.c (fallocate): Use SYSCALL_LL macro on offset argument. * sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use SYSCALL_LL64 on offset argument. * test-skeleton.c (FAIL_RET): Add macro. (FAIL_EXIT): Likewise. (FAIL_EXIT1): Likewise. (_FAIL): Likewise.
This commit is contained in:
parent
5140d036f9
commit
6c63e2d8df
22
ChangeLog
22
ChangeLog
|
@ -1,3 +1,25 @@
|
|||
2016-10-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||
|
||||
* 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.
|
||||
* sysdeps/unix/sysv/linux/tst-fallocate-common.c: Likewise.
|
||||
* 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/fallocate.c (fallocate): Use SYSCALL_LL
|
||||
macro on offset argument.
|
||||
* sysdeps/unix/sysv/linux/fallocate64.c (fallocate64): Use
|
||||
SYSCALL_LL64 on offset argument.
|
||||
* test-skeleton.c (FAIL_RET): Add macro.
|
||||
(FAIL_EXIT): Likewise.
|
||||
(FAIL_EXIT1): Likewise.
|
||||
(_FAIL): Likewise.
|
||||
|
||||
2016-10-07 Florian Weimer <fweimer@redhat.com>
|
||||
|
||||
[BZ #20629]
|
||||
|
|
|
@ -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 tst-quota
|
||||
tests += tst-clone tst-clone2 tst-fanotify tst-personality tst-quota \
|
||||
tst-fallocate tst-fallocate64
|
||||
|
||||
# Generate the list of SYS_* macros for the system calls (__NR_* macros).
|
||||
|
||||
|
|
|
@ -19,17 +19,12 @@
|
|||
#include <fcntl.h>
|
||||
#include <sysdep-cancel.h>
|
||||
|
||||
|
||||
#ifndef __OFF_T_MATCHES_OFF64_T
|
||||
/* 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
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
||||
#ifdef __OFF_T_MATCHES_OFF64_T
|
||||
weak_alias (fallocate64, fallocate)
|
||||
#endif
|
||||
|
|
|
@ -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
|
||||
}
|
|
@ -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
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
#include <sysdeps/unix/sysv/linux/wordsize-64/fallocate.c>
|
|
@ -1 +0,0 @@
|
|||
/* fallocate64 is in fallocate.c */
|
|
@ -0,0 +1,87 @@
|
|||
/* 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>
|
||||
|
||||
static void do_prepare (void);
|
||||
#define PREPARE(argc, argv) do_prepare ()
|
||||
static int do_test (void);
|
||||
#define TEST_FUNCTION do_test ()
|
||||
|
||||
#define TIMEOUT 20 /* sec. */
|
||||
|
||||
#define XSTR(s) STR(S)
|
||||
#define STR(s) #s
|
||||
|
||||
#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)
|
||||
FAIL_EXIT1 ("cannot create temporary file: %m");
|
||||
}
|
||||
|
||||
static int
|
||||
do_test_with_offset (off_t offset)
|
||||
{
|
||||
int ret;
|
||||
struct stat finfo;
|
||||
#define BLK_SIZE 1024
|
||||
char bwrite[BLK_SIZE] = { 0xf0 };
|
||||
char bread[BLK_SIZE];
|
||||
|
||||
/* It tries to fallocate 1024 bytes from 'offset' 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, offset, BLK_SIZE);
|
||||
if (ret == -1)
|
||||
FAIL_EXIT1 ("fallocate failed");
|
||||
|
||||
ret = fstat (temp_fd, &finfo);
|
||||
if (ret == -1)
|
||||
FAIL_EXIT1 ("fstat failed");
|
||||
|
||||
if (finfo.st_size < (offset + BLK_SIZE))
|
||||
FAIL_EXIT1 ("size of first fallocate less than expected (%llu)",
|
||||
(long long unsigned int)offset + BLK_SIZE);
|
||||
|
||||
if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1)
|
||||
FAIL_EXIT1 ("fseek (0, SEEK_SET) failed");
|
||||
|
||||
if (write (temp_fd, bwrite, BLK_SIZE) != BLK_SIZE)
|
||||
FAIL_EXIT1 ("fail trying to write " XSTR (BLK_SIZE) " bytes");
|
||||
|
||||
if (lseek (temp_fd, offset, SEEK_SET) == (off_t) -1)
|
||||
FAIL_EXIT1 ("fseek (0, SEEK_SET) failed");
|
||||
|
||||
if (read (temp_fd, bread, BLK_SIZE) != BLK_SIZE)
|
||||
FAIL_EXIT1 ("fail trying to read " XSTR (BLK_SIZE) " bytes");
|
||||
|
||||
if (memcmp (bwrite, bread, BLK_SIZE) != 0)
|
||||
FAIL_EXIT1 ("buffer written different than buffer readed");
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
|
||||
/* 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
|
||||
|
@ -15,20 +16,10 @@
|
|||
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>
|
||||
#include "tst-fallocate-common.c"
|
||||
|
||||
|
||||
/* Reserve storage for the data of the file associated with FD. */
|
||||
int
|
||||
fallocate (int fd, int mode, __off_t offset, __off_t len)
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
#ifdef __NR_fallocate
|
||||
return SYSCALL_CANCEL (fallocate, fd, mode, offset, len);
|
||||
#else
|
||||
__set_errno (ENOSYS);
|
||||
return -1;
|
||||
#endif
|
||||
return do_test_with_offset (0);
|
||||
}
|
||||
strong_alias (fallocate, fallocate64)
|
|
@ -0,0 +1,47 @@
|
|||
/* 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 _FILE_OFFSET_BITS 64
|
||||
#include "tst-fallocate-common.c"
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
ssize_t ret;
|
||||
|
||||
ret = do_test_with_offset (0);
|
||||
if (ret == 1)
|
||||
return 1;
|
||||
|
||||
off_t base_offset = UINT32_MAX + 2048LL;
|
||||
ret = do_test_with_offset (base_offset);
|
||||
if (ret == 1)
|
||||
return 1;
|
||||
|
||||
struct stat st;
|
||||
if (fstat (temp_fd, &st) == -1)
|
||||
FAIL_EXIT1 ("fstat on temporary file failed: %m");
|
||||
|
||||
/* The file size should >= base_offset plus bytes written. */
|
||||
off_t expected_value = base_offset + ret;
|
||||
if (st.st_size < expected_value)
|
||||
FAIL_EXIT1 ("file size less than expected (%jd > %jd)",
|
||||
(intmax_t) expected_value, (intmax_t) st.st_size);
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
/* fallocate64 is in posix_fallocate.c */
|
|
@ -70,6 +70,25 @@ static pid_t pid;
|
|||
/* Directory to place temporary files in. */
|
||||
static const char *test_dir;
|
||||
|
||||
#define _FAIL(...) \
|
||||
printf ("error: %s:%d: ", __FILE__, __LINE__); \
|
||||
printf (__VA_ARGS__); \
|
||||
printf ("\n"); \
|
||||
|
||||
#define FAIL_RET(...) \
|
||||
({ \
|
||||
_FAIL (__VA_ARGS__); \
|
||||
return 1; \
|
||||
})
|
||||
|
||||
#define FAIL_EXIT(value, ...) \
|
||||
({ \
|
||||
_FAIL (__VA_ARGS__); \
|
||||
exit (value); \
|
||||
})
|
||||
|
||||
#define FAIL_EXIT1(...) FAIL_EXIT(1, __VA_ARGS__)
|
||||
|
||||
static void
|
||||
oom_error (const char *fn, size_t size)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue