From patchwork Mon May 29 11:32:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 9753087 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 42DD060249 for ; Mon, 29 May 2017 11:32:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42EA22845D for ; Mon, 29 May 2017 11:32:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DCB52846B; Mon, 29 May 2017 11:32:30 +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=ham 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 6C6F22846A for ; Mon, 29 May 2017 11:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751097AbdE2LcX (ORCPT ); Mon, 29 May 2017 07:32:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:43529 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750974AbdE2LcV (ORCPT ); Mon, 29 May 2017 07:32:21 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 3B56FAB5F; Mon, 29 May 2017 11:32:20 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id F38B71E330C; Mon, 29 May 2017 13:32:18 +0200 (CEST) From: Jan Kara To: Eryu Guan Cc: fstests@vger.kernel.org, Michael Zimmer , Jan Kara Subject: [PATCH v2] generic: Add regression test for tail page zeroing Date: Mon, 29 May 2017 13:32:15 +0200 Message-Id: <20170529113215.30349-1-jack@suse.cz> X-Mailer: git-send-email 2.12.3 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add test checking for a race in ext4 writeback that could result in zeroing too much from the tail page during writeback. Signed-off-by: Jan Kara --- .gitignore | 1 + src/Makefile | 2 +- src/t_mmap_fallocate.c | 69 ++++++++++++++++++++++++++++++++++++++++++ tests/generic/438 | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/438.out | 2 ++ tests/generic/group | 1 + 6 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 src/t_mmap_fallocate.c create mode 100755 tests/generic/438 create mode 100644 tests/generic/438.out diff --git a/.gitignore b/.gitignore index a6ac25e828da..39664b0a7f53 100644 --- a/.gitignore +++ b/.gitignore @@ -150,6 +150,7 @@ /src/t_mmap_dio /src/t_mmap_stale_pmd /src/t_mmap_cow_race +/src/t_mmap_fallocate # dmapi/ binaries /dmapi/src/common/cmd/read_invis diff --git a/src/Makefile b/src/Makefile index 47246622ce7f..adbfd286fe89 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_cow_race t_mmap_fallocate 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_fallocate.c b/src/t_mmap_fallocate.c new file mode 100644 index 000000000000..a16650b03d0f --- /dev/null +++ b/src/t_mmap_fallocate.c @@ -0,0 +1,69 @@ +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + int fd; + char *buf; + size_t fsize, i; + + if (argc != 3) { + fprintf(stderr, "Usage: %s \n", + basename(argv[0])); + exit(1); + } + + fsize = strtol(argv[2], NULL, 10); + if (fsize <= 0) { + fprintf(stderr, "Invalid file size: %s\n", argv[2]); + exit(1); + } + fsize <<= 10; + + fd = open(argv[1], O_RDWR | O_CREAT | O_TRUNC, 0644); + if (fd < 0) { + perror("Cannot open file"); + exit(1); + } + + buf = mmap(NULL, fsize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (buf == MAP_FAILED) { + perror("Cannot memory map"); + exit(1); + } + + /* + * We extend the file byte-by-byte through fallocate(2) and write data + * to each byte through the mmap. Then we verify whether the data is + * really there to see whether the zeroing of last file page during + * writeback didn't corrupt the data. + */ + for (i = 0; i < fsize; i++) { + if (posix_fallocate(fd, i, 1) != 0) { + perror("Cannot fallocate"); + exit(1); + } + buf[i] = 0x78; + + if (buf[i] != 0x78) { + fprintf(stderr, + "Value not written correctly (off=%lu)\n", + (unsigned long)i); + exit(1); + } + } + + for (i = 0; i < fsize; i++) { + if (buf[i] != 0x78) { + fprintf(stderr, "Value has been modified (off=%lu)\n", + (unsigned long)i); + exit(1); + } + } + + return 0; +} diff --git a/tests/generic/438 b/tests/generic/438 new file mode 100755 index 000000000000..711254205a8f --- /dev/null +++ b/tests/generic/438 @@ -0,0 +1,82 @@ +#! /bin/bash +# FS QA Test 438 +# +# This is a regression test for kernel patch +# "ext4: Fix data corruption for mmap writes" +# +# The problem this test checks for is when too much is zeroed in the tail +# page that gets written out just while the file gets extended and written +# to through mmap. +# +# Based on test program by Michael Zimmer +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 SUSE. 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.* + rm -f $FILE +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Modify as appropriate. +_supported_fs generic +_supported_os Linux +_require_test +_require_test_program "t_mmap_fallocate" + +# real QA test starts here +FILE=$TEST_DIR/testfile_fallocate +# Make sure file exists +echo >$FILE +# Force frequent writeback of the file +( + trap "STOP=1" SIGTERM + STOP=0 + while [ $STOP -eq 0 ]; do + $XFS_IO_PROG -c fsync $FILE + done +)& +SYNCPID=$! + +# Run the test +src/t_mmap_fallocate $FILE 256 && echo "Silence is golden" + +kill -TERM $SYNCPID +wait $SYNCPID + +# success, all done +status=0 +exit diff --git a/tests/generic/438.out b/tests/generic/438.out new file mode 100644 index 000000000000..4968f4d7f691 --- /dev/null +++ b/tests/generic/438.out @@ -0,0 +1,2 @@ +QA output created by 438 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 438c299030f2..d88f5bb44514 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -440,3 +440,4 @@ 435 auto encrypt 436 auto quick rw 437 auto quick +438 auto quick