* [PATCH 1/5] generic/340: Remove second fallocate test
2016-04-18 19:32 [PATCH 1/5] More page fault stress tests and generic/038 fix Jan Kara
@ 2016-04-18 19:32 ` Jan Kara
2016-04-18 19:32 ` [PATCH 2/5] generic/343: Test races between mmap and normal writes Jan Kara
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Jan Kara @ 2016-04-18 19:32 UTC (permalink / raw)
To: fstests; +Cc: Jan Kara
Currently holetest program uses both posix_fallocate(3) and fallocate(3)
to setup the file. However this unnecessarily prolongs the test run and
doesn't really bring any additional code coverage. So remove the
fallocate(3) pass as using posix_fallocate(3) allows us to make the test
easily runnable even for filesystems not supporting that (such as ext2).
Signed-off-by: Jan Kara <jack@suse.cz>
---
src/holetest.c | 36 +-----------------------------------
tests/generic/340 | 1 -
tests/generic/340.out | 18 ------------------
3 files changed, 1 insertion(+), 54 deletions(-)
diff --git a/src/holetest.c b/src/holetest.c
index c0a2c67798a3..c5a4fd5c043a 100644
--- a/src/holetest.c
+++ b/src/holetest.c
@@ -191,8 +191,7 @@ int main(int argc, char **argv)
*
* 1. explictly zero-filled
* 2. posix_fallocated
- * 3. fallocated
- * 4. ftruncated
+ * 3. ftruncated
*/
@@ -272,39 +271,6 @@ int main(int argc, char **argv)
}
/*
- * fallocated
- */
- printf("\nINFO: fallocate test...\n");
-
-#ifdef HAVE_FALLOCATE
- /* create the file */
- fd = open(path, O_RDWR | O_EXCL | O_CREAT, 0644);
- if (fd < 0) {
- perror(path);
- exit(11);
- }
-
- /* fill it to size */
- if (fallocate(fd, 0, 0, sz)) {
- perror("fallocate()");
- exit(12);
- }
-
- /* test it */
- errcnt = test_this(fd, sz);
- toterr += errcnt;
- close(fd);
- if (stoponerror && errcnt > 0)
- exit(13);
-
- /* cleanup */
- if (unlink(path)) {
- perror("unlink()");
- exit(14);
- }
-#endif
-
- /*
* ftruncated
*/
printf("\nINFO: ftruncate test...\n");
diff --git a/tests/generic/340 b/tests/generic/340
index 69794ae417a4..2ba34eb59724 100644
--- a/tests/generic/340
+++ b/tests/generic/340
@@ -44,7 +44,6 @@ _supported_fs generic
_supported_os Linux
_require_scratch
_require_test_program "holetest"
-_require_xfs_io_command "falloc"
rm -f $seqres.full
diff --git a/tests/generic/340.out b/tests/generic/340.out
index 2bfc722edbe4..0eac9ed654dc 100644
--- a/tests/generic/340.out
+++ b/tests/generic/340.out
@@ -12,12 +12,6 @@ INFO: thread 0 created
INFO: thread 1 created
INFO: 0 error(s) detected
-INFO: fallocate test...
-INFO: sz = 1048576
-INFO: thread 0 created
-INFO: thread 1 created
-INFO: 0 error(s) detected
-
INFO: ftruncate test...
INFO: sz = 1048576
INFO: thread 0 created
@@ -36,12 +30,6 @@ INFO: thread 0 created
INFO: thread 1 created
INFO: 0 error(s) detected
-INFO: fallocate test...
-INFO: sz = 16777216
-INFO: thread 0 created
-INFO: thread 1 created
-INFO: 0 error(s) detected
-
INFO: ftruncate test...
INFO: sz = 16777216
INFO: thread 0 created
@@ -60,12 +48,6 @@ INFO: thread 0 created
INFO: thread 1 created
INFO: 0 error(s) detected
-INFO: fallocate test...
-INFO: sz = 268435456
-INFO: thread 0 created
-INFO: thread 1 created
-INFO: 0 error(s) detected
-
INFO: ftruncate test...
INFO: sz = 268435456
INFO: thread 0 created
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] generic/343: Test races between mmap and normal writes
2016-04-18 19:32 [PATCH 1/5] More page fault stress tests and generic/038 fix Jan Kara
2016-04-18 19:32 ` [PATCH 1/5] generic/340: Remove second fallocate test Jan Kara
@ 2016-04-18 19:32 ` Jan Kara
2016-04-27 15:04 ` Brian Foster
2016-04-18 19:32 ` [PATCH 3/5] generic/344: Test races between mmap and normal write for prefaulted ranges Jan Kara
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Jan Kara @ 2016-04-18 19:32 UTC (permalink / raw)
To: fstests; +Cc: Jan Kara
Add test which spawns two threads one writing to file via normal write
and one via mmap and checks the result. This is mainly interesting to
uncover races between DAX fault handling and write path.
Signed-off-by: Jan Kara <jack@suse.cz>
---
src/holetest.c | 68 ++++++++++++++++++++++++++++++++++++---------------
tests/generic/341 | 4 ---
tests/generic/343 | 58 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/343.out | 55 +++++++++++++++++++++++++++++++++++++++++
tests/generic/group | 1 +
5 files changed, 162 insertions(+), 24 deletions(-)
create mode 100644 tests/generic/343
create mode 100644 tests/generic/343.out
diff --git a/src/holetest.c b/src/holetest.c
index c5a4fd5c043a..6f23110b3769 100644
--- a/src/holetest.c
+++ b/src/holetest.c
@@ -60,18 +60,20 @@
#include <unistd.h>
#include <pthread.h>
#include <string.h>
+#include <getopt.h>
#define THREADS 2
long page_size;
long page_offs[THREADS];
+int use_wr[THREADS];
void *pt_page_marker(void *args)
{
void **a = args;
- char *va = (char *)a[0];
- long npages = (long)a[1];
- long pgoff = (long)a[2];
+ char *va = (char *)a[1];
+ long npages = (long)a[2];
+ long pgoff = (long)a[3];
uint64_t tid = (uint64_t)pthread_self();
va += pgoff;
@@ -83,13 +85,28 @@ void *pt_page_marker(void *args)
return NULL;
} /* pt_page_marker() */
+void *pt_write_marker(void *args)
+{
+ void **a = args;
+ int fd = (long)a[0];
+ long npages = (long)a[2];
+ long pgoff = (long)a[3];
+ uint64_t tid = (uint64_t)pthread_self();
+ long i;
+
+ /* mark pages */
+ for (i = 0; i < npages; i++)
+ pwrite(fd, &tid, sizeof(tid), i * page_size + pgoff);
+
+ return NULL;
+}
int test_this(int fd, loff_t sz)
{
long npages;
char *vastart;
char *va;
- void *targs[THREADS][3];
+ void *targs[THREADS][4];
pthread_t t[THREADS];
uint64_t tid[THREADS];
int errcnt;
@@ -107,14 +124,17 @@ int test_this(int fd, loff_t sz)
/* prepare the thread args */
for (i = 0; i < THREADS; i++) {
- targs[i][0] = vastart;
- targs[i][1] = (void *)npages;
- targs[i][2] = (void *)page_offs[i];
+ targs[i][0] = (void *)(long)fd;
+ targs[i][1] = vastart;
+ targs[i][2] = (void *)npages;
+ targs[i][3] = (void *)page_offs[i];
}
for (i = 0; i < THREADS; i++) {
/* start two threads */
- if (pthread_create(&t[i], NULL, pt_page_marker, &targs[i])) {
+ if (pthread_create(&t[i], NULL,
+ use_wr[i] ? pt_write_marker : pt_page_marker,
+ &targs[i])) {
perror("pthread_create");
exit(21);
}
@@ -157,6 +177,7 @@ int main(int argc, char **argv)
int toterr = 0;
int i, step;
char *endch;
+ int opt;
page_size = getpagesize();
step = page_size / THREADS;
@@ -164,22 +185,29 @@ int main(int argc, char **argv)
for (i = 1; i < THREADS; i++)
page_offs[i] = page_offs[i-1] + step;
- /* process command line */
- argc--; argv++;
- /* ignore errors? */
- if ((argc == 3) && !strcmp(argv[0], "-f")) {
- stoponerror = 0;
- argc--;
- argv++;
+ while ((opt = getopt(argc, argv, "fw")) > 0) {
+ switch (opt) {
+ case 'f':
+ /* ignore errors */
+ stoponerror = 0;
+ break;
+ case 'w':
+ /* use writes instead of mmap for one thread */
+ use_wr[0] = 1;
+ break;
+ default:
+ fprintf(stderr, "ERROR: Unknown option character.\n");
+ exit(1);
+ }
}
- /* file name and size */
- if (argc != 2 || argv[0][0] == '-') {
- fprintf(stderr, "ERROR: usage: holetest [-f] "
+
+ if (optind != argc - 2) {
+ fprintf(stderr, "ERROR: usage: holetest [-fw] "
"FILENAME FILESIZEinMB\n");
exit(1);
}
- path = argv[0];
- sz = strtol(argv[1], &endch, 10);
+ path = argv[optind];
+ sz = strtol(argv[optind + 1], &endch, 10);
if (*endch || sz < 1) {
fprintf(stderr, "ERROR: bad FILESIZEinMB\n");
exit(1);
diff --git a/tests/generic/341 b/tests/generic/341
index 1fde346adc85..05bd86707592 100644
--- a/tests/generic/341
+++ b/tests/generic/341
@@ -51,10 +51,6 @@ _supported_os Linux
_require_scratch
_require_dm_target flakey
_require_metadata_journaling $SCRATCH_DEV
-
-rm -f $seqres.full
-
-_scratch_mkfs >>$seqres.full 2>&1
_init_flakey
_mount_flakey
diff --git a/tests/generic/343 b/tests/generic/343
new file mode 100644
index 000000000000..8e624507fea9
--- /dev/null
+++ b/tests/generic/343
@@ -0,0 +1,58 @@
+#! /bin/bash
+# FSQA Test No. 343
+#
+# Test races between mmap and normal writes from racing threads
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Jan Kara <jack@suse.cz>
+#
+# 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.
+#
+# This program is distributed in the hope that it would 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 the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment and checks
+. ./common/rc
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+_require_test_program "holetest"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+src/holetest -f -w $SCRATCH_MNT/testfile 1
+src/holetest -f -w $SCRATCH_MNT/testfile 16
+src/holetest -f -w $SCRATCH_MNT/testfile 256
+
+status=0
+exit
diff --git a/tests/generic/343.out b/tests/generic/343.out
new file mode 100644
index 000000000000..495c8a84eaa2
--- /dev/null
+++ b/tests/generic/343.out
@@ -0,0 +1,55 @@
+QA output created by 343
+
+INFO: zero-filled test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
diff --git a/tests/generic/group b/tests/generic/group
index ef1a423495a7..05b0448d64f4 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -345,3 +345,4 @@
340 auto
341 auto quick metadata
342 auto quick metadata
+343 auto
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] generic/343: Test races between mmap and normal writes
2016-04-18 19:32 ` [PATCH 2/5] generic/343: Test races between mmap and normal writes Jan Kara
@ 2016-04-27 15:04 ` Brian Foster
2016-04-27 16:16 ` Jan Kara
0 siblings, 1 reply; 9+ messages in thread
From: Brian Foster @ 2016-04-27 15:04 UTC (permalink / raw)
To: Jan Kara; +Cc: fstests
On Mon, Apr 18, 2016 at 09:32:32PM +0200, Jan Kara wrote:
> Add test which spawns two threads one writing to file via normal write
> and one via mmap and checks the result. This is mainly interesting to
> uncover races between DAX fault handling and write path.
>
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> src/holetest.c | 68 ++++++++++++++++++++++++++++++++++++---------------
> tests/generic/341 | 4 ---
> tests/generic/343 | 58 +++++++++++++++++++++++++++++++++++++++++++
> tests/generic/343.out | 55 +++++++++++++++++++++++++++++++++++++++++
> tests/generic/group | 1 +
> 5 files changed, 162 insertions(+), 24 deletions(-)
> create mode 100644 tests/generic/343
> create mode 100644 tests/generic/343.out
>
...
> diff --git a/tests/generic/341 b/tests/generic/341
> index 1fde346adc85..05bd86707592 100644
> --- a/tests/generic/341
> +++ b/tests/generic/341
> @@ -51,10 +51,6 @@ _supported_os Linux
> _require_scratch
> _require_dm_target flakey
> _require_metadata_journaling $SCRATCH_DEV
> -
> -rm -f $seqres.full
> -
> -_scratch_mkfs >>$seqres.full 2>&1
> _init_flakey
> _mount_flakey
>
What's this hunk about? FWIW, the rest of the series looks fine to me.
Brian
> diff --git a/tests/generic/343 b/tests/generic/343
> new file mode 100644
> index 000000000000..8e624507fea9
> --- /dev/null
> +++ b/tests/generic/343
> @@ -0,0 +1,58 @@
> +#! /bin/bash
> +# FSQA Test No. 343
> +#
> +# Test races between mmap and normal writes from racing threads
> +#
> +#-----------------------------------------------------------------------
> +#
> +# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
> +# Author: Jan Kara <jack@suse.cz>
> +#
> +# 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.
> +#
> +# This program is distributed in the hope that it would 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 the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.*
> +}
> +
> +# get standard environment and checks
> +. ./common/rc
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +_require_scratch
> +_require_test_program "holetest"
> +
> +rm -f $seqres.full
> +
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount
> +
> +src/holetest -f -w $SCRATCH_MNT/testfile 1
> +src/holetest -f -w $SCRATCH_MNT/testfile 16
> +src/holetest -f -w $SCRATCH_MNT/testfile 256
> +
> +status=0
> +exit
> diff --git a/tests/generic/343.out b/tests/generic/343.out
> new file mode 100644
> index 000000000000..495c8a84eaa2
> --- /dev/null
> +++ b/tests/generic/343.out
> @@ -0,0 +1,55 @@
> +QA output created by 343
> +
> +INFO: zero-filled test...
> +INFO: sz = 1048576
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: posix_fallocate test...
> +INFO: sz = 1048576
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: ftruncate test...
> +INFO: sz = 1048576
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: zero-filled test...
> +INFO: sz = 16777216
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: posix_fallocate test...
> +INFO: sz = 16777216
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: ftruncate test...
> +INFO: sz = 16777216
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: zero-filled test...
> +INFO: sz = 268435456
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: posix_fallocate test...
> +INFO: sz = 268435456
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> +
> +INFO: ftruncate test...
> +INFO: sz = 268435456
> +INFO: thread 0 created
> +INFO: thread 1 created
> +INFO: 0 error(s) detected
> diff --git a/tests/generic/group b/tests/generic/group
> index ef1a423495a7..05b0448d64f4 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -345,3 +345,4 @@
> 340 auto
> 341 auto quick metadata
> 342 auto quick metadata
> +343 auto
> --
> 2.6.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/5] generic/343: Test races between mmap and normal writes
2016-04-27 15:04 ` Brian Foster
@ 2016-04-27 16:16 ` Jan Kara
2016-04-27 16:19 ` Jan Kara
0 siblings, 1 reply; 9+ messages in thread
From: Jan Kara @ 2016-04-27 16:16 UTC (permalink / raw)
To: Brian Foster; +Cc: Jan Kara, fstests
On Wed 27-04-16 11:04:35, Brian Foster wrote:
> On Mon, Apr 18, 2016 at 09:32:32PM +0200, Jan Kara wrote:
> > diff --git a/tests/generic/341 b/tests/generic/341
> > index 1fde346adc85..05bd86707592 100644
> > --- a/tests/generic/341
> > +++ b/tests/generic/341
> > @@ -51,10 +51,6 @@ _supported_os Linux
> > _require_scratch
> > _require_dm_target flakey
> > _require_metadata_journaling $SCRATCH_DEV
> > -
> > -rm -f $seqres.full
> > -
> > -_scratch_mkfs >>$seqres.full 2>&1
> > _init_flakey
> > _mount_flakey
> >
>
> What's this hunk about? FWIW, the rest of the series looks fine to me.
Argh, that sneaked in likely when I was rebasing the series and resolving
conflicts. This hunk should be dropped. Thanks for catching this!
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] generic/343: Test races between mmap and normal writes
2016-04-27 16:16 ` Jan Kara
@ 2016-04-27 16:19 ` Jan Kara
0 siblings, 0 replies; 9+ messages in thread
From: Jan Kara @ 2016-04-27 16:19 UTC (permalink / raw)
To: Brian Foster; +Cc: Jan Kara, fstests
[-- Attachment #1: Type: text/plain, Size: 952 bytes --]
On Wed 27-04-16 18:16:30, Jan Kara wrote:
> On Wed 27-04-16 11:04:35, Brian Foster wrote:
> > On Mon, Apr 18, 2016 at 09:32:32PM +0200, Jan Kara wrote:
> > > diff --git a/tests/generic/341 b/tests/generic/341
> > > index 1fde346adc85..05bd86707592 100644
> > > --- a/tests/generic/341
> > > +++ b/tests/generic/341
> > > @@ -51,10 +51,6 @@ _supported_os Linux
> > > _require_scratch
> > > _require_dm_target flakey
> > > _require_metadata_journaling $SCRATCH_DEV
> > > -
> > > -rm -f $seqres.full
> > > -
> > > -_scratch_mkfs >>$seqres.full 2>&1
> > > _init_flakey
> > > _mount_flakey
> > >
> >
> > What's this hunk about? FWIW, the rest of the series looks fine to me.
>
> Argh, that sneaked in likely when I was rebasing the series and resolving
> conflicts. This hunk should be dropped. Thanks for catching this!
Attached is a new version of the patch with the above hunk removed.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
[-- Attachment #2: 0002-generic-343-Test-races-between-mmap-and-normal-write.patch --]
[-- Type: text/x-patch, Size: 7314 bytes --]
>From 0c8a84a3ced887c8e522dd00f8738813fac6e9b1 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Wed, 23 Mar 2016 18:18:47 +0100
Subject: [PATCH 2/6] generic/343: Test races between mmap and normal writes
Add test which spawns two threads one writing to file via normal write
and one via mmap and checks the result. This is mainly interesting to
uncover races between DAX fault handling and write path.
Signed-off-by: Jan Kara <jack@suse.cz>
---
src/holetest.c | 68 ++++++++++++++++++++++++++++++++++++---------------
tests/generic/343 | 58 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/343.out | 55 +++++++++++++++++++++++++++++++++++++++++
tests/generic/group | 1 +
4 files changed, 162 insertions(+), 20 deletions(-)
create mode 100644 tests/generic/343
create mode 100644 tests/generic/343.out
diff --git a/src/holetest.c b/src/holetest.c
index c5a4fd5c043a..6f23110b3769 100644
--- a/src/holetest.c
+++ b/src/holetest.c
@@ -60,18 +60,20 @@
#include <unistd.h>
#include <pthread.h>
#include <string.h>
+#include <getopt.h>
#define THREADS 2
long page_size;
long page_offs[THREADS];
+int use_wr[THREADS];
void *pt_page_marker(void *args)
{
void **a = args;
- char *va = (char *)a[0];
- long npages = (long)a[1];
- long pgoff = (long)a[2];
+ char *va = (char *)a[1];
+ long npages = (long)a[2];
+ long pgoff = (long)a[3];
uint64_t tid = (uint64_t)pthread_self();
va += pgoff;
@@ -83,13 +85,28 @@ void *pt_page_marker(void *args)
return NULL;
} /* pt_page_marker() */
+void *pt_write_marker(void *args)
+{
+ void **a = args;
+ int fd = (long)a[0];
+ long npages = (long)a[2];
+ long pgoff = (long)a[3];
+ uint64_t tid = (uint64_t)pthread_self();
+ long i;
+
+ /* mark pages */
+ for (i = 0; i < npages; i++)
+ pwrite(fd, &tid, sizeof(tid), i * page_size + pgoff);
+
+ return NULL;
+}
int test_this(int fd, loff_t sz)
{
long npages;
char *vastart;
char *va;
- void *targs[THREADS][3];
+ void *targs[THREADS][4];
pthread_t t[THREADS];
uint64_t tid[THREADS];
int errcnt;
@@ -107,14 +124,17 @@ int test_this(int fd, loff_t sz)
/* prepare the thread args */
for (i = 0; i < THREADS; i++) {
- targs[i][0] = vastart;
- targs[i][1] = (void *)npages;
- targs[i][2] = (void *)page_offs[i];
+ targs[i][0] = (void *)(long)fd;
+ targs[i][1] = vastart;
+ targs[i][2] = (void *)npages;
+ targs[i][3] = (void *)page_offs[i];
}
for (i = 0; i < THREADS; i++) {
/* start two threads */
- if (pthread_create(&t[i], NULL, pt_page_marker, &targs[i])) {
+ if (pthread_create(&t[i], NULL,
+ use_wr[i] ? pt_write_marker : pt_page_marker,
+ &targs[i])) {
perror("pthread_create");
exit(21);
}
@@ -157,6 +177,7 @@ int main(int argc, char **argv)
int toterr = 0;
int i, step;
char *endch;
+ int opt;
page_size = getpagesize();
step = page_size / THREADS;
@@ -164,22 +185,29 @@ int main(int argc, char **argv)
for (i = 1; i < THREADS; i++)
page_offs[i] = page_offs[i-1] + step;
- /* process command line */
- argc--; argv++;
- /* ignore errors? */
- if ((argc == 3) && !strcmp(argv[0], "-f")) {
- stoponerror = 0;
- argc--;
- argv++;
+ while ((opt = getopt(argc, argv, "fw")) > 0) {
+ switch (opt) {
+ case 'f':
+ /* ignore errors */
+ stoponerror = 0;
+ break;
+ case 'w':
+ /* use writes instead of mmap for one thread */
+ use_wr[0] = 1;
+ break;
+ default:
+ fprintf(stderr, "ERROR: Unknown option character.\n");
+ exit(1);
+ }
}
- /* file name and size */
- if (argc != 2 || argv[0][0] == '-') {
- fprintf(stderr, "ERROR: usage: holetest [-f] "
+
+ if (optind != argc - 2) {
+ fprintf(stderr, "ERROR: usage: holetest [-fw] "
"FILENAME FILESIZEinMB\n");
exit(1);
}
- path = argv[0];
- sz = strtol(argv[1], &endch, 10);
+ path = argv[optind];
+ sz = strtol(argv[optind + 1], &endch, 10);
if (*endch || sz < 1) {
fprintf(stderr, "ERROR: bad FILESIZEinMB\n");
exit(1);
diff --git a/tests/generic/343 b/tests/generic/343
new file mode 100644
index 000000000000..8e624507fea9
--- /dev/null
+++ b/tests/generic/343
@@ -0,0 +1,58 @@
+#! /bin/bash
+# FSQA Test No. 343
+#
+# Test races between mmap and normal writes from racing threads
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Jan Kara <jack@suse.cz>
+#
+# 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.
+#
+# This program is distributed in the hope that it would 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 the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment and checks
+. ./common/rc
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+_require_test_program "holetest"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+src/holetest -f -w $SCRATCH_MNT/testfile 1
+src/holetest -f -w $SCRATCH_MNT/testfile 16
+src/holetest -f -w $SCRATCH_MNT/testfile 256
+
+status=0
+exit
diff --git a/tests/generic/343.out b/tests/generic/343.out
new file mode 100644
index 000000000000..495c8a84eaa2
--- /dev/null
+++ b/tests/generic/343.out
@@ -0,0 +1,55 @@
+QA output created by 343
+
+INFO: zero-filled test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 1048576
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
diff --git a/tests/generic/group b/tests/generic/group
index ef1a423495a7..05b0448d64f4 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -345,3 +345,4 @@
340 auto
341 auto quick metadata
342 auto quick metadata
+343 auto
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] generic/344: Test races between mmap and normal write for prefaulted ranges
2016-04-18 19:32 [PATCH 1/5] More page fault stress tests and generic/038 fix Jan Kara
2016-04-18 19:32 ` [PATCH 1/5] generic/340: Remove second fallocate test Jan Kara
2016-04-18 19:32 ` [PATCH 2/5] generic/343: Test races between mmap and normal writes Jan Kara
@ 2016-04-18 19:32 ` Jan Kara
2016-04-18 19:32 ` [PATCH 4/5] generic/345: Test races between processes doing mmap writes Jan Kara
2016-04-18 19:32 ` [PATCH 5/5] generic/038: Avoid EBUSY errors on umount Jan Kara
4 siblings, 0 replies; 9+ messages in thread
From: Jan Kara @ 2016-04-18 19:32 UTC (permalink / raw)
To: fstests; +Cc: Jan Kara
Add test which spawns two threads both writing one file via mmap which
has been previously prefaulted by reading. Do the same test when one
thread accesses the file via mmap and the other one via normal write.
This is mainly interesting to uncover races in DAX fault handling and
between DAX fault handling and write path.
Signed-off-by: Jan Kara <jack@suse.cz>
---
src/holetest.c | 19 ++++++++++++--
tests/generic/344 | 60 ++++++++++++++++++++++++++++++++++++++++++
tests/generic/344.out | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/generic/group | 1 +
4 files changed, 151 insertions(+), 2 deletions(-)
create mode 100644 tests/generic/344
create mode 100644 tests/generic/344.out
diff --git a/src/holetest.c b/src/holetest.c
index 6f23110b3769..252fe734523e 100644
--- a/src/holetest.c
+++ b/src/holetest.c
@@ -67,6 +67,7 @@
long page_size;
long page_offs[THREADS];
int use_wr[THREADS];
+int prefault = 0;
void *pt_page_marker(void *args)
{
@@ -122,6 +123,16 @@ int test_this(int fd, loff_t sz)
exit(20);
}
+ if (prefault) {
+ for (i = 0; i < npages; i++) {
+ if (vastart[i * page_size] != 0) {
+ fprintf(stderr, "Prefaulting found non-zero "
+ "value in page %d: %d\n", i,
+ vastart[i * page_size]);
+ }
+ }
+ }
+
/* prepare the thread args */
for (i = 0; i < THREADS; i++) {
targs[i][0] = (void *)(long)fd;
@@ -185,7 +196,7 @@ int main(int argc, char **argv)
for (i = 1; i < THREADS; i++)
page_offs[i] = page_offs[i-1] + step;
- while ((opt = getopt(argc, argv, "fw")) > 0) {
+ while ((opt = getopt(argc, argv, "fwr")) > 0) {
switch (opt) {
case 'f':
/* ignore errors */
@@ -195,6 +206,10 @@ int main(int argc, char **argv)
/* use writes instead of mmap for one thread */
use_wr[0] = 1;
break;
+ case 'r':
+ /* prefault mmapped area by reading it */
+ prefault = 1;
+ break;
default:
fprintf(stderr, "ERROR: Unknown option character.\n");
exit(1);
@@ -202,7 +217,7 @@ int main(int argc, char **argv)
}
if (optind != argc - 2) {
- fprintf(stderr, "ERROR: usage: holetest [-fw] "
+ fprintf(stderr, "ERROR: usage: holetest [-fwr] "
"FILENAME FILESIZEinMB\n");
exit(1);
}
diff --git a/tests/generic/344 b/tests/generic/344
new file mode 100644
index 000000000000..1c10a955c8e6
--- /dev/null
+++ b/tests/generic/344
@@ -0,0 +1,60 @@
+#! /bin/bash
+# FSQA Test No. 344
+#
+# Test races between mmap from racing threads when pages are prefaulted,
+# Test races between mmap and buffered writes when pages are prefaulted.
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Jan Kara <jack@suse.cz>
+#
+# 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.
+#
+# This program is distributed in the hope that it would 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 the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment and checks
+. ./common/rc
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+_require_test_program "holetest"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+src/holetest -f -r $SCRATCH_MNT/testfile 16
+src/holetest -f -r $SCRATCH_MNT/testfile 256
+src/holetest -f -r -w $SCRATCH_MNT/testfile 16
+src/holetest -f -r -w $SCRATCH_MNT/testfile 256
+
+status=0
+exit
diff --git a/tests/generic/344.out b/tests/generic/344.out
new file mode 100644
index 000000000000..3ae5e5b373d9
--- /dev/null
+++ b/tests/generic/344.out
@@ -0,0 +1,73 @@
+QA output created by 344
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: thread 0 created
+INFO: thread 1 created
+INFO: 0 error(s) detected
diff --git a/tests/generic/group b/tests/generic/group
index 05b0448d64f4..e58d36085585 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -346,3 +346,4 @@
341 auto quick metadata
342 auto quick metadata
343 auto
+344 auto
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] generic/345: Test races between processes doing mmap writes
2016-04-18 19:32 [PATCH 1/5] More page fault stress tests and generic/038 fix Jan Kara
` (2 preceding siblings ...)
2016-04-18 19:32 ` [PATCH 3/5] generic/344: Test races between mmap and normal write for prefaulted ranges Jan Kara
@ 2016-04-18 19:32 ` Jan Kara
2016-04-18 19:32 ` [PATCH 5/5] generic/038: Avoid EBUSY errors on umount Jan Kara
4 siblings, 0 replies; 9+ messages in thread
From: Jan Kara @ 2016-04-18 19:32 UTC (permalink / raw)
To: fstests; +Cc: Jan Kara
Add test which spawns two processes both writing one file via mmap.
Then to the test when processes first prefault the file by reading it
via mmap. This is mainly interesting to uncover races in DAX fault
handling.
Signed-off-by: Jan Kara <jack@suse.cz>
---
src/holetest.c | 90 +++++++++++++++++++++++++++++++++++++++------------
tests/generic/345 | 59 +++++++++++++++++++++++++++++++++
tests/generic/345.out | 73 +++++++++++++++++++++++++++++++++++++++++
tests/generic/group | 1 +
4 files changed, 203 insertions(+), 20 deletions(-)
create mode 100644 tests/generic/345
create mode 100644 tests/generic/345.out
diff --git a/src/holetest.c b/src/holetest.c
index 252fe734523e..03c03604ab18 100644
--- a/src/holetest.c
+++ b/src/holetest.c
@@ -61,6 +61,7 @@
#include <pthread.h>
#include <string.h>
#include <getopt.h>
+#include <sys/wait.h>
#define THREADS 2
@@ -68,6 +69,26 @@ long page_size;
long page_offs[THREADS];
int use_wr[THREADS];
int prefault = 0;
+int use_fork = 0;
+
+uint64_t get_id(void)
+{
+ if (!use_fork)
+ return (uint64_t) pthread_self();
+ return getpid();
+}
+
+void prefault_mapping(char *addr, long npages)
+{
+ long i;
+
+ for (i = 0; i < npages; i++) {
+ if (addr[i * page_size] != 0) {
+ fprintf(stderr, "Prefaulting found non-zero value in "
+ "page %ld: %d\n", i, (int)addr[i * page_size]);
+ }
+ }
+}
void *pt_page_marker(void *args)
{
@@ -75,7 +96,10 @@ void *pt_page_marker(void *args)
char *va = (char *)a[1];
long npages = (long)a[2];
long pgoff = (long)a[3];
- uint64_t tid = (uint64_t)pthread_self();
+ uint64_t tid = get_id();
+
+ if (prefault && use_fork)
+ prefault_mapping(va, npages);
va += pgoff;
@@ -92,7 +116,7 @@ void *pt_write_marker(void *args)
int fd = (long)a[0];
long npages = (long)a[2];
long pgoff = (long)a[3];
- uint64_t tid = (uint64_t)pthread_self();
+ uint64_t tid = get_id();
long i;
/* mark pages */
@@ -123,15 +147,8 @@ int test_this(int fd, loff_t sz)
exit(20);
}
- if (prefault) {
- for (i = 0; i < npages; i++) {
- if (vastart[i * page_size] != 0) {
- fprintf(stderr, "Prefaulting found non-zero "
- "value in page %d: %d\n", i,
- vastart[i * page_size]);
- }
- }
- }
+ if (prefault && !use_fork)
+ prefault_mapping(vastart, npages);
/* prepare the thread args */
for (i = 0; i < THREADS; i++) {
@@ -142,20 +159,49 @@ int test_this(int fd, loff_t sz)
}
for (i = 0; i < THREADS; i++) {
- /* start two threads */
- if (pthread_create(&t[i], NULL,
+ if (!use_fork) {
+ /* start two threads */
+ if (pthread_create(&t[i], NULL,
use_wr[i] ? pt_write_marker : pt_page_marker,
&targs[i])) {
- perror("pthread_create");
- exit(21);
+ perror("pthread_create");
+ exit(21);
+ }
+ tid[i] = (uint64_t)t[i];
+ printf("INFO: thread %d created\n", i);
+ } else {
+ /*
+ * Flush stdout before fork, otherwise some lines get
+ * duplicated... ?!?!?
+ */
+ fflush(stdout);
+ tid[i] = fork();
+ if (tid[i] < 0) {
+ int j;
+
+ perror("fork");
+ for (j = 0; j < i; j++)
+ waitpid(tid[j], NULL, 0);
+ exit(21);
+ }
+ /* Child? */
+ if (!tid[i]) {
+ if (use_wr[i])
+ pt_write_marker(&targs[i]);
+ else
+ pt_page_marker(&targs[i]);
+ exit(0);
+ }
+ printf("INFO: process %d created\n", i);
}
- tid[i] = (uint64_t)t[i];
- printf("INFO: thread %d created\n", i);
}
/* wait for them to finish */
for (i = 0; i < THREADS; i++)
- pthread_join(t[i], NULL);
+ if (!use_fork)
+ pthread_join(t[i], NULL);
+ else
+ waitpid(tid[i], NULL, 0);
/* check markers on each page */
errcnt = 0;
@@ -196,7 +242,7 @@ int main(int argc, char **argv)
for (i = 1; i < THREADS; i++)
page_offs[i] = page_offs[i-1] + step;
- while ((opt = getopt(argc, argv, "fwr")) > 0) {
+ while ((opt = getopt(argc, argv, "fwrF")) > 0) {
switch (opt) {
case 'f':
/* ignore errors */
@@ -210,6 +256,10 @@ int main(int argc, char **argv)
/* prefault mmapped area by reading it */
prefault = 1;
break;
+ case 'F':
+ /* create processes instead of threads */
+ use_fork = 1;
+ break;
default:
fprintf(stderr, "ERROR: Unknown option character.\n");
exit(1);
@@ -217,7 +267,7 @@ int main(int argc, char **argv)
}
if (optind != argc - 2) {
- fprintf(stderr, "ERROR: usage: holetest [-fwr] "
+ fprintf(stderr, "ERROR: usage: holetest [-fwrF] "
"FILENAME FILESIZEinMB\n");
exit(1);
}
diff --git a/tests/generic/345 b/tests/generic/345
new file mode 100644
index 000000000000..780cf7c37a67
--- /dev/null
+++ b/tests/generic/345
@@ -0,0 +1,59 @@
+#! /bin/bash
+# FSQA Test No. 345
+#
+# Test races between mmap from racing processes with and without prefaulting.
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Jan Kara <jack@suse.cz>
+#
+# 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.
+#
+# This program is distributed in the hope that it would 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 the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment and checks
+. ./common/rc
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+_require_test_program "holetest"
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+src/holetest -f -F $SCRATCH_MNT/testfile 16
+src/holetest -f -F $SCRATCH_MNT/testfile 256
+src/holetest -f -F -r $SCRATCH_MNT/testfile 16
+src/holetest -f -F -r $SCRATCH_MNT/testfile 256
+
+status=0
+exit
diff --git a/tests/generic/345.out b/tests/generic/345.out
new file mode 100644
index 000000000000..39a4ac6a8b32
--- /dev/null
+++ b/tests/generic/345.out
@@ -0,0 +1,73 @@
+QA output created by 345
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 16777216
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: zero-filled test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: posix_fallocate test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
+
+INFO: ftruncate test...
+INFO: sz = 268435456
+INFO: process 0 created
+INFO: process 1 created
+INFO: 0 error(s) detected
diff --git a/tests/generic/group b/tests/generic/group
index e58d36085585..caf4483313e7 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -347,3 +347,4 @@
342 auto quick metadata
343 auto
344 auto
+345 auto
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] generic/038: Avoid EBUSY errors on umount
2016-04-18 19:32 [PATCH 1/5] More page fault stress tests and generic/038 fix Jan Kara
` (3 preceding siblings ...)
2016-04-18 19:32 ` [PATCH 4/5] generic/345: Test races between processes doing mmap writes Jan Kara
@ 2016-04-18 19:32 ` Jan Kara
4 siblings, 0 replies; 9+ messages in thread
From: Jan Kara @ 2016-04-18 19:32 UTC (permalink / raw)
To: fstests; +Cc: Jan Kara
Although the test waits for running subshells after sending SIGTERM
signal to them, it does not wait for subprocesses of those subshells
properly. Thus we can hit EBUSY errors when umount is called. Make
subshells wait for executed subprocesses when receiving SIGTERM to avoid
the problem.
Signed-off-by: Jan Kara <jack@suse.cz>
---
tests/generic/038 | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/tests/generic/038 b/tests/generic/038
index 59aed67ab2ff..025e1b0fe7a6 100755
--- a/tests/generic/038
+++ b/tests/generic/038
@@ -77,6 +77,10 @@ rm -f $seqres.full
# fstrim loop below.
fallocate_loop()
{
+ # Wait for running subcommand before exitting so that
+ # mountpoint is not busy when we try to unmount it
+ trap "wait; exit" SIGTERM
+
local name=$1
while true; do
$XFS_IO_PROG -f -c "falloc -k 0 1G" \
@@ -90,6 +94,10 @@ fallocate_loop()
trim_loop()
{
+ # Wait for running subcommand before exitting so that
+ # mountpoint is not busy when we try to unmount it
+ trap "wait; exit" SIGTERM
+
while true; do
$FSTRIM_PROG $SCRATCH_MNT
done
@@ -115,7 +123,9 @@ create_files()
for ((n = 0; n < 4; n++)); do
mkdir $SCRATCH_MNT/$n
(
- for ((i = 1; i <= $nr_files; i++)); do
+ trap "wait; exit" SIGTERM
+
+ for ((i = 1; i <= $nr_files; i++)); do
$XFS_IO_PROG -f -c "pwrite -S 0xaa 0 3900" \
$SCRATCH_MNT/$n/"${prefix}_$i" &> /dev/null
if [ $? -ne 0 ]; then
@@ -152,9 +162,6 @@ kill ${fallocate_pids[@]}
kill ${trim_pids[@]}
wait
-# Sleep a bit, otherwise umount fails often with EBUSY (TODO: investigate why).
-sleep 3
-
# The fstests framework will now check for fs consistency with fsck.
# The trimming was racy and caused some btree nodes to get full of zeroes on
# disk, which obviously caused fs metadata corruption. The race often lead
--
2.6.6
^ permalink raw reply related [flat|nested] 9+ messages in thread