From patchwork Mon Jul 24 02:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13323389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85826C001E0 for ; Mon, 24 Jul 2023 02:36:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbjGXCgo (ORCPT ); Sun, 23 Jul 2023 22:36:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbjGXCgl (ORCPT ); Sun, 23 Jul 2023 22:36:41 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ADA5E7; Sun, 23 Jul 2023 19:36:38 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3952D203A3; Mon, 24 Jul 2023 02:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1690166185; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PqXgXR2rGJ1AN5LzD9vDta8YCBbSxkwUkCL58hM4aBA=; b=X+SUcA3eD6fwWBd5qzURkYiFKrEXzME+XVA7VzTIq22PRLAGr3wL3hE4iVNR0rvcUOjKfv tjzw8oJ86JnA1O2FXPT4/gCI3b56miCQVHkH1dNuzQSi9ln0H+oAdJZE4MZE2QQy7ZPVsS K1y0nlxp1HIex2Bv9/PHb/cWh8AEvdU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 55D3913476; Mon, 24 Jul 2023 02:36:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id NodHCKjjvWReZgAAMHmgww (envelope-from ); Mon, 24 Jul 2023 02:36:24 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] btrfs: add a test case to make sure scrub can repair parity corruption Date: Mon, 24 Jul 2023 10:36:06 +0800 Message-ID: <20230724023606.91107-1-wqu@suse.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org There is a kernel regression caused by commit 75b470332965 ("btrfs: raid56: migrate recovery and scrub recovery path to use error_bitmap"), which leads to scrub not repairing corrupted parity stripes. So here we add a test case to verify the P/Q stripe scrub behavior by: - Create a RAID5 or RAID6 btrfs with minimal amount of devices This means 2 devices for RAID5, and 3 devices for RAID6. This would result the parity stripe to be a mirror of the only data stripe. And since we have control of the content of data stripes, the content of the P stripe is also fixed. - Create an 64K file The file would cover one data stripe. - Corrupt the P stripe - Scrub the fs If scrub is working, the P stripe would be repaired. Unfortunately scrub can not report any P/Q corruption, limited by its reporting structure. So we can not use the return value of scrub to determine if we repaired anything. - Verify the content of the P stripe - Use "btrfs check --check-data-csum" to double check By above steps, we can verify if the P stripe is properly fixed. Signed-off-by: Qu Wenruo --- Changelog: v2: - Rebase to the latest misc-next - Use space_cache=v2 mount option instead of nospace_cache New features like block group tree and extent tree v2 requires v2 cache - Fix a white space error --- tests/btrfs/297 | 85 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/297.out | 2 ++ 2 files changed, 87 insertions(+) create mode 100755 tests/btrfs/297 create mode 100644 tests/btrfs/297.out diff --git a/tests/btrfs/297 b/tests/btrfs/297 new file mode 100755 index 00000000..852c3ace --- /dev/null +++ b/tests/btrfs/297 @@ -0,0 +1,85 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2023 YOUR NAME HERE. All Rights Reserved. +# +# FS QA Test 297 +# +# Make sure btrfs scrub can fix parity stripe corruption +# +. ./common/preamble +_begin_fstest auto quick raid scrub + +. ./common/filter + +_supported_fs btrfs +_require_odirect +_require_non_zoned_device "${SCRATCH_DEV}" +_require_scratch_dev_pool 3 +_fixed_by_kernel_commit 486c737f7fdc \ + "btrfs: raid56: always verify the P/Q contents for scrub" + +workload() +{ + local profile=$1 + local nr_devs=$2 + + echo "=== Testing $nr_devs devices $profile ===" >> $seqres.full + _scratch_dev_pool_get $nr_devs + + _scratch_pool_mkfs -d $profile -m single >> $seqres.full 2>&1 + # Use v2 space cache to prevent v1 space cache affecting + # the result. + _scratch_mount -o space_cache=v2 + + # Create one 64K extent which would cover one data stripe. + $XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 64K 0 64K" \ + "$SCRATCH_MNT/foobar" > /dev/null + sync + + # Corrupt the P/Q stripe + local logical=$(_btrfs_get_first_logical $SCRATCH_MNT/foobar) + + # The 2nd copy is pointed to P stripe directly. + physical_p=$(_btrfs_get_physical ${logical} 2) + devpath_p=$(_btrfs_get_device_path ${logical} 2) + + _scratch_unmount + + echo "Corrupt stripe P at devpath $devpath_p physical $physical_p" \ + >> $seqres.full + $XFS_IO_PROG -d -c "pwrite -S 0xff -b 64K $physical_p 64K" $devpath_p \ + > /dev/null + + # Do a scrub to try repair the P stripe. + _scratch_mount -o space_cache=v2 + $BTRFS_UTIL_PROG scrub start -BdR $SCRATCH_MNT >> $seqres.full 2>&1 + _scratch_unmount + + # Verify the repaired content directly + local output=$($XFS_IO_PROG -c "pread -qv $physical_p 16" $devpath_p | _filter_xfs_io_offset) + local expect="XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................" + + echo "The first 16 bytes of parity stripe after scrub:" >> $seqres.full + echo $output >> $seqres.full + if [ "$output" != "$expect" ]; then + echo "Unexpected parity content" + echo "has:" + echo "$output" + echo "expect" + echo "$expect" + fi + + # Last safenet, let btrfs check --check-data-csum to do an offline scrub. + $BTRFS_UTIL_PROG check --check-data-csum $SCRATCH_DEV >> $seqres.full 2>&1 + if [ $? -ne 0 ]; then + echo "Error detected after the scrub" + fi + _scratch_dev_pool_put +} + +workload raid5 2 +workload raid6 3 + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/297.out b/tests/btrfs/297.out new file mode 100644 index 00000000..41c373c4 --- /dev/null +++ b/tests/btrfs/297.out @@ -0,0 +1,2 @@ +QA output created by 297 +Silence is golden