* [PATCH v2 0/3] xfs: add memory failure tests for dax mode
@ 2022-05-13 3:14 Shiyang Ruan
2022-05-13 3:14 ` [PATCH 1/3] xfs: add memory failure test " Shiyang Ruan
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-13 3:14 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
This patchset is to verify whether memory failure mechanism still works
with the fsdax-rmap feature. With this feature, fsdax and reflink can be
used together[1]. So, we also test it for reflinked files in filesystem
mounted with dax option.
[1] https://lore.kernel.org/linux-xfs/20220508143620.1775214-1-ruansy.fnst@fujitsu.com/
Changes since v1:
1. Fixed typo
2. Use `sysconf(_SC_PAGESIZE)` as page size, instead of the fixed 4KiB
3. Use `$(get_page_size)` in testcase
4. Unify the style of comments => /* */
Shiyang Ruan (3):
xfs: add memory failure test for dax mode
xfs: add memory failure test for dax&reflink mode
xfs: add memory failure test for partly-reflinked&dax file
.gitignore | 1 +
src/Makefile | 3 +-
src/t_mmap_cow_memory_failure.c | 157 ++++++++++++++++++++++++++++++++
tests/xfs/900 | 48 ++++++++++
tests/xfs/900.out | 9 ++
tests/xfs/901 | 49 ++++++++++
tests/xfs/901.out | 9 ++
tests/xfs/902 | 52 +++++++++++
tests/xfs/902.out | 9 ++
9 files changed, 336 insertions(+), 1 deletion(-)
create mode 100644 src/t_mmap_cow_memory_failure.c
create mode 100755 tests/xfs/900
create mode 100644 tests/xfs/900.out
create mode 100755 tests/xfs/901
create mode 100644 tests/xfs/901.out
create mode 100755 tests/xfs/902
create mode 100644 tests/xfs/902.out
--
2.35.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] xfs: add memory failure test for dax mode
2022-05-13 3:14 [PATCH v2 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
@ 2022-05-13 3:14 ` Shiyang Ruan
2022-05-18 18:38 ` Zorro Lang
2022-05-13 3:14 ` [PATCH 2/3] xfs: add memory failure test for dax&reflink mode Shiyang Ruan
2022-05-13 3:14 ` [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file Shiyang Ruan
2 siblings, 1 reply; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-13 3:14 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
Make sure memory failure mechanism works when filesystem is mounted with
dax option.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
.gitignore | 1 +
src/Makefile | 3 +-
src/t_mmap_cow_memory_failure.c | 157 ++++++++++++++++++++++++++++++++
tests/xfs/900 | 48 ++++++++++
tests/xfs/900.out | 9 ++
5 files changed, 217 insertions(+), 1 deletion(-)
create mode 100644 src/t_mmap_cow_memory_failure.c
create mode 100755 tests/xfs/900
create mode 100644 tests/xfs/900.out
diff --git a/.gitignore b/.gitignore
index ba0c572b..1d26b28a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ tags
/src/t_holes
/src/t_immutable
/src/t_mmap_collision
+/src/t_mmap_cow_memory_failure
/src/t_mmap_cow_race
/src/t_mmap_dio
/src/t_mmap_fallocate
diff --git a/src/Makefile b/src/Makefile
index 111ce1d9..d702e200 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,8 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption \
t_ofd_locks t_mmap_collision mmap-write-concurrent \
t_get_file_time t_create_short_dirs t_create_long_dirs t_enospc \
- t_mmap_writev_overlap checkpoint_journal mmap-rw-fault allocstale
+ t_mmap_writev_overlap checkpoint_journal mmap-rw-fault allocstale \
+ t_mmap_cow_memory_failure
LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_cow_memory_failure.c b/src/t_mmap_cow_memory_failure.c
new file mode 100644
index 00000000..4b2c1b8a
--- /dev/null
+++ b/src/t_mmap_cow_memory_failure.c
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Fujitsu Corporation. */
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <semaphore.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <sys/sem.h>
+#include <time.h>
+#include <unistd.h>
+
+sem_t *sem;
+
+void sigbus_handler(int signal)
+{
+ printf("Process is killed by signal: %d\n", signal);
+ sem_post(sem);
+}
+
+void mmap_read_file(char *filename, off_t offset, size_t size)
+{
+ int fd;
+ char *map, *dummy;
+ struct timespec ts;
+
+ fd = open(filename, O_RDWR);
+ map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
+ dummy = malloc(size);
+
+ /* make sure page fault happens */
+ memcpy(dummy, map, size);
+
+ /* ready */
+ sem_post(sem);
+
+ usleep(200000);
+
+ clock_gettime(CLOCK_REALTIME, &ts);
+ ts.tv_sec += 3;
+ /* wait for injection done */
+ sem_timedwait(sem, &ts);
+
+ free(dummy);
+ munmap(map, size);
+ close(fd);
+}
+
+void mmap_read_file_then_poison(char *filename, off_t offset, size_t size,
+ off_t poisonOffset, size_t poisonSize)
+{
+ int fd, error;
+ char *map, *dummy;
+
+ /* wait for parent preparation done */
+ sem_wait(sem);
+
+ fd = open(filename, O_RDWR);
+ map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
+ dummy = malloc(size);
+
+ /* make sure page fault happens */
+ memcpy(dummy, map, size);
+
+ printf("Inject poison...\n");
+ error = madvise(map + poisonOffset, poisonSize, MADV_HWPOISON);
+ if (error)
+ printf("madvise() has fault: %d, errno: %d\n", error, errno);
+
+ free(dummy);
+ munmap(map, size);
+ close(fd);
+}
+
+int main(int argc, char *argv[])
+{
+ char *pReadFile = NULL, *pPoisonFile = NULL;
+ size_t mmapSize, poisonSize;
+ off_t mmapOffset = 0, poisonOffset = 0;
+ long pagesize = sysconf(_SC_PAGESIZE);
+ int c;
+ pid_t pid;
+
+ if (pagesize < 1) {
+ fprintf(stderr, "sysconf(_SC_PAGESIZE): failed to get page size\n");
+ abort();
+ }
+
+ /* default mmap / poison size, in unit of System Page Size */
+ mmapSize = poisonSize = pagesize;
+
+ while ((c = getopt(argc, argv, "o::s::O::S::R:P:")) != -1) {
+ switch (c) {
+ /* mmap offset */
+ case 'o':
+ mmapOffset = atoi(optarg) * pagesize;
+ break;
+ /* mmap size */
+ case 's':
+ mmapSize = atoi(optarg) * pagesize;
+ break;
+ /* madvice offset */
+ case 'O':
+ poisonOffset = atoi(optarg) * pagesize;
+ break;
+ /* madvice size */
+ case 'S':
+ poisonSize = atoi(optarg) * pagesize;
+ break;
+ /* filename for mmap read */
+ case 'R':
+ pReadFile = optarg;
+ break;
+ /* filename for poison read */
+ case 'P':
+ pPoisonFile = optarg;
+ break;
+ default:
+ printf("Unknown option: %c\n", c);
+ exit(1);
+ }
+ }
+
+ if (!pReadFile || !pPoisonFile) {
+ printf("Usage: \n"
+ " %s [-o mmapOffset] [-s mmapSize] [-O mmapOffset] [-S mmapSize] -R readFile -P poisonFile\n"
+ " (offset and size are both in unit of System Page Size: %ld)\n",
+ basename(argv[0]), pagesize);
+ exit(0);
+ }
+ if (poisonSize < mmapSize)
+ mmapSize = poisonSize;
+
+ /* fork and mmap files */
+ pid = fork();
+ if (pid == 0) {
+ /* handle SIGBUS */
+ signal(SIGBUS, sigbus_handler);
+ sem = sem_open("sync", O_CREAT, 0666, 0);
+
+ /* mread & do memory failure on poison file */
+ mmap_read_file_then_poison(pPoisonFile, mmapOffset, mmapSize,
+ poisonOffset, poisonSize);
+
+ sem_close(sem);
+ } else {
+ sem = sem_open("sync", O_CREAT, 0666, 0);
+
+ /* mread read file, wait for child process to be killed */
+ mmap_read_file(pReadFile, mmapOffset, mmapSize);
+ sem_close(sem);
+ }
+ exit(0);
+}
diff --git a/tests/xfs/900 b/tests/xfs/900
new file mode 100755
index 00000000..da11230a
--- /dev/null
+++ b/tests/xfs/900
@@ -0,0 +1,48 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test No. 900
+#
+# Test memory failure mechanism when dax enabled
+#
+. ./common/preamble
+_begin_fstest auto quick dax
+
+# Import common functions.
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_require_check_dmesg
+_require_scratch_reflink
+_require_cp_reflink
+_require_xfs_scratch_rmapbt
+_require_scratch_dax_mountopt "dax"
+_require_test_program "t_mmap_cow_memory_failure"
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount "-o dax" >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+echo "Create the original files"
+filesize=65536
+_pwrite_byte 0x61 0 $filesize $testdir/testfile >> $seqres.full
+_scratch_cycle_mount "dax"
+
+echo "Inject memory failure (1 page)"
+# create two processes:
+# process1: mread 1 page to cause page fault, and wait
+# process2: mread 1 page to cause page fault, then inject poison on this page
+$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/testfile
+
+echo "Inject memory failure (2 pages)"
+$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/testfile
+
+_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
+_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
+
+# success, all done
+status=0
diff --git a/tests/xfs/900.out b/tests/xfs/900.out
new file mode 100644
index 00000000..d861bf1f
--- /dev/null
+++ b/tests/xfs/900.out
@@ -0,0 +1,9 @@
+QA output created by 900
+Format and mount
+Create the original files
+Inject memory failure (1 page)
+Inject posion...
+Process is killed by signal: 7
+Inject memory failure (2 pages)
+Inject posion...
+Process is killed by signal: 7
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] xfs: add memory failure test for dax&reflink mode
2022-05-13 3:14 [PATCH v2 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
2022-05-13 3:14 ` [PATCH 1/3] xfs: add memory failure test " Shiyang Ruan
@ 2022-05-13 3:14 ` Shiyang Ruan
2022-05-13 3:18 ` Shiyang Ruan
2022-05-13 3:14 ` [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file Shiyang Ruan
2 siblings, 1 reply; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-13 3:14 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
Verify that the dax-rmap feature works.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/xfs/901 | 49 +++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/901.out | 9 +++++++++
2 files changed, 58 insertions(+)
create mode 100755 tests/xfs/901
create mode 100644 tests/xfs/901.out
diff --git a/tests/xfs/901 b/tests/xfs/901
new file mode 100755
index 00000000..26c1581e
--- /dev/null
+++ b/tests/xfs/901
@@ -0,0 +1,49 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test No. 901
+#
+# Test memory failure mechanism when dax and reflink working together
+#
+. ./common/preamble
+_begin_fstest auto quick clone dax
+
+# Import common functions.
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_require_check_dmesg
+_require_scratch_reflink
+_require_cp_reflink
+_require_xfs_scratch_rmapbt
+_require_scratch_dax_mountopt "dax"
+_require_test_program "t_mmap_cow_memory_failure"
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount "-o dax" >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+echo "Create the original files"
+filesize=65536
+_pwrite_byte 0x61 0 $filesize $testdir/testfile >> $seqres.full
+_cp_reflink $testdir/testfile $testdir/poisonfile >> $seqres.full
+_scratch_cycle_mount "dax"
+
+echo "Inject memory failure (1 page)"
+# create two processes:
+# process1: mread 1 page to cause page fault, and wait
+# process2: mread 1 page to cause page fault, then inject poison on this page
+$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/poisonfile
+
+echo "Inject memory failure (2 pages)"
+$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/poisonfile
+
+_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
+_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
+
+# success, all done
+status=0
diff --git a/tests/xfs/901.out b/tests/xfs/901.out
new file mode 100644
index 00000000..92d64846
--- /dev/null
+++ b/tests/xfs/901.out
@@ -0,0 +1,9 @@
+QA output created by 901
+Format and mount
+Create the original files
+Inject memory failure (1 page)
+Inject posion...
+Process is killed by signal: 7
+Inject memory failure (2 pages)
+Inject posion...
+Process is killed by signal: 7
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file
2022-05-13 3:14 [PATCH v2 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
2022-05-13 3:14 ` [PATCH 1/3] xfs: add memory failure test " Shiyang Ruan
2022-05-13 3:14 ` [PATCH 2/3] xfs: add memory failure test for dax&reflink mode Shiyang Ruan
@ 2022-05-13 3:14 ` Shiyang Ruan
2 siblings, 0 replies; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-13 3:14 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
Verify that dax-rmap works for both normal extent and shared extent.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/xfs/902 | 52 +++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/902.out | 9 ++++++++
2 files changed, 61 insertions(+)
create mode 100755 tests/xfs/902
create mode 100644 tests/xfs/902.out
diff --git a/tests/xfs/902 b/tests/xfs/902
new file mode 100755
index 00000000..85ae07a1
--- /dev/null
+++ b/tests/xfs/902
@@ -0,0 +1,52 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test No. 902
+#
+# Test memory failure mechanism when dax and reflink working together
+# test for partly reflinked file
+#
+. ./common/preamble
+_begin_fstest auto quick clone dax
+
+# Import common functions.
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_require_check_dmesg
+_require_scratch_reflink
+_require_xfs_scratch_rmapbt
+_require_scratch_dax_mountopt "dax"
+_require_test_program "t_mmap_cow_memory_failure"
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount "-o dax" >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+echo "Create the original files"
+nr=16
+blksz=$(get_page_size)
+_pwrite_byte 0x61 0 $((blksz * nr)) $testdir/testfile >> $seqres.full
+_pwrite_byte 0x62 0 $((blksz * nr)) $testdir/poisonfile >> $seqres.full
+seq 0 2 $((nr - 1)) | while read i; do
+ _reflink_range $testdir/testfile $((blksz * i)) \
+ $testdir/poisonfile $((blksz * i)) $blksz >> $seqres.full
+done
+_scratch_cycle_mount "dax"
+
+echo "Inject memory failure (1 page)"
+$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/poisonfile
+
+echo "Inject memory failure (2 pages)"
+# poison on reflinked page and not reflinked page
+$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/poisonfile
+
+_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
+_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
+
+# success, all done
+status=0
diff --git a/tests/xfs/902.out b/tests/xfs/902.out
new file mode 100644
index 00000000..3c055d54
--- /dev/null
+++ b/tests/xfs/902.out
@@ -0,0 +1,9 @@
+QA output created by 902
+Format and mount
+Create the original files
+Inject memory failure (1 page)
+Inject posion...
+Process is killed by signal: 7
+Inject memory failure (2 pages)
+Inject posion...
+Process is killed by signal: 7
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] xfs: add memory failure test for dax&reflink mode
2022-05-13 3:14 ` [PATCH 2/3] xfs: add memory failure test for dax&reflink mode Shiyang Ruan
@ 2022-05-13 3:18 ` Shiyang Ruan
0 siblings, 0 replies; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-13 3:18 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
在 2022/5/13 11:14, Shiyang Ruan 写道:
> Verify that the dax-rmap feature works.
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Oh, sorry, I forgot to add Darrick's RVB[1]:
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
[1]
https://lore.kernel.org/fstests/20220427062238.dkgkuzyh3ho2oirt@zlang-mailbox/T/#m0cb12aec91b1ddc92e1907ed0354773778507893
> ---
> tests/xfs/901 | 49 +++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/901.out | 9 +++++++++
> 2 files changed, 58 insertions(+)
> create mode 100755 tests/xfs/901
> create mode 100644 tests/xfs/901.out
>
> diff --git a/tests/xfs/901 b/tests/xfs/901
> new file mode 100755
> index 00000000..26c1581e
> --- /dev/null
> +++ b/tests/xfs/901
> @@ -0,0 +1,49 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# FS QA Test No. 901
> +#
> +# Test memory failure mechanism when dax and reflink working together
> +#
> +. ./common/preamble
> +_begin_fstest auto quick clone dax
> +
> +# Import common functions.
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_require_check_dmesg
> +_require_scratch_reflink
> +_require_cp_reflink
> +_require_xfs_scratch_rmapbt
> +_require_scratch_dax_mountopt "dax"
> +_require_test_program "t_mmap_cow_memory_failure"
> +
> +echo "Format and mount"
> +_scratch_mkfs > $seqres.full 2>&1
> +_scratch_mount "-o dax" >> $seqres.full 2>&1
> +
> +testdir=$SCRATCH_MNT/test-$seq
> +mkdir $testdir
> +
> +echo "Create the original files"
> +filesize=65536
> +_pwrite_byte 0x61 0 $filesize $testdir/testfile >> $seqres.full
> +_cp_reflink $testdir/testfile $testdir/poisonfile >> $seqres.full
> +_scratch_cycle_mount "dax"
> +
> +echo "Inject memory failure (1 page)"
> +# create two processes:
> +# process1: mread 1 page to cause page fault, and wait
> +# process2: mread 1 page to cause page fault, then inject poison on this page
> +$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/poisonfile
> +
> +echo "Inject memory failure (2 pages)"
> +$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/poisonfile
> +
> +_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
> +_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
> +
> +# success, all done
> +status=0
> diff --git a/tests/xfs/901.out b/tests/xfs/901.out
> new file mode 100644
> index 00000000..92d64846
> --- /dev/null
> +++ b/tests/xfs/901.out
> @@ -0,0 +1,9 @@
> +QA output created by 901
> +Format and mount
> +Create the original files
> +Inject memory failure (1 page)
> +Inject posion...
> +Process is killed by signal: 7
> +Inject memory failure (2 pages)
> +Inject posion...
> +Process is killed by signal: 7
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] xfs: add memory failure test for dax mode
2022-05-13 3:14 ` [PATCH 1/3] xfs: add memory failure test " Shiyang Ruan
@ 2022-05-18 18:38 ` Zorro Lang
2022-05-19 1:53 ` Shiyang Ruan
0 siblings, 1 reply; 10+ messages in thread
From: Zorro Lang @ 2022-05-18 18:38 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Fri, May 13, 2022 at 11:14:09AM +0800, Shiyang Ruan wrote:
> Make sure memory failure mechanism works when filesystem is mounted with
> dax option.
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> ---
> .gitignore | 1 +
> src/Makefile | 3 +-
> src/t_mmap_cow_memory_failure.c | 157 ++++++++++++++++++++++++++++++++
> tests/xfs/900 | 48 ++++++++++
> tests/xfs/900.out | 9 ++
> 5 files changed, 217 insertions(+), 1 deletion(-)
> create mode 100644 src/t_mmap_cow_memory_failure.c
> create mode 100755 tests/xfs/900
> create mode 100644 tests/xfs/900.out
>
> diff --git a/.gitignore b/.gitignore
> index ba0c572b..1d26b28a 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -146,6 +146,7 @@ tags
> /src/t_holes
> /src/t_immutable
> /src/t_mmap_collision
> +/src/t_mmap_cow_memory_failure
> /src/t_mmap_cow_race
> /src/t_mmap_dio
> /src/t_mmap_fallocate
> diff --git a/src/Makefile b/src/Makefile
> index 111ce1d9..d702e200 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -18,7 +18,8 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
> t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption \
> t_ofd_locks t_mmap_collision mmap-write-concurrent \
> t_get_file_time t_create_short_dirs t_create_long_dirs t_enospc \
> - t_mmap_writev_overlap checkpoint_journal mmap-rw-fault allocstale
> + t_mmap_writev_overlap checkpoint_journal mmap-rw-fault allocstale \
> + t_mmap_cow_memory_failure
>
> LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
> preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
> diff --git a/src/t_mmap_cow_memory_failure.c b/src/t_mmap_cow_memory_failure.c
> new file mode 100644
> index 00000000..4b2c1b8a
> --- /dev/null
> +++ b/src/t_mmap_cow_memory_failure.c
> @@ -0,0 +1,157 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2022 Fujitsu Corporation. */
> +#include <errno.h>
> +#include <fcntl.h>
> +#include <libgen.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <semaphore.h>
> +#include <sys/mman.h>
> +#include <sys/wait.h>
> +#include <sys/sem.h>
> +#include <time.h>
> +#include <unistd.h>
> +
> +sem_t *sem;
> +
> +void sigbus_handler(int signal)
> +{
> + printf("Process is killed by signal: %d\n", signal);
> + sem_post(sem);
> +}
> +
> +void mmap_read_file(char *filename, off_t offset, size_t size)
> +{
> + int fd;
> + char *map, *dummy;
> + struct timespec ts;
> +
> + fd = open(filename, O_RDWR);
> + map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
> + dummy = malloc(size);
> +
> + /* make sure page fault happens */
> + memcpy(dummy, map, size);
> +
> + /* ready */
> + sem_post(sem);
> +
> + usleep(200000);
> +
> + clock_gettime(CLOCK_REALTIME, &ts);
> + ts.tv_sec += 3;
> + /* wait for injection done */
> + sem_timedwait(sem, &ts);
> +
> + free(dummy);
> + munmap(map, size);
> + close(fd);
> +}
> +
> +void mmap_read_file_then_poison(char *filename, off_t offset, size_t size,
> + off_t poisonOffset, size_t poisonSize)
> +{
> + int fd, error;
> + char *map, *dummy;
> +
> + /* wait for parent preparation done */
> + sem_wait(sem);
> +
> + fd = open(filename, O_RDWR);
> + map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, offset);
> + dummy = malloc(size);
> +
> + /* make sure page fault happens */
> + memcpy(dummy, map, size);
> +
> + printf("Inject poison...\n");
> + error = madvise(map + poisonOffset, poisonSize, MADV_HWPOISON);
> + if (error)
> + printf("madvise() has fault: %d, errno: %d\n", error, errno);
> +
> + free(dummy);
> + munmap(map, size);
> + close(fd);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + char *pReadFile = NULL, *pPoisonFile = NULL;
> + size_t mmapSize, poisonSize;
> + off_t mmapOffset = 0, poisonOffset = 0;
> + long pagesize = sysconf(_SC_PAGESIZE);
> + int c;
> + pid_t pid;
> +
> + if (pagesize < 1) {
> + fprintf(stderr, "sysconf(_SC_PAGESIZE): failed to get page size\n");
> + abort();
> + }
> +
> + /* default mmap / poison size, in unit of System Page Size */
> + mmapSize = poisonSize = pagesize;
> +
> + while ((c = getopt(argc, argv, "o::s::O::S::R:P:")) != -1) {
> + switch (c) {
> + /* mmap offset */
> + case 'o':
> + mmapOffset = atoi(optarg) * pagesize;
> + break;
> + /* mmap size */
> + case 's':
> + mmapSize = atoi(optarg) * pagesize;
> + break;
> + /* madvice offset */
> + case 'O':
> + poisonOffset = atoi(optarg) * pagesize;
> + break;
> + /* madvice size */
> + case 'S':
> + poisonSize = atoi(optarg) * pagesize;
> + break;
> + /* filename for mmap read */
> + case 'R':
> + pReadFile = optarg;
> + break;
> + /* filename for poison read */
> + case 'P':
> + pPoisonFile = optarg;
> + break;
> + default:
> + printf("Unknown option: %c\n", c);
> + exit(1);
> + }
> + }
> +
> + if (!pReadFile || !pPoisonFile) {
> + printf("Usage: \n"
> + " %s [-o mmapOffset] [-s mmapSize] [-O mmapOffset] [-S mmapSize] -R readFile -P poisonFile\n"
> + " (offset and size are both in unit of System Page Size: %ld)\n",
> + basename(argv[0]), pagesize);
> + exit(0);
> + }
> + if (poisonSize < mmapSize)
> + mmapSize = poisonSize;
> +
> + /* fork and mmap files */
> + pid = fork();
> + if (pid == 0) {
> + /* handle SIGBUS */
> + signal(SIGBUS, sigbus_handler);
> + sem = sem_open("sync", O_CREAT, 0666, 0);
> +
> + /* mread & do memory failure on poison file */
> + mmap_read_file_then_poison(pPoisonFile, mmapOffset, mmapSize,
> + poisonOffset, poisonSize);
> +
> + sem_close(sem);
> + } else {
> + sem = sem_open("sync", O_CREAT, 0666, 0);
> +
> + /* mread read file, wait for child process to be killed */
> + mmap_read_file(pReadFile, mmapOffset, mmapSize);
> + sem_close(sem);
> + }
> + exit(0);
> +}
> diff --git a/tests/xfs/900 b/tests/xfs/900
> new file mode 100755
> index 00000000..da11230a
> --- /dev/null
> +++ b/tests/xfs/900
> @@ -0,0 +1,48 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# FS QA Test No. 900
> +#
> +# Test memory failure mechanism when dax enabled
> +#
> +. ./common/preamble
> +_begin_fstest auto quick dax
> +
> +# Import common functions.
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_require_check_dmesg
> +_require_scratch_reflink
> +_require_cp_reflink
> +_require_xfs_scratch_rmapbt
> +_require_scratch_dax_mountopt "dax"
> +_require_test_program "t_mmap_cow_memory_failure"
> +
> +echo "Format and mount"
> +_scratch_mkfs > $seqres.full 2>&1
> +_scratch_mount "-o dax" >> $seqres.full 2>&1
> +
> +testdir=$SCRATCH_MNT/test-$seq
> +mkdir $testdir
> +
> +echo "Create the original files"
> +filesize=65536
> +_pwrite_byte 0x61 0 $filesize $testdir/testfile >> $seqres.full
> +_scratch_cycle_mount "dax"
> +
> +echo "Inject memory failure (1 page)"
> +# create two processes:
> +# process1: mread 1 page to cause page fault, and wait
> +# process2: mread 1 page to cause page fault, then inject poison on this page
> +$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/testfile
> +
> +echo "Inject memory failure (2 pages)"
> +$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/testfile
> +
> +_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
> +_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
> +
> +# success, all done
> +status=0
> diff --git a/tests/xfs/900.out b/tests/xfs/900.out
> new file mode 100644
> index 00000000..d861bf1f
> --- /dev/null
> +++ b/tests/xfs/900.out
> @@ -0,0 +1,9 @@
> +QA output created by 900
> +Format and mount
> +Create the original files
> +Inject memory failure (1 page)
> +Inject posion...
As your program is: printf("Inject poison...\n");
So I think this place should be "poison".
> +Process is killed by signal: 7
> +Inject memory failure (2 pages)
> +Inject posion...
same as above. And other 2 patches might have same issue.
Thanks,
Zorro
> +Process is killed by signal: 7
> --
> 2.35.1
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] xfs: add memory failure test for dax mode
2022-05-18 18:38 ` Zorro Lang
@ 2022-05-19 1:53 ` Shiyang Ruan
2022-05-19 4:56 ` Zorro Lang
0 siblings, 1 reply; 10+ messages in thread
From: Shiyang Ruan @ 2022-05-19 1:53 UTC (permalink / raw)
To: zlang; +Cc: fstests
在 2022/5/19 2:38, Zorro Lang 写道:
> On Fri, May 13, 2022 at 11:14:09AM +0800, Shiyang Ruan wrote:
>> Make sure memory failure mechanism works when filesystem is mounted with
>> dax option.
>>
>> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
>> ---
>> .gitignore | 1 +
>> src/Makefile | 3 +-
>> src/t_mmap_cow_memory_failure.c | 157 ++++++++++++++++++++++++++++++++
>> tests/xfs/900 | 48 ++++++++++
>> tests/xfs/900.out | 9 ++
>> 5 files changed, 217 insertions(+), 1 deletion(-)
>> create mode 100644 src/t_mmap_cow_memory_failure.c
>> create mode 100755 tests/xfs/900
>> create mode 100644 tests/xfs/900.out
>>
...
>> diff --git a/tests/xfs/900.out b/tests/xfs/900.out
>> new file mode 100644
>> index 00000000..d861bf1f
>> --- /dev/null
>> +++ b/tests/xfs/900.out
>> @@ -0,0 +1,9 @@
>> +QA output created by 900
>> +Format and mount
>> +Create the original files
>> +Inject memory failure (1 page)
>> +Inject posion...
>
> As your program is: printf("Inject poison...\n");
>
> So I think this place should be "poison".
My bad. I forgot to fix this typo in .out file.
>
>> +Process is killed by signal: 7
>> +Inject memory failure (2 pages)
>> +Inject posion...
>
> same as above. And other 2 patches might have same issue.
Thanks! Will fix them.
--
Ruan.
>
> Thanks,
> Zorro
>
>> +Process is killed by signal: 7
>> --
>> 2.35.1
>>
>>
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] xfs: add memory failure test for dax mode
2022-05-19 1:53 ` Shiyang Ruan
@ 2022-05-19 4:56 ` Zorro Lang
0 siblings, 0 replies; 10+ messages in thread
From: Zorro Lang @ 2022-05-19 4:56 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Thu, May 19, 2022 at 09:53:23AM +0800, Shiyang Ruan wrote:
>
>
> 在 2022/5/19 2:38, Zorro Lang 写道:
> > On Fri, May 13, 2022 at 11:14:09AM +0800, Shiyang Ruan wrote:
> > > Make sure memory failure mechanism works when filesystem is mounted with
> > > dax option.
> > >
> > > Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> > > ---
> > > .gitignore | 1 +
> > > src/Makefile | 3 +-
> > > src/t_mmap_cow_memory_failure.c | 157 ++++++++++++++++++++++++++++++++
> > > tests/xfs/900 | 48 ++++++++++
> > > tests/xfs/900.out | 9 ++
> > > 5 files changed, 217 insertions(+), 1 deletion(-)
> > > create mode 100644 src/t_mmap_cow_memory_failure.c
> > > create mode 100755 tests/xfs/900
> > > create mode 100644 tests/xfs/900.out
> > >
> ...
> > > diff --git a/tests/xfs/900.out b/tests/xfs/900.out
> > > new file mode 100644
> > > index 00000000..d861bf1f
> > > --- /dev/null
> > > +++ b/tests/xfs/900.out
> > > @@ -0,0 +1,9 @@
> > > +QA output created by 900
> > > +Format and mount
> > > +Create the original files
> > > +Inject memory failure (1 page)
> > > +Inject posion...
> >
> > As your program is: printf("Inject poison...\n");
> >
> > So I think this place should be "poison".
>
> My bad. I forgot to fix this typo in .out file.
Never mind. I'd like to merge these tests after your kernel patchset about
"Add reflink&dedupe support for fsdax" be merged at first. To avoid you
might add/change something. And I need to see the test works on offical
kernel at least, before merging it. So feel free to ping me, if I forget
this patchset at that time :)
Thanks,
Zorro
>
> >
> > > +Process is killed by signal: 7
> > > +Inject memory failure (2 pages)
> > > +Inject posion...
> >
> > same as above. And other 2 patches might have same issue.
>
> Thanks! Will fix them.
>
>
> --
> Ruan.
>
> >
> > Thanks,
> > Zorro
> >
> > > +Process is killed by signal: 7
> > > --
> > > 2.35.1
> > >
> > >
> > >
> >
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file
2022-03-11 15:18 ` [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file Shiyang Ruan
@ 2022-04-27 18:16 ` Darrick J. Wong
0 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2022-04-27 18:16 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Fri, Mar 11, 2022 at 11:18:16PM +0800, Shiyang Ruan wrote:
> Verify that dax-rmap works for both normal extent and shared extent.
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> ---
> tests/xfs/902 | 52 +++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/902.out | 9 ++++++++
> 2 files changed, 61 insertions(+)
> create mode 100755 tests/xfs/902
> create mode 100644 tests/xfs/902.out
>
> diff --git a/tests/xfs/902 b/tests/xfs/902
> new file mode 100755
> index 00000000..291d34fd
> --- /dev/null
> +++ b/tests/xfs/902
> @@ -0,0 +1,52 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# FS QA Test No. 902
> +#
> +# Test memory failure mechanism when dax and reflink working together
> +# test for partly reflinked file
> +#
> +. ./common/preamble
> +_begin_fstest auto quick clone dax
> +
> +# Import common functions.
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_require_check_dmesg
> +_require_scratch_reflink
> +_require_xfs_scratch_rmapbt
> +_require_scratch_dax_mountopt "dax"
> +_require_test_program "t_mmap_cow_memory_failure"
> +
> +echo "Format and mount"
> +_scratch_mkfs > $seqres.full 2>&1
> +_scratch_mount "-o dax" >> $seqres.full 2>&1
> +
> +testdir=$SCRATCH_MNT/test-$seq
> +mkdir $testdir
> +
> +echo "Create the original files"
> +nr=16
> +blksz=4096
And I guess while I'm whinging about not embedding the page size in the
C source code, the test script shouldn't be doing that either.
blksz=$(get_page_size)
--D
> +_pwrite_byte 0x61 0 $((blksz * nr)) $testdir/testfile >> $seqres.full
> +_pwrite_byte 0x62 0 $((blksz * nr)) $testdir/posionfile >> $seqres.full
> +seq 0 2 $((nr - 1)) | while read i; do
> + _reflink_range $testdir/testfile $((blksz * i)) \
> + $testdir/posionfile $((blksz * i)) $blksz >> $seqres.full
> +done
> +_scratch_cycle_mount "dax"
> +
> +echo "Inject memory failure (1 page)"
> +$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/posionfile
> +
> +echo "Inject memory failure (2 pages)"
> +# posion on reflinked page and not reflinked page
> +$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/posionfile
> +
> +_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
> +_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
> +
> +# success, all done
> +status=0
> diff --git a/tests/xfs/902.out b/tests/xfs/902.out
> new file mode 100644
> index 00000000..3c055d54
> --- /dev/null
> +++ b/tests/xfs/902.out
> @@ -0,0 +1,9 @@
> +QA output created by 902
> +Format and mount
> +Create the original files
> +Inject memory failure (1 page)
> +Inject posion...
> +Process is killed by signal: 7
> +Inject memory failure (2 pages)
> +Inject posion...
> +Process is killed by signal: 7
> --
> 2.35.1
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file
2022-03-11 15:18 [RFC PATCH 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
@ 2022-03-11 15:18 ` Shiyang Ruan
2022-04-27 18:16 ` Darrick J. Wong
0 siblings, 1 reply; 10+ messages in thread
From: Shiyang Ruan @ 2022-03-11 15:18 UTC (permalink / raw)
To: fstests; +Cc: ruansy.fnst
Verify that dax-rmap works for both normal extent and shared extent.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/xfs/902 | 52 +++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/902.out | 9 ++++++++
2 files changed, 61 insertions(+)
create mode 100755 tests/xfs/902
create mode 100644 tests/xfs/902.out
diff --git a/tests/xfs/902 b/tests/xfs/902
new file mode 100755
index 00000000..291d34fd
--- /dev/null
+++ b/tests/xfs/902
@@ -0,0 +1,52 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test No. 902
+#
+# Test memory failure mechanism when dax and reflink working together
+# test for partly reflinked file
+#
+. ./common/preamble
+_begin_fstest auto quick clone dax
+
+# Import common functions.
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_require_check_dmesg
+_require_scratch_reflink
+_require_xfs_scratch_rmapbt
+_require_scratch_dax_mountopt "dax"
+_require_test_program "t_mmap_cow_memory_failure"
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount "-o dax" >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+echo "Create the original files"
+nr=16
+blksz=4096
+_pwrite_byte 0x61 0 $((blksz * nr)) $testdir/testfile >> $seqres.full
+_pwrite_byte 0x62 0 $((blksz * nr)) $testdir/posionfile >> $seqres.full
+seq 0 2 $((nr - 1)) | while read i; do
+ _reflink_range $testdir/testfile $((blksz * i)) \
+ $testdir/posionfile $((blksz * i)) $blksz >> $seqres.full
+done
+_scratch_cycle_mount "dax"
+
+echo "Inject memory failure (1 page)"
+$here/src/t_mmap_cow_memory_failure -s1 -S1 -R $testdir/testfile -P $testdir/posionfile
+
+echo "Inject memory failure (2 pages)"
+# posion on reflinked page and not reflinked page
+$here/src/t_mmap_cow_memory_failure -s2 -S2 -R $testdir/testfile -P $testdir/posionfile
+
+_check_dmesg_for "Sending SIGBUS to t_mmap_cow_memo" || echo "Memory failure didn't kill the process"
+_check_dmesg_for "recovery action for dax page: Recovered" || echo "Failured page didn't recovered"
+
+# success, all done
+status=0
diff --git a/tests/xfs/902.out b/tests/xfs/902.out
new file mode 100644
index 00000000..3c055d54
--- /dev/null
+++ b/tests/xfs/902.out
@@ -0,0 +1,9 @@
+QA output created by 902
+Format and mount
+Create the original files
+Inject memory failure (1 page)
+Inject posion...
+Process is killed by signal: 7
+Inject memory failure (2 pages)
+Inject posion...
+Process is killed by signal: 7
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-05-19 4:56 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 3:14 [PATCH v2 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
2022-05-13 3:14 ` [PATCH 1/3] xfs: add memory failure test " Shiyang Ruan
2022-05-18 18:38 ` Zorro Lang
2022-05-19 1:53 ` Shiyang Ruan
2022-05-19 4:56 ` Zorro Lang
2022-05-13 3:14 ` [PATCH 2/3] xfs: add memory failure test for dax&reflink mode Shiyang Ruan
2022-05-13 3:18 ` Shiyang Ruan
2022-05-13 3:14 ` [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file Shiyang Ruan
-- strict thread matches above, loose matches on Subject: below --
2022-03-11 15:18 [RFC PATCH 0/3] xfs: add memory failure tests for dax mode Shiyang Ruan
2022-03-11 15:18 ` [PATCH 3/3] xfs: add memory failure test for partly-reflinked&dax file Shiyang Ruan
2022-04-27 18:16 ` Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.