From patchwork Fri Aug 10 02:20:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10562203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D91114E2 for ; Fri, 10 Aug 2018 02:20:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FF662B9CD for ; Fri, 10 Aug 2018 02:20:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03C812BC4B; Fri, 10 Aug 2018 02:20:40 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 8A07C2B9CD for ; Fri, 10 Aug 2018 02:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725746AbeHJEsU (ORCPT ); Fri, 10 Aug 2018 00:48:20 -0400 Received: from mx2.suse.de ([195.135.220.15]:60784 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725198AbeHJEsU (ORCPT ); Fri, 10 Aug 2018 00:48:20 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A4E92AED4; Fri, 10 Aug 2018 02:20:36 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2] fstests: btrfs: Add test for corrupted childless qgroup numbers Date: Fri, 10 Aug 2018 10:20:32 +0800 Message-Id: <20180810022032.28059-1-wqu@suse.com> X-Mailer: git-send-email 2.18.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This bug is exposed by populating a high level qgroup, and then make it childless with old qgroup numbers, and finally do rescan. Normally rescan should zero out all qgroups' accounting number, but due to a kernel bug which won't mark childless qgroups dirty, their on-disk data is never updated, thus old numbers remain and cause qgroup corruption. Fixed by the following kernel patch: "btrfs: qgroup: Dirty all qgroups before rescan" Reported-by: Misono Tomohiro Signed-off-by: Qu Wenruo --- changelog: v2: Change the adjective for the offending group, from "orphan" to "childless" --- tests/btrfs/170 | 83 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/170.out | 3 ++ tests/btrfs/group | 1 + 3 files changed, 87 insertions(+) create mode 100755 tests/btrfs/170 create mode 100644 tests/btrfs/170.out diff --git a/tests/btrfs/170 b/tests/btrfs/170 new file mode 100755 index 000000000000..3a810e80562f --- /dev/null +++ b/tests/btrfs/170 @@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 170 +# +# Test if btrfs can clear high level childless qgroup's accounting numbers +# during rescan. +# +# Fixed by the following kernel patch: +# "btrfs: qgroup: Dirty all qgroups before rescan" +# +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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + + +# Populate the fs +_run_btrfs_util_prog subvolume create "$SCRATCH_MNT/subvol" +_pwrite_byte 0xcdcd 0 1M "$SCRATCH_MNT/subvol/file1" | _filter_xfs_io > /dev/null + +# Ensure that file reach disk, so it will also appear in snapshot +sync +_run_btrfs_util_prog subvolume snapshot "$SCRATCH_MNT/subvol" "$SCRATCH_MNT/snapshot" + + +_run_btrfs_util_prog quota enable "$SCRATCH_MNT" +_run_btrfs_util_prog quota rescan -w "$SCRATCH_MNT" + +# Create high level qgroup +_run_btrfs_util_prog qgroup create 1/0 "$SCRATCH_MNT" + +# Don't use _run_btrfs_util_prog here, as it can return 1 to info user +# that qgroup is marked inconsistent, this is a bug in btrfs-progs, but +# to ensure it will work, we just ignore the return value. +$BTRFS_UTIL_PROG qgroup assign "$SCRATCH_MNT/snapshot" 1/0 "$SCRATCH_MNT" + +# Above assign will mark qgroup inconsistent due to the shared extents +# between subvol/snapshot/high level qgroup, do rescan here +_run_btrfs_util_prog quota rescan -w "$SCRATCH_MNT" + +# Now remove the qgroup relationship and make 1/0 childless +# Due to the shared extent outside of 1/0, we will mark qgroup inconsistent +# and keep the number of qgroup 1/0 +$BTRFS_UTIL_PROG qgroup remove "$SCRATCH_MNT/snapshot" 1/0 "$SCRATCH_MNT" + +# Above removal also marks qgroup inconsistent, rescan again +_run_btrfs_util_prog quota rescan -w "$SCRATCH_MNT" + +# After the test, btrfs check will verify qgroup numbers to catch any +# corruption. + +# success, all done +status=0 +exit diff --git a/tests/btrfs/170.out b/tests/btrfs/170.out new file mode 100644 index 000000000000..9002199e48ed --- /dev/null +++ b/tests/btrfs/170.out @@ -0,0 +1,3 @@ +QA output created by 170 +WARNING: quotas may be inconsistent, rescan needed +WARNING: quotas may be inconsistent, rescan needed diff --git a/tests/btrfs/group b/tests/btrfs/group index b616c73d09bf..339c977135c0 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -172,3 +172,4 @@ 167 auto quick replace volume 168 auto quick send 169 auto quick send +170 auto quick qgroup