From patchwork Tue Sep 12 04:45:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 9948393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1734F60360 for ; Tue, 12 Sep 2017 04:46:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0679428E05 for ; Tue, 12 Sep 2017 04:46:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDE9D28DF1; Tue, 12 Sep 2017 04:46:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4577728DF1 for ; Tue, 12 Sep 2017 04:46:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751426AbdILEqD (ORCPT ); Tue, 12 Sep 2017 00:46:03 -0400 Received: from mga02.intel.com ([134.134.136.20]:31948 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320AbdILEpd (ORCPT ); Tue, 12 Sep 2017 00:45:33 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2017 21:45:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,381,1500966000"; d="scan'208";a="127835437" Received: from theros.lm.intel.com ([10.232.112.77]) by orsmga004.jf.intel.com with ESMTP; 11 Sep 2017 21:45:31 -0700 From: Ross Zwisler To: fstests@vger.kernel.org, Eryu Guan Cc: Ross Zwisler , Andrew Morton , linux-kernel@vger.kernel.org, "Darrick J. Wong" , Theodore Ts'o , Christoph Hellwig , Dan Williams , Dave Chinner , Jan Kara , linux-ext4@vger.kernel.org, linux-nvdimm@lists.01.org, linux-xfs@vger.kernel.org, Andreas Dilger Subject: [PATCH 2/3] ext4: test for DAX + journaling corruption Date: Mon, 11 Sep 2017 22:45:20 -0600 Message-Id: <20170912044521.22644-2-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170912044521.22644-1-ross.zwisler@linux.intel.com> References: <20170912044521.22644-1-ross.zwisler@linux.intel.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a regression test for the following kernel commit: ext4: prevent data corruption with journaling + DAX The test passes if either we successfully compare the data between the mmap with journaling turned on and the one with journaling turned off, or if we fail the chattr command to turn on or off journaling. The latter is how we prevent this issue in the kernel. Signed-off-by: Ross Zwisler --- .gitignore | 1 + src/Makefile | 2 +- src/t_ext4_dax_journal_corruption.c | 93 +++++++++++++++++++++++++++++++++++++ tests/ext4/030 | 68 +++++++++++++++++++++++++++ tests/ext4/030.out | 2 + tests/ext4/group | 1 + 6 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 src/t_ext4_dax_journal_corruption.c create mode 100755 tests/ext4/030 create mode 100644 tests/ext4/030.out diff --git a/.gitignore b/.gitignore index 2accc37..4bdc5bf 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,7 @@ /src/t_mmap_stale_pmd /src/t_mmap_cow_race /src/t_mmap_fallocate +/src/t_ext4_dax_journal_corruption # dmapi/ binaries /dmapi/src/common/cmd/read_invis diff --git a/src/Makefile b/src/Makefile index b8aff49..e6558e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \ multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \ 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_cow_race t_mmap_fallocate fsync-err t_ext4_dax_journal_corruption 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_journal_corruption.c b/src/t_ext4_dax_journal_corruption.c new file mode 100644 index 0000000..e0d63f8 --- /dev/null +++ b/src/t_ext4_dax_journal_corruption.c @@ -0,0 +1,93 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PAGE(a) ((a)*0x1000) +#define STRLEN 256 + +void err_exit(char *op) +{ + fprintf(stderr, "%s: %s\n", op, strerror(errno)); + exit(1); +} + +void chattr_cmd(char *chattr, char *cmd, char *file) +{ + int ret; + char command[STRLEN]; + + ret = snprintf(command, STRLEN, "%s %s %s 2>/dev/null", chattr, cmd, file); + if (ret < 0) + err_exit("snprintf"); + + ret = system(command); + if (ret) /* Success - the kernel fix is to have this chattr fail */ + exit(77); +} + +int main(int argc, char *argv[]) +{ + int fd, err, len = PAGE(1); + char *data, *dax_data, *chattr, *file; + char string[STRLEN]; + + if (argc < 3) { + printf("Usage: %s \n", basename(argv[0])); + exit(0); + } + + chattr = argv[1]; + file = argv[2]; + + srand(time(NULL)); + snprintf(string, STRLEN, "random number %d\n", rand()); + + fd = open(file, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); + if (fd < 0) + err_exit("fd"); + + /* begin with journaling off and DAX on */ + chattr_cmd(chattr, "-j", file); + + ftruncate(fd, 0); + fallocate(fd, 0, 0, len); + + dax_data = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0); + if (!dax_data) + err_exit("mmap dax_data"); + + /* turns on journaling, and turns off DAX */ + chattr_cmd(chattr, "+j", file); + + data = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); + if (!data) + err_exit("mmap 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(data, len); + if (err < 0) + err_exit("munmap data"); + + err = munmap(dax_data, len); + if (err < 0) + err_exit("munmap dax_data"); + + err = close(fd); + if (err < 0) + err_exit("close"); + return 0; +} diff --git a/tests/ext4/030 b/tests/ext4/030 new file mode 100755 index 0000000..3ac4952 --- /dev/null +++ b/tests/ext4/030 @@ -0,0 +1,68 @@ +#! /bin/bash +# FS QA Test ext4/030 +# +# This is a regression test for kernel patch: +# ext4: prevent data corruption with journaling + DAX +# created by Ross Zwisler +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 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 + +# Modify as appropriate. +_supported_os Linux +_supported_fs ext4 +_require_scratch_dax +_require_test_program "t_ext4_dax_journal_corruption" + +# real QA test starts here +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount "-o dax,nodelalloc" >> $seqres.full 2>&1 + +src/t_ext4_dax_journal_corruption $CHATTR_PROG $SCRATCH_MNT/testfile + +if [[ $? != 0 && $? != 77 ]]; then + echo "Test failed, status $?" + exit 1 +fi + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/ext4/030.out b/tests/ext4/030.out new file mode 100644 index 0000000..06a1c8f --- /dev/null +++ b/tests/ext4/030.out @@ -0,0 +1,2 @@ +QA output created by 030 +Silence is golden diff --git a/tests/ext4/group b/tests/ext4/group index 257bb64..ef768df 100644 --- a/tests/ext4/group +++ b/tests/ext4/group @@ -32,6 +32,7 @@ 027 auto quick fsmap 028 auto quick fsmap 029 auto quick fsmap +030 auto quick 271 auto rw quick 301 aio auto ioctl rw stress defrag 302 aio auto ioctl rw stress defrag