From patchwork Wed Sep 30 15:59:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 7299921 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 24BDB9F314 for ; Wed, 30 Sep 2015 15:59:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E10AD206DC for ; Wed, 30 Sep 2015 15:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72A902068F for ; Wed, 30 Sep 2015 15:59:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752395AbbI3P7e (ORCPT ); Wed, 30 Sep 2015 11:59:34 -0400 Received: from sandeen.net ([63.231.237.45]:33012 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbbI3P7d (ORCPT ); Wed, 30 Sep 2015 11:59:33 -0400 Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.4]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTPSA id 338CB63C77A5; Wed, 30 Sep 2015 10:59:32 -0500 (CDT) Subject: [PATCH V2] test extending sub-block AIO writes for races To: fstests References: <560B34E3.4080107@sandeen.net> Cc: xfs@oss.sgi.com From: Eric Sandeen Message-ID: <560C06E3.4090708@sandeen.net> Date: Wed, 30 Sep 2015 10:59:31 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <560B34E3.4080107@sandeen.net> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This tests bfoster's [PATCH 1/2] xfs: always drain dio before extending aio write submission patch; it launches four adjacent 1k IOs past EOF, then reads back to see if we have 4k worth of the data we wrote, or something else - possibly zeros from sub-block zeroing and eof racing. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster --- V2: do 4x512 IOs to get as much sub-block goodness as possible fix up comments & typos -- 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 diff --git a/src/aio-dio-regress/aio-dio-eof-race.c b/src/aio-dio-regress/aio-dio-eof-race.c new file mode 100644 index 0000000..ce5d715 --- /dev/null +++ b/src/aio-dio-regress/aio-dio-eof-race.c @@ -0,0 +1,173 @@ +/* + * Launch 4 sub-block AIOs past EOF and ensure that we don't see + * corruption from racing sub-block zeroing when they're complete. + * + * Copyright (C) 2015 Red Hat, Inc. 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will 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 to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* Sized to allow 4 x 512 AIOs */ +#define BUF_SIZE 2048 +#define IO_PATTERN 0xab + +void +dump_buffer( + void *buf, + off64_t offset, + ssize_t len) +{ + int i, j; + char *p; + int new; + + for (i = 0, p = (char *)buf; i < len; i += 16) { + char *s = p; + + if (i && !memcmp(p, p - 16, 16)) { + new = 0; + } else { + if (i) + printf("*\n"); + new = 1; + } + + if (!new) { + p += 16; + continue; + } + + printf("%08llx ", (unsigned long long)offset + i); + for (j = 0; j < 16 && i + j < len; j++, p++) + printf("%02x ", *p); + printf(" "); + for (j = 0; j < 16 && i + j < len; j++, s++) { + if (isalnum((int)*s)) + printf("%c", *s); + else + printf("."); + } + printf("\n"); + + } + printf("%08llx\n", (unsigned long long)offset + i); +} + +int main(int argc, char *argv[]) +{ + struct io_context *ctx = NULL; + struct io_event evs[4]; + struct iocb iocb1, iocb2, iocb3, iocb4; + struct iocb *iocbs[] = { &iocb1, &iocb2, &iocb3, &iocb4 }; + void *buf; + struct stat statbuf; + char cmp_buf[BUF_SIZE]; + int fd, err = 0; + off_t eof; + + fd = open(argv[1], O_DIRECT | O_CREAT | O_TRUNC | O_RDWR, 0600); + if (fd == -1) { + perror("open"); + return 1; + } + + err = posix_memalign(&buf, getpagesize(), BUF_SIZE); + if (err) { + fprintf(stderr, "error %s during %s\n", + strerror(err), + "posix_memalign"); + return 1; + } + memset(cmp_buf, IO_PATTERN, BUF_SIZE); + + err = io_setup(4, &ctx); + if (err) { + fprintf(stderr, "error %s during %s\n", + strerror(err), + "io_setup"); + return 1; + } + + eof = 0; + + /* Keep extending until 8MB (fairly arbitrary) */ + while (eof < 8 * 1024 * 1024) { + memset(buf, IO_PATTERN, BUF_SIZE); + fstat(fd, &statbuf); + eof = statbuf.st_size; + + /* + * Split the buffer into multiple I/Os to send a mix of block + * aligned/unaligned writes as well as writes that start beyond + * the current EOF. This stresses things like inode size + * management and stale block zeroing for races and can lead to + * data corruption when not handled properly. + */ + io_prep_pwrite(&iocb1, fd, buf, BUF_SIZE/4, eof + 0*BUF_SIZE/4); + io_prep_pwrite(&iocb2, fd, buf, BUF_SIZE/4, eof + 1*BUF_SIZE/4); + io_prep_pwrite(&iocb3, fd, buf, BUF_SIZE/4, eof + 2*BUF_SIZE/4); + io_prep_pwrite(&iocb4, fd, buf, BUF_SIZE/4, eof + 3*BUF_SIZE/4); + + err = io_submit(ctx, 4, iocbs); + if (err != 4) { + fprintf(stderr, "error %s during %s\n", + strerror(err), + "io_submit"); + return 1; + } + + err = io_getevents(ctx, 4, 4, evs, NULL); + if (err != 4) { + fprintf(stderr, "error %s during %s\n", + strerror(err), + "io_getevents"); + return 1; + } + + /* + * And then read it back. + * + * Using pread to keep it simple, but AIO has the same effect. + * eof is the prior eof; we just wrote BUF_SIZE more. + */ + if (pread(fd, buf, BUF_SIZE, eof) != BUF_SIZE) { + perror("pread"); + return 1; + } + + /* + * We launched 4 AIOs which, stitched together, should write + * a seamless BUF_SIZE worth of IO_PATTERN to the last block. + */ + if (memcmp(buf, cmp_buf, BUF_SIZE)) { + printf("corruption while extending from %ld\n", eof); + dump_buffer(buf, 0, BUF_SIZE); + return 1; + } + } + + printf("Success, all done.\n"); + return 0; +} diff --git a/tests/generic/326 b/tests/generic/326 new file mode 100755 index 0000000..f20375a --- /dev/null +++ b/tests/generic/326 @@ -0,0 +1,65 @@ +#! /bin/bash +# FS QA Test No. 326 +# +# Test races while extending past EOF via sub-block AIO writes +# +#----------------------------------------------------------------------- +# Copyright (c) 2015 Red Hat, Inc. 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 $TEST_DIR/tst-aio-dio-eof-race +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +_supported_fs generic +_supported_os Linux + +_require_test +_require_sparse_files +_require_aiodio aio-dio-eof-race + +# Test does 512 byte DIO, so make sure that'll work +logical_block_size=`_min_dio_alignment $TEST_DEV` + +if [ "$logical_block_size" -gt "512" ]; then + _notrun "device block size: $logical_block_size greater than 512" +fi + +# We don't mind 512-byte fs blocks; the IOs won't be sub-block, +# but the test should still pass, even if it doesn't stress the code +# we're targeting. + +# Note, this test does several extending loops internally +$AIO_TEST $TEST_DIR/tst-aio-dio-eof-race + +status=$? +exit diff --git a/tests/generic/326.out b/tests/generic/326.out new file mode 100644 index 0000000..22a3e78 --- /dev/null +++ b/tests/generic/326.out @@ -0,0 +1,2 @@ +QA output created by 326 +Success, all done. diff --git a/tests/generic/group b/tests/generic/group index 4ae256f..a5f3008 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -207,3 +207,4 @@ 323 auto aio stress 324 auto fsr quick 325 auto quick data log +326 auto quick aio