From patchwork Wed Apr 21 00:22:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12215227 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=-16.0 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 autolearn=ham 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 9912FC433B4 for ; Wed, 21 Apr 2021 00:22:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6428C61421 for ; Wed, 21 Apr 2021 00:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234501AbhDUAXO (ORCPT ); Tue, 20 Apr 2021 20:23:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:36416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234290AbhDUAXO (ORCPT ); Tue, 20 Apr 2021 20:23:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D59246141F; Wed, 21 Apr 2021 00:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618964562; bh=S1bG6VlayHny/n4K1RGV0/QwfsUDu005mCr4PM8flTw=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Gkww+/cMHDP3TmMDPHBA5ES6jJ53MnJOaJhCoLsZZ3LIJB/5RtBmVw4p5gRSaCwBH WoRxgFJD7vo3PO6ZY6ytu+AMYr+PEqrMWTjyXiLBXr1XrOGVrMoUNyH+L36ObOKR7j 1ETlz9t3zkm33YfQfX1+0Ovup6sgsNZGdFed1csgNRmuXqPcfZDJZ0T/aEH8cyAnFM OrcE9fbPEcxxe8M2PFZbVbxlqyVF3IgDQZgFvSJ6j7/n28e6LHO6zCS9vsVnIcyG1K oiVMSQ1f2VtWAsA+2n+inxBy24PbVbotTUpm3lUTVaWe8gztP50LuKUMg2SuHZk+me 3Tl6HULo8hzpA== Subject: [PATCH 1/1] xfs: test that the needsrepair feature works as advertised From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Tue, 20 Apr 2021 17:22:41 -0700 Message-ID: <161896456107.776294.13840945585349427098.stgit@magnolia> In-Reply-To: <161896455503.776294.3492113564046201298.stgit@magnolia> References: <161896455503.776294.3492113564046201298.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Make sure that the needsrepair feature flag can be cleared only by repair and that mounts are prohibited when the feature is set. Signed-off-by: Darrick J. Wong --- common/xfs | 28 ++++++++++++++++++ tests/xfs/768 | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/768.out | 4 +++ tests/xfs/770 | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/770.out | 2 + tests/xfs/group | 2 + 6 files changed, 199 insertions(+) create mode 100755 tests/xfs/768 create mode 100644 tests/xfs/768.out create mode 100755 tests/xfs/770 create mode 100644 tests/xfs/770.out diff --git a/common/xfs b/common/xfs index 887bd001..c2384146 100644 --- a/common/xfs +++ b/common/xfs @@ -312,6 +312,13 @@ _scratch_xfs_check() _xfs_check $SCRATCH_OPTIONS $* $SCRATCH_DEV } +_require_libxfs_debug_flag() { + local hook="$1" + + grep -q LIBXFS_DEBUG_WRITE_CRASH "$(type -P xfs_repair)" || \ + _notrun "libxfs debug hook $hook not detected?" +} + _scratch_xfs_repair() { SCRATCH_OPTIONS="" @@ -1114,3 +1121,24 @@ _xfs_get_cowgc_interval() { _fail "Can't find cowgc interval procfs knob?" fi } + +# Print the status of the given features on the scratch filesystem. +# Returns 0 if all features are found, 1 otherwise. +_check_scratch_xfs_features() +{ + local features="$(_scratch_xfs_db -c 'version')" + local output=("FEATURES:") + local found=0 + + for feature in "$@"; do + local status="NO" + if echo "${features}" | grep -q -w "${feature}"; then + status="YES" + found=$((found + 1)) + fi + output+=("${feature}:${status}") + done + + echo "${output[@]}" + test "${found}" -eq "$#" +} diff --git a/tests/xfs/768 b/tests/xfs/768 new file mode 100755 index 00000000..e6301829 --- /dev/null +++ b/tests/xfs/768 @@ -0,0 +1,80 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 768 +# +# Make sure that the kernel won't mount a filesystem if repair forcibly sets +# NEEDSREPAIR while fixing metadata. Corrupt a directory in such a way as +# to force repair to write an invalid dirent value as a sentinel to trigger a +# repair activity in a later phase. Use a debug knob in xfs_repair to abort +# the repair immediately after forcing the flag on. + +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 + +# real QA test starts here +_supported_fs xfs +_require_scratch_nocheck +_require_scratch_xfs_crc # needsrepair only exists for v5 +_require_libxfs_debug_flag LIBXFS_DEBUG_WRITE_CRASH + +rm -f $seqres.full + +# Set up a real filesystem for our actual test +_scratch_mkfs -m crc=1 >> $seqres.full + +# Create a directory large enough to have a dir data block. 2k worth of +# dirent names ought to do it. +_scratch_mount +mkdir -p $SCRATCH_MNT/fubar +for i in $(seq 0 256 2048); do + fname=$(printf "%0255d" $i) + ln -s -f urk $SCRATCH_MNT/fubar/$fname +done +inum=$(stat -c '%i' $SCRATCH_MNT/fubar) +_scratch_unmount + +# Fuzz the directory +_scratch_xfs_db -x -c "inode $inum" -c "dblock 0" \ + -c "fuzz -d bu[2].inumber add" >> $seqres.full + +# Try to repair the directory, force it to crash after setting needsrepair +LIBXFS_DEBUG_WRITE_CRASH=ddev=2 _scratch_xfs_repair 2>> $seqres.full +test $? -eq 137 || echo "repair should have been killed??" + +# We can't mount, right? +_check_scratch_xfs_features NEEDSREPAIR +_try_scratch_mount &> $tmp.mount +res=$? +_filter_scratch < $tmp.mount +if [ $res -eq 0 ]; then + echo "Should not be able to mount after needsrepair crash" + _scratch_unmount +fi + +# Repair properly this time and retry the mount +_scratch_xfs_repair 2>> $seqres.full +_check_scratch_xfs_features NEEDSREPAIR + +_scratch_mount + +# success, all done +status=0 +exit diff --git a/tests/xfs/768.out b/tests/xfs/768.out new file mode 100644 index 00000000..1168ba25 --- /dev/null +++ b/tests/xfs/768.out @@ -0,0 +1,4 @@ +QA output created by 768 +FEATURES: NEEDSREPAIR:YES +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. +FEATURES: NEEDSREPAIR:NO diff --git a/tests/xfs/770 b/tests/xfs/770 new file mode 100755 index 00000000..40e67ab5 --- /dev/null +++ b/tests/xfs/770 @@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 770 +# +# Populate a filesystem with all types of metadata, then run repair with the +# libxfs write failure trigger set to go after a single write. Check that the +# injected error trips, causing repair to abort, that needsrepair is set on the +# fs, the kernel won't mount; and that a non-injecting repair run clears +# needsrepair and makes the filesystem mountable again. +# +# Repeat with the trip point set to successively higher numbers of writes until +# we hit ~200 writes or repair manages to run to completion without tripping. + +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/populate +. ./common/filter + +# real QA test starts here +_supported_fs xfs +_require_scratch_nocheck +_require_scratch_xfs_crc # needsrepair only exists for v5 +_require_populate_commands +_require_libxfs_debug_flag LIBXFS_DEBUG_WRITE_CRASH + +rm -f $seqres.full + +# Populate the filesystem +_scratch_populate_cached nofill >> $seqres.full 2>&1 + +max_writes=200 # 200 loops should be enough for anyone +nr_incr=$((13 / TIME_FACTOR)) +test $nr_incr -lt 1 && nr_incr=1 +for ((nr_writes = 1; nr_writes < max_writes; nr_writes += nr_incr)); do + # Start a repair and force it to abort after some number of writes + LIBXFS_DEBUG_WRITE_CRASH=ddev=$nr_writes \ + _scratch_xfs_repair 2>> $seqres.full + res=$? + if [ $res -ne 0 ] && [ $res -ne 137 ]; then + echo "repair failed with $res??" + break + elif [ $res -eq 0 ]; then + [ $nr_writes -eq 1 ] && \ + echo "ran to completion on the first try?" + break + fi + + # Check the state of NEEDSREPAIR after repair fails. If it isn't set + # but if repair -n says the fs is clean, then it's possible that the + # injected error caused it to abort immediately after the write that + # cleared NEEDSREPAIR. + if ! _check_scratch_xfs_features NEEDSREPAIR > /dev/null && + ! _scratch_xfs_repair -n &>> $seqres.full; then + echo "NEEDSREPAIR should be set on corrupt fs" + fi + + # Repair properly this time and retry the mount + _scratch_xfs_repair 2>> $seqres.full + _check_scratch_xfs_features NEEDSREPAIR > /dev/null && \ + echo "Repair failed to clear NEEDSREPAIR on the $nr_writes writes test" +done + +# success, all done +echo Silence is golden. +status=0 +exit diff --git a/tests/xfs/770.out b/tests/xfs/770.out new file mode 100644 index 00000000..725d740b --- /dev/null +++ b/tests/xfs/770.out @@ -0,0 +1,2 @@ +QA output created by 770 +Silence is golden. diff --git a/tests/xfs/group b/tests/xfs/group index d1b1456b..461ae2b2 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -522,3 +522,5 @@ 537 auto quick 538 auto stress 539 auto quick mount +768 auto quick repair +770 auto repair