----- Original Message -----
> From: "Jan Stancek" <jstan...@redhat.com>
> To: "Han Pingtian" <ha...@linux.vnet.ibm.com>
> Cc: ltp-list@lists.sourceforge.net
> Sent: Tuesday, 8 July, 2014 12:36:27 PM
> Subject: Re: [LTP] [RFC PATCH] regression test for 64bit sendfile capped
> at 2G
>
>
>
> ----- Original Message -----
> > From: "Han Pingtian" <ha...@linux.vnet.ibm.com>
> > To: ltp-list@lists.sourceforge.net
> > Sent: Tuesday, 8 July, 2014 9:23:08 AM
> > Subject: Re: [LTP] [RFC PATCH] regression test for 64bit sendfile capped at
> > 2G
> >
> > On Mon, Jul 07, 2014 at 08:14:39AM -0400, Jan Stancek wrote:
> > >
> > >
> > Thanks so much. I have changed the patch according to you and
> > Xiaoguang's suggestions. Please have a look.
>
> Hi,
>
> Below are some small suggestions, mostly to avoid int type related
> warnings when compiled as 32-bit.
>
> Did you also test this testcase with kernel commit 5d73320a96fcc applied?
> I tried it with this commit applied on top of RHEL7 GA kernel, but
> I didn't get the expected result:
>
> sendfile(3, 4, [0], 4294967296) = 2147418112
> ...
> sendfile(3, 4, [2147483648], 2147483648) = 2147418112
do_sendfile()
rw_verify_area()
return count > MAX_RW_COUNT ? MAX_RW_COUNT : count;
#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
which appears to match return value I get:
2147418112 == 0x7FFF0000
printf("%d %d\n", sizeof(int), getpagesize());
4 65536
Can sendfile work with sizes > 2GB?
Regards,
Jan
>
> Regards,
> Jan
>
>
> diff --git a/testcases/kernel/syscalls/.gitignore
> b/testcases/kernel/syscalls/.gitignore
> index 975c150..b9d49cf 100644
> --- a/testcases/kernel/syscalls/.gitignore
> +++ b/testcases/kernel/syscalls/.gitignore
> @@ -750,6 +750,8 @@
> /sendfile/sendfile07_64
> /sendfile/sendfile08
> /sendfile/sendfile08_64
> +/sendfile/sendfile09
> +/sendfile/sendfile09_64
> /sendmsg/sendmsg01
> /sendmsg/sendmsg02
> /sendto/sendto01
> diff --git a/testcases/kernel/syscalls/sendfile/sendfile09.c
> b/testcases/kernel/syscalls/sendfile/sendfile09.c
> index 1bab702..2b9de40 100644
> --- a/testcases/kernel/syscalls/sendfile/sendfile09.c
> +++ b/testcases/kernel/syscalls/sendfile/sendfile09.c
> @@ -54,7 +54,6 @@
> #include "usctest.h"
> #include "test.h"
> #include "safe_macros.h"
> -#include "compiler.h"
>
> #ifndef OFF_T
> #define OFF_T off_t
> @@ -71,28 +70,27 @@ static int out_fd;
> static void cleanup(void);
> static void setup(void);
>
> -struct test_case_t {
> +#define TWO_GB (INT64_C(1) << 31)
> +#define FOUR_GB (INT64_C(1) << 32)
> +
> +static struct test_case_t {
> char *desc;
> OFF_T offset;
> int64_t exp_retval;
> int64_t exp_updated_offset;
> } testcases[] = {
> { "Test sendfile(2) with offset = 0",
> - 0, 4294967296, 4294967296},
> + 0, FOUR_GB, FOUR_GB},
> { "Test sendfile(2) with offset in the middle of file",
> - 2147483648, 2147483648, 4294967296}
> + TWO_GB, TWO_GB, FOUR_GB}
> };
>
> int TST_TOTAL = ARRAY_SIZE(testcases);
>
> -#ifdef UCLINUX
> -static char *argv0;
> -#endif
> -
> void do_sendfile(OFF_T offset, int i)
> {
> struct stat sb;
> - off_t before_pos, after_pos;
> + OFF_T before_pos, after_pos;
>
> out_fd = SAFE_OPEN(cleanup, out_file, O_WRONLY);
>
> @@ -105,14 +103,14 @@ void do_sendfile(OFF_T offset, int i)
> TEST(sendfile(out_fd, in_fd, &offset, sb.st_size - offset));
>
> if (TEST_RETURN == -1)
> - tst_brkm(TBROK | TERRNO, cleanup, "sendfile(2) failed");
> + tst_brkm(TBROK | TTERRNO, cleanup, "sendfile(2) failed");
>
> after_pos = SAFE_LSEEK(cleanup, in_fd, 0, SEEK_CUR);
>
> if (TEST_RETURN != testcases[i].exp_retval) {
> tst_resm(TFAIL, "sendfile(2) failed to return "
> "expected value, expected: %" PRId64 ", "
> - "got: %" PRId64, testcases[i].exp_retval,
> + "got: %ld", testcases[i].exp_retval,
> TEST_RETURN);
> } else if (offset != testcases[i].exp_updated_offset) {
> tst_resm(TFAIL, "sendfile(2) failed to update "
> @@ -149,8 +147,7 @@ void setup(void)
> tst_tmpdir();
>
> if (!tst_fs_has_free(NULL, ".", 8, TST_GB)) {
> - cleanup();
> - tst_brkm(TCONF, NULL, "sendfile(2) on large file"
> + tst_brkm(TCONF, cleanup, "sendfile(2) on large file"
> " needs 8G free space.");
> }
>
>
>
> >
> >
> > >From 5257dba5a2ce42e55d0ba61c2a6bd5fe30c5c7f7 Mon Sep 17 00:00:00 2001
> > From: Han Pingtian <ha...@linux.vnet.ibm.com>
> > Date: Thu, 3 Jul 2014 15:29:35 +0800
> > Subject: [PATCH] regression test for 64bit sendfile capped at 2G
> >
> > There is a bug on 64bit sendfile() with large file, please see
> > https://lists.ozlabs.org/pipermail/linuxppc-dev/2014-June/118128.html
> > for details.
> >
> > This sendfile09.c was copied from sendfile02.c and using plain
> > file as the out_file. The file size is 4G (4294967296 bytes).
> >
> > Signed-off-by: Han Pingtian <ha...@linux.vnet.ibm.com>
> > ---
> > runtest/syscalls | 2 +
> > testcases/kernel/syscalls/sendfile/sendfile09.c | 233
> > ++++++++++++++++++++++++
> > 2 files changed, 235 insertions(+)
> > create mode 100644 testcases/kernel/syscalls/sendfile/sendfile09.c
> >
> > diff --git a/runtest/syscalls b/runtest/syscalls
> > index 66d6a65..fbed9cb 100644
> > --- a/runtest/syscalls
> > +++ b/runtest/syscalls
> > @@ -937,6 +937,8 @@ sendfile07 sendfile07
> > sendfile07_64 sendfile07_64
> > sendfile08 sendfile08
> > sendfile08_64 sendfile08_64
> > +sendfile09 sendfile09
> > +sendfile09_64 sendfile09_64
> >
> >
> > sendmsg01 sendmsg01
> > diff --git a/testcases/kernel/syscalls/sendfile/sendfile09.c
> > b/testcases/kernel/syscalls/sendfile/sendfile09.c
> > new file mode 100644
> > index 0000000..1bab702
> > --- /dev/null
> > +++ b/testcases/kernel/syscalls/sendfile/sendfile09.c
> > @@ -0,0 +1,233 @@
> > +/*
> > + *
> > + * Copyright (c) International Business Machines Corp., 2014
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * This program 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 General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> > 02110-1301 USA
> > + */
> > +
> > +/*
> > + * NAME
> > + * sendfile09.c
> > + *
> > + * DESCRIPTION
> > + * Testcase copied from sendfile02.c to test the basic functionality of
> > + * the sendfile(2) system call on large file. There is a kernel bug which
> > + * introduced by commit 8f9c0119d7ba and fixed by commit 5d73320a96fcc.
> > + *
> > + * ALGORITHM
> > + * 1. call sendfile(2) with offset = 0
> > + * 2. call sendfile(2) with offset in the middle of the file
> > + *
> > + * USAGE: <for command-line>
> > + * sendfile09 [-c n] [-i n] [-I x] [-P x] [-t]
> > + * where,
> > + * -i n : Execute test n times.
> > + * -I x : Execute test for x seconds.
> > + * -P x : Pause for x seconds between iterations.
> > + * -t : Turn on syscall timing.
> > + *
> > + *
> > + * RESTRICTIONS
> > + * Only supports 64bit systems and kernel 2.6.33 or above
> > + */
> > +#include <stdio.h>
> > +#include <errno.h>
> > +#include <fcntl.h>
> > +#include <sys/stat.h>
> > +#include <sys/sendfile.h>
> > +#include <sys/types.h>
> > +#include <unistd.h>
> > +#include <inttypes.h>
> > +
> > +#include "usctest.h"
> > +#include "test.h"
> > +#include "safe_macros.h"
> > +#include "compiler.h"
> > +
> > +#ifndef OFF_T
> > +#define OFF_T off_t
> > +#endif /* Not def: OFF_T */
> > +
> > +TCID_DEFINE(sendfile09);
> > +
> > +static char *in_file = "in";
> > +static char *out_file = "out";
> > +static int fd;
> > +static int in_fd;
> > +static int out_fd;
> > +
> > +static void cleanup(void);
> > +static void setup(void);
> > +
> > +struct test_case_t {
> > + char *desc;
> > + OFF_T offset;
> > + int64_t exp_retval;
> > + int64_t exp_updated_offset;
> > +} testcases[] = {
> > + { "Test sendfile(2) with offset = 0",
> > + 0, 4294967296, 4294967296},
> > + { "Test sendfile(2) with offset in the middle of file",
> > + 2147483648, 2147483648, 4294967296}
> > +};
> > +
> > +int TST_TOTAL = ARRAY_SIZE(testcases);
> > +
> > +#ifdef UCLINUX
> > +static char *argv0;
> > +#endif
> > +
> > +void do_sendfile(OFF_T offset, int i)
> > +{
> > + struct stat sb;
> > + off_t before_pos, after_pos;
> > +
> > + out_fd = SAFE_OPEN(cleanup, out_file, O_WRONLY);
> > +
> > + in_fd = SAFE_OPEN(cleanup, in_file, O_RDONLY);
> > +
> > + SAFE_STAT(cleanup, in_file, &sb);
> > +
> > + before_pos = SAFE_LSEEK(cleanup, in_fd, 0, SEEK_CUR);
> > +
> > + TEST(sendfile(out_fd, in_fd, &offset, sb.st_size - offset));
> > +
> > + if (TEST_RETURN == -1)
> > + tst_brkm(TBROK | TERRNO, cleanup, "sendfile(2) failed");
> > +
> > + after_pos = SAFE_LSEEK(cleanup, in_fd, 0, SEEK_CUR);
> > +
> > + if (TEST_RETURN != testcases[i].exp_retval) {
> > + tst_resm(TFAIL, "sendfile(2) failed to return "
> > + "expected value, expected: %" PRId64 ", "
> > + "got: %" PRId64, testcases[i].exp_retval,
> > + TEST_RETURN);
> > + } else if (offset != testcases[i].exp_updated_offset) {
> > + tst_resm(TFAIL, "sendfile(2) failed to update "
> > + "OFFSET parameter to expected value, "
> > + "expected: %" PRId64 ", got: %" PRId64,
> > + testcases[i].exp_updated_offset,
> > + (int64_t) offset);
> > + } else if (before_pos != after_pos) {
> > + tst_resm(TFAIL, "sendfile(2) updated the file position "
> > + " of in_fd unexpectedly, expected file position: %"
> > + PRId64 ", " " actual file position %" PRId64,
> > + (int64_t) before_pos, (int64_t) after_pos);
> > + } else {
> > + tst_resm(TPASS, "functionality of sendfile() is "
> > + "correct");
> > + }
> > +
> > + close(in_fd);
> > + close(out_fd);
> > +}
> > +
> > +/*
> > + * setup() - performs all ONE TIME setup for this test.
> > + */
> > +void setup(void)
> > +{
> > + int i;
> > +
> > + tst_sig(FORK, DEF_HANDLER, cleanup);
> > +
> > + TEST_PAUSE;
> > +
> > + /* make a temporary directory and cd to it */
> > + tst_tmpdir();
> > +
> > + if (!tst_fs_has_free(NULL, ".", 8, TST_GB)) {
> > + cleanup();
> > + tst_brkm(TCONF, NULL, "sendfile(2) on large file"
> > + " needs 8G free space.");
> > + }
> > +
> > + fd = SAFE_CREAT(cleanup, in_file, 00700);
> > +
> > + /* create a 4G file */
> > + for (i = 1; i <= (4 * 1024); i++) {
> > + SAFE_LSEEK(cleanup, fd, 1024 * 1024 - 1, SEEK_CUR);
> > +
> > + SAFE_WRITE(cleanup, 1, fd, "C", 1);
> > + }
> > +
> > + close(fd);
> > +
> > + fd = SAFE_CREAT(cleanup, out_file, 00700);
> > +
> > + close(fd);
> > +}
> > +
> > +/*
> > + * cleanup() - performs all ONE TIME cleanup for this test at
> > + * completion or premature exit.
> > + */
> > +void cleanup(void)
> > +{
> > + /*
> > + * print timing stats if that option was specified.
> > + * print errno log if that option was specified.
> > + */
> > + TEST_CLEANUP;
> > +
> > + if (fd > 0)
> > + close(fd);
> > +
> > + if (in_fd > 0)
> > + close(in_fd);
> > +
> > + if (out_fd > 0)
> > + close(out_fd);
> > +
> > + /* delete the test directory created in setup() */
> > + tst_rmdir();
> > +
> > +}
> > +
> > +int main(int ac, char **av)
> > +{
> > + int i;
> > + int lc;
> > + const char *msg; /* parse_opts() return message */
> > +
> > +#if __WORDSIZE == 32
> > + tst_brkm(TCONF, NULL, "This test is only for 64bit");
> > +#endif
> > +
> > + if (tst_kvercmp(2, 6, 33) < 0) {
> > + tst_resm(TINFO, "sendfile(2) on large file "
> > + "skipped for kernels < 2.6.33");
> > + return 0;
> > + }
> > +
> > + if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
> > + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
> > +
> > + setup();
> > +
> > + /*
> > + * The following loop checks looping state if -c option given
> > + */
> > + for (lc = 0; TEST_LOOPING(lc); lc++) {
> > + tst_count = 0;
> > +
> > + for (i = 0; i < TST_TOTAL; ++i)
> > + do_sendfile(testcases[i].offset, i);
> > + }
> > +
> > + cleanup();
> > +
> > + tst_exit();
> > +}
> > --
> > 1.9.3
> >
> >
> > ------------------------------------------------------------------------------
> > Open source business process management suite built on Java and Eclipse
> > Turn processes into business applications with Bonita BPM Community Edition
> > Quickly connect people, data, and systems into organized workflows
> > Winner of BOSSIE, CODIE, OW2 and Gartner awards
> > http://p.sf.net/sfu/Bonitasoft
> > _______________________________________________
> > Ltp-list mailing list
> > Ltp-list@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/ltp-list
> >
>
> ------------------------------------------------------------------------------
> Open source business process management suite built on Java and Eclipse
> Turn processes into business applications with Bonita BPM Community Edition
> Quickly connect people, data, and systems into organized workflows
> Winner of BOSSIE, CODIE, OW2 and Gartner awards
> http://p.sf.net/sfu/Bonitasoft
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
>
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
