From patchwork Tue Jun 14 21:54:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 13097 Received: (qmail 129552 invoked by alias); 14 Jun 2016 21:55:00 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 129537 invoked by uid 89); 14 Jun 2016 21:54:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=consolidation, 77, 8, objpfx, ifeq X-HELO: mail-yw0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=TpViaaJfrYa6drIewC6zfJMiZMga8qMkmWfgzF2GsyU=; b=QJeanD2FoUb3ZDTqUzMMBJGBvhI3zO1C/B2Uaf/BmJ17JmzND1k2w05GxoBeAQmFVJ BRU7VsfexrOKo3Du6o0g6FRttCBcl/W3pkTqd6aBdyTQEu0orzeadpAN/iQzZWFgChsP 3PcUsC3OujXcWCAOmB5jb6S+pI8fRVrGiiej55bVcTlc3mDGtF3aIu3xSjwnHORh+wU+ 1hTkDOW186YtxTRlhAr8E3iXjSiP5Ga11UmRZE9oc7DWrUM1gKawlaY3WbxhoM7ZB1Bh ZwHWWNgAXSTXcO01sju14e+xDYuC5URwTP6iHmOOnSfyGxEBCpXwOBytLTYd9eI/4xUv HTmw== X-Gm-Message-State: ALyK8tJETg+bxGevzxYIiMx5esH6Q7RSyu3+HwQPY2kDpOJ/aBzoSLhY5Zi7V6oWmiRLex3Q X-Received: by 10.37.25.11 with SMTP id 11mr9130165ybz.127.1465941284909; Tue, 14 Jun 2016 14:54:44 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] Fix p{readv,writev}{64} consolidation implementation Date: Tue, 14 Jun 2016 18:54:35 -0300 Message-Id: <1465941275-3459-1-git-send-email-adhemerval.zanella@linaro.org> This patch fixes the p{readv,writev}{64} consolidation implementation from commits 4e77815 and af5fdf5. Different from pread/pwrite implementation, preadv/pwritev implementation does not require __ALIGNMENT_ARG because kernel syscall prototypes define the high and low part of the off_t, if it is the case, directly (different from pread/pwrite where the architecture ABI for passing 64-bit values must be in consideration for passsing the arguments). It also adds some basic tests for preadv/pwritev. Tested on x86_64, i686, and armhf. * misc/Makefile (tests): Add tst-preadvwritev and tst-preadvwritev64. * misc/tst-preadvwritev.c: New file. * misc/tst-preadvwritev64.c: Likewise. * sysdeps/unix/sysv/linux/preadv.c (preadv): Remove SYSCALL_LL{64} usage. * sysdeps/unix/sysv/linux/preadv64.c (preadv64): Likewise. * sysdeps/unix/sysv/linux/pwritev.c (pwritev): Likewise. * sysdeps/unix/sysv/linux/pwritev64.c (pwritev64): Likewise. --- ChangeLog | 11 ++++ misc/Makefile | 3 +- misc/tst-preadvwritev.c | 111 ++++++++++++++++++++++++++++++++++++ misc/tst-preadvwritev64.c | 22 +++++++ sysdeps/unix/sysv/linux/preadv.c | 5 +- sysdeps/unix/sysv/linux/preadv64.c | 5 +- sysdeps/unix/sysv/linux/pwritev.c | 5 +- sysdeps/unix/sysv/linux/pwritev64.c | 4 +- 8 files changed, 154 insertions(+), 12 deletions(-) create mode 100644 misc/tst-preadvwritev.c create mode 100644 misc/tst-preadvwritev64.c diff --git a/misc/Makefile b/misc/Makefile index 6498adc..56e20ce 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -77,7 +77,8 @@ gpl2lgpl := error.c error.h tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ - tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 + tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ + tst-preadvwritev tst-preadvwritev64 ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-error1-mem.out endif diff --git a/misc/tst-preadvwritev.c b/misc/tst-preadvwritev.c new file mode 100644 index 0000000..60c7c84 --- /dev/null +++ b/misc/tst-preadvwritev.c @@ -0,0 +1,111 @@ +/* Tests 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 + . */ + +#include + +/* Allow testing of the 64-bit versions as well. */ +#ifndef PREAD +# define PREAD pread +# define PWRITE pwrite +#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() \ + do { printf ("error: failure on line %d\n", __LINE__); return 1; } while (0) + +int +do_test (void) +{ + struct iovec iov[2]; + ssize_t ret; + + char buf1[32]; + char buf2[64]; + + memset (buf1, 0x00, sizeof buf1); + memset (buf1, 0xca, sizeof buf1); + + 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 (); + if (ret != (sizeof buf1 + sizeof buf2)) + FAIL (); + + ret = pwritev (temp_fd, iov, 2, sizeof buf1 + sizeof buf2); + if (ret == -1) + FAIL (); + if (ret != (sizeof buf1 + sizeof buf2)) + FAIL (); + + char buf3[32]; + char buf4[64]; + + 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 (); + if (ret != (sizeof buf3 + sizeof buf4)) + FAIL (); + + if (memcmp (buf1, buf3, sizeof buf1) != 0) + FAIL (); + if (memcmp (buf2, buf4, sizeof buf2) != 0) + FAIL (); + + ret = preadv (temp_fd, iov, 2, sizeof buf3 + sizeof buf4); + if (ret == -1) + FAIL (); + if (ret != (sizeof buf3 + sizeof buf4)) + FAIL (); + + if (memcmp (buf1, buf3, sizeof buf1) != 0) + FAIL (); + if (memcmp (buf2, buf4, sizeof buf2) != 0) + FAIL (); + + return 0; +} diff --git a/misc/tst-preadvwritev64.c b/misc/tst-preadvwritev64.c new file mode 100644 index 0000000..ff6e134 --- /dev/null +++ b/misc/tst-preadvwritev64.c @@ -0,0 +1,22 @@ +/* Tests for pread64 and pwrite64. + 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 + . */ + +#define PREADV preadv64 +#define PWRITEV pwritev64 + +#include "tst-preadvwritev.c" diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index f6958c3..1dbaa35 100644 --- a/sysdeps/unix/sysv/linux/preadv.c +++ b/sysdeps/unix/sysv/linux/preadv.c @@ -29,8 +29,7 @@ ssize_t preadv (int fd, const struct iovec *vector, int count, off_t offset) { - return SYSCALL_CANCEL (preadv, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL (offset)); + return SYSCALL_CANCEL (preadv, fd, vector, count, SYSCALL_LL (offset)); } # else static ssize_t __atomic_preadv_replacement (int, const struct iovec *, @@ -40,7 +39,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset) { # ifdef __NR_preadv ssize_t result = SYSCALL_CANCEL (preadv, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL (offset)); + SYSCALL_LL (offset)); if (result >= 0 || errno != ENOSYS) return result; # endif diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c index 18f5550..7c7910a 100644 --- a/sysdeps/unix/sysv/linux/preadv64.c +++ b/sysdeps/unix/sysv/linux/preadv64.c @@ -27,8 +27,7 @@ ssize_t preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) { - return SYSCALL_CANCEL (preadv64, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + return SYSCALL_CANCEL (preadv64, fd, vector, count, SYSCALL_LL64 (offset)); } #else static ssize_t __atomic_preadv64_replacement (int, const struct iovec *, @@ -38,7 +37,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) { #ifdef __NR_preadv64 ssize_t result = SYSCALL_CANCEL (preadv64, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + SYSCALL_LL64 (offset)); if (result >= 0 || errno != ENOSYS) return result; #endif diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index b11606c..57e579c 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -29,8 +29,7 @@ ssize_t pwritev (int fd, const struct iovec *vector, int count, off_t offset) { - return SYSCALL_CANCEL (pwritev, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL (offset)); + return SYSCALL_CANCEL (pwritev, fd, vector, count, SYSCALL_LL (offset)); } # else static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, @@ -40,7 +39,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset) { # ifdef __NR_pwritev ssize_t result = SYSCALL_CANCEL (pwritev, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL (offset)); + SYSCALL_LL (offset)); if (result >= 0 || errno != ENOSYS) return result; # endif diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index bed79b7..39af02f 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -28,7 +28,7 @@ ssize_t pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { return SYSCALL_CANCEL (pwritev64, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + SYSCALL_LL64 (offset)); } #else static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, @@ -38,7 +38,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { #ifdef __NR_pwrite64v ssize_t result = SYSCALL_CANCEL (pwritev64, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + SYSCALL_LL64 (offset)); if (result >= 0 || errno != ENOSYS) return result; #endif