From patchwork Thu Feb 11 17:01:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 12083725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 049BAC433E0 for ; Thu, 11 Feb 2021 17:04:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAFD264E8A for ; Thu, 11 Feb 2021 17:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231613AbhBKREd (ORCPT ); Thu, 11 Feb 2021 12:04:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:41978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232049AbhBKRCH (ORCPT ); Thu, 11 Feb 2021 12:02:07 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 65C4464E15; Thu, 11 Feb 2021 17:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1613062886; bh=/UHp4jUiJeDClnyi15TJNaHQJrMGTxZdNhBpOabQHKw=; h=From:To:Cc:Subject:Date:From; b=OtCeITjWNiRO98jUIUZ8I4EmYqaW1D1qoyhsTJp6jakYXy7NC5NnADTBblFN8mtL3 PuOm8KSuWIIzNMKg6JU8DcjbhinI9lXTCyTLmLxNermGgbF/rSrPs02i+uFF2Pl9ri gYVEovbjs4VYWTJGeWFaPh4gdoTxkBj1A77IbYeeM4C1+Ued3U3jHzy12nzs6QF7rK B24fPj0/3EllsoZWxAfh2gnOiiVeSXbp+p21dV1G2zrfiRhaJDjgyYqJx+o4AhI/GC sMKOtvn2Xbuau0rAcAOGGGEJwpjcxfTuWXSI0f4A2GcxoqmFBpN/IymAnhBxsQPLtk DCfmdzlTxyjaQ== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH] btrfs: add test for cases when a dio write has to fallback to a buffered write Date: Thu, 11 Feb 2021 17:01:18 +0000 Message-Id: <20210211170118.12551-1-fdmanana@kernel.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Filipe Manana Test cases where a direct IO write, with O_DSYNC, can not be done and has to fallback to a buffered write. This is motivated by a regression that was introduced in kernel 5.10 by commit 0eb79294dbe328 ("btrfs: dio iomap DSYNC workaround")) and was fixed in kernel 5.11 by commit ecfdc08b8cc65d ("btrfs: remove dio iomap DSYNC workaround"). Signed-off-by: Filipe Manana --- tests/btrfs/231 | 61 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/231.out | 21 ++++++++++++++++ tests/btrfs/group | 1 + 3 files changed, 83 insertions(+) create mode 100755 tests/btrfs/231 create mode 100644 tests/btrfs/231.out diff --git a/tests/btrfs/231 b/tests/btrfs/231 new file mode 100755 index 00000000..9a404f57 --- /dev/null +++ b/tests/btrfs/231 @@ -0,0 +1,61 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2021 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test No. btrfs/231 +# +# Test cases where a direct IO write, with O_DSYNC, can not be done and has to +# fallback to a buffered write. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +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 +. ./common/attr + +# real QA test starts here +_supported_fs btrfs +_require_scratch +_require_odirect +_require_chattr c + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +# First lets test with an attempt to write into a file range with compressed +# extents. +touch $SCRATCH_MNT/foo +$CHATTR_PROG +c $SCRATCH_MNT/foo + +$XFS_IO_PROG -s -c "pwrite -S 0xab -b 1M 0 1M" $SCRATCH_MNT/foo | _filter_xfs_io +# Now do the direct IO write... +$XFS_IO_PROG -d -s -c "pwrite -S 0xcd 512K 512K" $SCRATCH_MNT/foo | _filter_xfs_io + +# Now try doing a write into an unaligned offset... +$XFS_IO_PROG -f -d -s -c "pwrite -S 0xef 1111 512K" $SCRATCH_MNT/bar | _filter_xfs_io + +# Unmount, mount again, and verify we have the expected data. +_scratch_cycle_mount + +echo "File foo data:" +od -A d -t x1 $SCRATCH_MNT/foo +echo "File bar data:" +od -A d -t x1 $SCRATCH_MNT/bar + +status=0 +exit diff --git a/tests/btrfs/231.out b/tests/btrfs/231.out new file mode 100644 index 00000000..def05769 --- /dev/null +++ b/tests/btrfs/231.out @@ -0,0 +1,21 @@ +QA output created by 231 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 524288/524288 bytes at offset 524288 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 524288/524288 bytes at offset 1111 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +File foo data: +0000000 ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab +* +0524288 cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd +* +1048576 +File bar data: +0000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +* +0001104 00 00 00 00 00 00 00 ef ef ef ef ef ef ef ef ef +0001120 ef ef ef ef ef ef ef ef ef ef ef ef ef ef ef ef +* +0525392 ef ef ef ef ef ef ef +0525399 diff --git a/tests/btrfs/group b/tests/btrfs/group index a7c65983..9f63db69 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -233,3 +233,4 @@ 228 auto quick volume 229 auto quick send clone 230 auto quick qgroup limit +231 auto quick compress rw