AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LO_HI_LONG definition

Browse Source 
The p{read,write}v{64} consolidation patch [1] added a wrong guard
for LO_HI_LONG definition.  It currently uses both
'__WORDSIZE == 64' and 'defined __ASSUME_WORDSIZE64_ILP32' to set
the value to be passed in one argument, otherwise it will be split
in two.

However it fails on MIPS64n32 where syscalls n32 uses the compat
implementation in the kernel meaning the off_t arguments are passed
in two separate registers.

GLIBC already defines a macro for such cases (__OFF_T_MATCHES_OFF64_T),
so this patch uses it instead.

Checked on x86_64, i686, x32, aarch64, armhf, and s390.

	* sysdeps/unix/sysv/linux/sysdep.h
	[__WORDSIZE == 64 || __ASSUME_WORDSIZE64_ILP32] (LO_HI_LONG): Remove
	guards.
	* misc/tst-preadvwritev-common.c: New file.
	* misc/tst-preadvwritev.c: Use tst-preadvwritev-common.c.
	* misc/tst-preadvwritev64.c: Use tst-preadwritev-common.c and add
	a check for files larger than 2GB.

[1] 4751bbe2ad
This commit is contained in:
Adhemerval Zanella 2016-07-04 11:34:35 -03:00
parent 6320de9536
commit 468700675f
5 changed files with 157 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2016-07-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/sysdep.h
[__WORDSIZE == 64 || __ASSUME_WORDSIZE64_ILP32] (LO_HI_LONG): Remove
guards.
* misc/tst-preadvwritev-common.c: New file.
* misc/tst-preadvwritev.c: Use tst-preadvwritev-common.c.
* misc/tst-preadvwritev64.c: Use tst-preadwritev-common.c and add
a check for files larger than 2GB.
* sysdeps/unix/sysv/linux/mips/kernel-features.h
(__ASSUME_OFF_DIFF_OFF64): Remove define.
* sysdeps/unix/sysv/linux/pread.c

111
misc/tst-preadvwritev-common.c Normal file
View File

@ -0,0 +1,111 @@
/* Common definitions for preadv and pwritev.
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 <sys/uio.h>
static void do_prepare (void);
#define PREPARE(argc, argv) do_prepare ()
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "test-skeleton.c"
static char *temp_filename;
static int temp_fd;
static void
do_prepare (void)
{
temp_fd = create_temp_file ("tst-preadvwritev.", &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)
static int
do_test_with_offset (off_t offset)
{
struct iovec iov[2];
ssize_t ret;
char buf1[32];
char buf2[64];
memset (buf1, 0xf0, sizeof buf1);
memset (buf2, 0x0f, sizeof buf2);
/* Write two buffer with 32 and 64 bytes respectively. */
memset (iov, 0, sizeof iov);
iov[0].iov_base = buf1;
iov[0].iov_len = sizeof buf1;
iov[1].iov_base = buf2;
iov[1].iov_len = sizeof buf2;
ret = pwritev (temp_fd, iov, 2, offset);
if (ret == -1)
FAIL ("first pwritev returned -1");
if (ret != (sizeof buf1 + sizeof buf2))
FAIL ("first pwritev returned an unexpected value");
ret = pwritev (temp_fd, iov, 2, sizeof buf1 + sizeof buf2 + offset);
if (ret == -1)
FAIL ("second pwritev returned -1");
if (ret != (sizeof buf1 + sizeof buf2))
FAIL ("second pwritev returned an unexpected value");
char buf3[32];
char buf4[64];
memset (buf3, 0x0f, sizeof buf3);
memset (buf4, 0xf0, sizeof buf4);
iov[0].iov_base = buf3;
iov[0].iov_len = sizeof buf3;
iov[1].iov_base = buf4;
iov[1].iov_len = sizeof buf4;
/* Now read two buffer with 32 and 64 bytes respectively. */
ret = preadv (temp_fd, iov, 2, offset);
if (ret == -1)
FAIL ("first preadv returned -1");
if (ret != (sizeof buf3 + sizeof buf4))
FAIL ("first preadv returned an unexpected value");
if (memcmp (buf1, buf3, sizeof buf1) != 0)
FAIL ("first buffer from first preadv different than expected");
if (memcmp (buf2, buf4, sizeof buf2) != 0)
FAIL ("second buffer from first preadv different than expected");
ret = preadv (temp_fd, iov, 2, sizeof buf3 + sizeof buf4 + offset);
if (ret == -1)
FAIL ("second preadv returned -1");
if (ret != (sizeof buf3 + sizeof buf4))
FAIL ("second preadv returned an unexpected value");
/* And compare the buffers read and written to check if there are equal. */
if (memcmp (buf1, buf3, sizeof buf1) != 0)
FAIL ("first buffer from second preadv different than expected");
if (memcmp (buf2, buf4, sizeof buf2) != 0)
FAIL ("second buffer from second preadv different than expected");
return 0;
}

95
misc/tst-preadvwritev.c
View File

@ -16,99 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sys/uio.h>
#include "tst-preadvwritev-common.c"
/* Allow testing of the 64-bit versions as well. */
#ifndef PREADV
# define PREADV preadv
# define PWRITEV pwritev
#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-PREADVwritev.", &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
static int
do_test (void)
{
struct iovec iov[2];
ssize_t ret;
char buf1[32];
char buf2[64];
memset (buf1, 0xf0, sizeof buf1);
memset (buf2, 0x0f, sizeof buf2);
memset (iov, 0, sizeof iov);
iov[0].iov_base = buf1;
iov[0].iov_len = sizeof buf1;
iov[1].iov_base = buf2;
iov[1].iov_len = sizeof buf2;
ret = PWRITEV (temp_fd, iov, 2, 0);
if (ret == -1)
FAIL ("first PWRITEV returned -1");
if (ret != (sizeof buf1 + sizeof buf2))
FAIL ("first PWRITEV returned an unexpected value");
ret = PWRITEV (temp_fd, iov, 2, sizeof buf1 + sizeof buf2);
if (ret == -1)
FAIL ("second PWRITEV returned -1");
if (ret != (sizeof buf1 + sizeof buf2))
FAIL ("second PWRITEV returned an unexpected value");
char buf3[32];
char buf4[64];
memset (buf3, 0x0f, sizeof buf3);
memset (buf4, 0xf0, sizeof buf4);
iov[0].iov_base = buf3;
iov[0].iov_len = sizeof buf3;
iov[1].iov_base = buf4;
iov[1].iov_len = sizeof buf4;
ret = PREADV (temp_fd, iov, 2, 0);
if (ret == -1)
FAIL ("first PREADV returned -1");
if (ret != (sizeof buf3 + sizeof buf4))
FAIL ("first PREADV returned an unexpected value");
if (memcmp (buf1, buf3, sizeof buf1) != 0)
FAIL ("first buffer from first PREADV different than expected");
if (memcmp (buf2, buf4, sizeof buf2) != 0)
FAIL ("second buffer from first PREADV different than expected");
ret = PREADV (temp_fd, iov, 2, sizeof buf3 + sizeof buf4);
if (ret == -1)
FAIL ("second PREADV returned -1");
if (ret != (sizeof buf3 + sizeof buf4))
FAIL ("second PREADV returned an unexpected value");
if (memcmp (buf1, buf3, sizeof buf1) != 0)
FAIL ("first buffer from second PREADV different than expected");
if (memcmp (buf2, buf4, sizeof buf2) != 0)
FAIL ("second buffer from second PREADV different than expected");
return 0;
return do_test_with_offset (0);
}

35
misc/tst-preadvwritev64.c
View File

@ -16,7 +16,36 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#define PREADV preadv64
#define PWRITEV pwritev64
#define _FILE_OFFSET_BITS 64
#include "tst-preadvwritev-common.c"
#include "tst-preadvwritev.c"
static int
do_test (void)
{
int ret;
ret = do_test_with_offset (0);
/* Create a sparse file larger than 4GB to check if offset is handled
correctly in p{write,read}v64. */
off_t base_offset = UINT32_MAX + 2048LL;
ret += do_test_with_offset (base_offset);
struct stat st;
if (fstat (temp_fd, &st) == -1)
{
printf ("error: fstat on temporary file failed: %m");
return 1;
}
/* The total size should base_offset plus 2 * 96. */
off_t expected_value = base_offset + (2 * (96LL));
if (st.st_size != expected_value)
{
printf ("error: file size different than expected (%jd != %jd)\n",
(intmax_t) expected_value, (intmax_t) st.st_size);
return 1;
}
return ret;
}

10
sysdeps/unix/sysv/linux/sysdep.h
View File

@ -49,10 +49,6 @@
#endif
/* Provide a macro to pass the off{64}_t argument on p{readv,writev}{64}. */
#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
# define LO_HI_LONG(val) (val)
#else
# define LO_HI_LONG(val) \
(long) (val), \
(long) (((uint64_t) (val)) >> 32)
#endif
#define LO_HI_LONG(val) \
(long) (val), \
(long) (((uint64_t) (val)) >> 32)