ext4: test for inline data + DAX corruption

Add a regression test for the following kernel commit:

  ext4: prevent data corruption with inline data + DAX

The test passes either if we don't encounter corruption, or if
mounting with DAX + inline data fails.  The latter is the way that
we prevent this issue in the kernel.

[eguan: add 'dax' group]

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/.gitignore b/.gitignore
index 840e4fe4063401ca217c61f43fa8bebb1e580b4d..ee7eaed02f932bf89280b06a5b9316f9100973fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -115,6 +115,7 @@
 /src/t_dir_offset2
 /src/t_dir_type
 /src/t_encrypted_d_revalidate
 /src/t_dir_offset2
 /src/t_dir_type
 /src/t_encrypted_d_revalidate

+/src/t_ext4_dax_inline_corruption

 /src/t_ext4_dax_journal_corruption
 /src/t_futimens
 /src/t_getcwd
 /src/t_ext4_dax_journal_corruption
 /src/t_futimens
 /src/t_getcwd

diff --git a/src/Makefile b/src/Makefile
index 86c5440c1858490a95fcd1a8f53158b517e688a3..b96b8cf255629d1d65a69e8ce30f09026f95a189 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
        t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
        holetest t_truncate_self t_mmap_dio af_unix t_mmap_stale_pmd \
        t_mmap_cow_race t_mmap_fallocate fsync-err t_mmap_write_ro \
        t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
        holetest t_truncate_self t_mmap_dio af_unix t_mmap_stale_pmd \
        t_mmap_cow_race t_mmap_fallocate fsync-err t_mmap_write_ro \

-       t_ext4_dax_journal_corruption
+       t_ext4_dax_journal_corruption t_ext4_dax_inline_corruption

 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
        preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
 
 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_ext4_dax_inline_corruption.c b/src/t_ext4_dax_inline_corruption.c
new file mode 100644 (file)
index 0000000..4b7d893
--- /dev/null
+++ b/src/t_ext4_dax_inline_corruption.c
@@ -0,0 +1,70 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+#define PAGE(a) ((a)*0x1000)
+#define STRLEN 256
+
+void err_exit(char *op)
+{
+       fprintf(stderr, "%s: %s\n", op, strerror(errno));
+       exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+       int fd, err, len = PAGE(1);
+       char *dax_data, *data;
+       char string[STRLEN];
+
+       if (argc < 2) {
+               printf("Usage: %s <file>\n", basename(argv[0]));
+               exit(0);
+       }
+
+       srand(time(NULL));
+       snprintf(string, STRLEN, "random number %d\n", rand());
+
+       fd = open(argv[1], O_RDWR);
+       if (fd < 0)
+               err_exit("fd");
+
+       data = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+       if (!data)
+               err_exit("mmap data");
+
+       /* this fallocate turns off inline data and turns on DAX */
+       fallocate(fd, 0, 0, PAGE(2));
+
+       dax_data = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
+       if (!dax_data)
+               err_exit("mmap dax_data");
+
+       /*
+        * Write the data using the non-DAX mapping, and try and read it back
+        * using the DAX mapping.
+        */
+       strcpy(data, string);
+       if (strcmp(dax_data, string) != 0)
+               printf("Data miscompare\n");
+
+       err = munmap(dax_data, len);
+       if (err < 0)
+               err_exit("munmap dax_data");
+
+       err = munmap(data, len);
+       if (err < 0)
+               err_exit("munmap data");
+
+       err = close(fd);
+       if (err < 0)
+               err_exit("close");
+       return 0;
+}

diff --git a/tests/ext4/031 b/tests/ext4/031
new file mode 100755 (executable)
index 0000000..58177b4
--- /dev/null
+++ b/tests/ext4/031
@@ -0,0 +1,86 @@
+#! /bin/bash
+# FS QA Test ext4/031
+#
+# This is a regression test for kernel patch:
+#   ext4: prevent data corruption with inline data + DAX
+# created by Ross Zwisler <ross.zwisler@linux.intel.com>
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017-2018 Intel Corporation.  All Rights Reserved.
+#
+# 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"
+
+here=`pwd`
+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, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# DAX needs to be off so we can create an inode with inline data
+SAVE_MOUNT_OPTIONS="$MOUNT_OPTIONS"
+MOUNT_OPTIONS=""
+
+# Modify as appropriate.
+_supported_os Linux
+_supported_fs ext4
+_require_scratch_dax
+_require_test_program "t_ext4_dax_inline_corruption"
+_require_scratch_ext4_feature "inline_data"
+
+# real QA test starts here
+_scratch_mkfs_ext4 -O inline_data > $seqres.full 2>&1
+
+TESTFILE=$SCRATCH_MNT/testfile
+
+_scratch_mount  >> $seqres.full 2>&1
+
+echo "Need to make some inline data..." > $TESTFILE
+
+export MOUNT_OPTIONS="$SAVE_MOUNT_OPTIONS"
+
+_scratch_unmount >> $seqres.full 2>&1
+_scratch_mount "-o dax" >> $seqres.full 2>&1
+
+if [[ $? != 0 ]]; then
+       # _require_scratch_dax already verified that we could mount with DAX.
+       # Failure here is expected because we have inline data.
+       echo "Silence is golden"
+       status=0
+       exit
+fi
+
+$here/src/t_ext4_dax_inline_corruption $TESTFILE
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit

diff --git a/tests/ext4/031.out b/tests/ext4/031.out
new file mode 100644 (file)
index 0000000..b3d0bb0
--- /dev/null
+++ b/tests/ext4/031.out
@@ -0,0 +1,2 @@
+QA output created by 031
+Silence is golden

diff --git a/tests/ext4/group b/tests/ext4/group
index 9c93bcee2e13fd4503e5a1923d611608e1e92f68..bab4f7853c4911dd8d485ac0e8933aecfd2fc511 100644 (file)
--- a/tests/ext4/group
+++ b/tests/ext4/group
@@ -33,6 +33,7 @@
 028 auto quick fsmap
 029 auto quick fsmap
 030 auto quick dax
 028 auto quick fsmap
 029 auto quick fsmap
 030 auto quick dax

+031 auto quick dax

 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag
 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag