From patchwork Tue Dec 13 19:45:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13072379 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 4B59FC4167B for ; Tue, 13 Dec 2022 19:45:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236698AbiLMTpg (ORCPT ); Tue, 13 Dec 2022 14:45:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236598AbiLMTpc (ORCPT ); Tue, 13 Dec 2022 14:45:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44B7DDFF6; Tue, 13 Dec 2022 11:45:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 063A7B815B8; Tue, 13 Dec 2022 19:45:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5684C433EF; Tue, 13 Dec 2022 19:45:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670960728; bh=Jq4mcCZHzQr3OwJ4AuuydW8oYpvMvT5dI8HY95TkQAc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=m64SX0Y1Ana7UB8t5x2E7pXC0jwripDkhD/CPkUPvTxT/ABah8tl0lLslkjy2FBYP TqMZ3nYOoCl3w+ajO/wis4oI4waDkdBcmA37g3WXT4mhekI9ExiaTtflkbX4ezthKV /uP+LsiscCE2w7BcpN5NvpQeOLpztX3evpPD/JxMm0xzomVD9v/Z5KIjqqmmsJ79pR /ZXH+FOOntBATRW2bxsNtPuCTtubcZtwwkdKrLITK1zUHjxh3/u8l3FeWkNgT8Jgx2 cV2MZE5zgsP2PaqBXt7F06F19qauzTslm6WT8tWf+yWpiTsZH5IJOz8gqhqh1HVmK5 xlr97QuaD+XjQ== Subject: [PATCH 3/4] common/populate: move decompression code to _{xfs,ext4}_mdrestore From: "Darrick J. Wong" To: djwong@kernel.org, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Tue, 13 Dec 2022 11:45:28 -0800 Message-ID: <167096072838.1750373.11954125201906427521.stgit@magnolia> In-Reply-To: <167096070957.1750373.5715692265711468248.stgit@magnolia> References: <167096070957.1750373.5715692265711468248.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 Move the metadump decompression code to the per-filesystem mdrestore commands so that everyone can take advantage of them. This enables the XFS and ext4 _mdrestore helpers to handle metadata dumps compressed with their respective _metadump helpers. In turn, this means that the xfs fuzz tests can now handle the compressed metadumps created by the _scratch_populate_cached helper. This is key to unbreaking fuzz testing for xfs. Signed-off-by: Darrick J. Wong --- common/ext4 | 13 ++++++++++++- common/fuzzy | 2 +- common/populate | 15 ++------------- common/xfs | 15 +++++++++++++-- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/common/ext4 b/common/ext4 index dc2e4e59cc..cadf1a7974 100644 --- a/common/ext4 +++ b/common/ext4 @@ -129,9 +129,20 @@ _ext4_mdrestore() { local metadump="$1" local device="$2" - shift; shift + local compressopt="$3" + shift; shift; shift local options="$@" + # If we're configured for compressed dumps and there isn't already an + # uncompressed dump, see if we can use DUMP_COMPRESSOR to decompress + # something. + if [ ! -e "$metadump" ] && [ -n "$DUMP_COMPRESSOR" ]; then + for compr in "$metadump".*; do + [ -e "$compr" ] && $DUMP_COMPRESSOR -d -f -k "$compr" && break + done + fi + test -r "$metadump" || return 1 + $E2IMAGE_PROG $options -r "${metadump}" "${SCRATCH_DEV}" } diff --git a/common/fuzzy b/common/fuzzy index fad79124e5..e634815eec 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -159,7 +159,7 @@ __scratch_xfs_fuzz_mdrestore() test -e "${POPULATE_METADUMP}" || _fail "Need to set POPULATE_METADUMP" __scratch_xfs_fuzz_unmount - _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" + _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" compress } __fuzz_notify() { diff --git a/common/populate b/common/populate index f382c40aca..96866ee4cf 100644 --- a/common/populate +++ b/common/populate @@ -848,20 +848,9 @@ _scratch_populate_cache_tag() { _scratch_populate_restore_cached() { local metadump="$1" - # If we're configured for compressed dumps and there isn't already an - # uncompressed dump, see if we can use DUMP_COMPRESSOR to decompress - # something. - if [ -n "$DUMP_COMPRESSOR" ]; then - for compr in "$metadump".*; do - [ -e "$compr" ] && $DUMP_COMPRESSOR -d -f -k "$compr" && break - done - fi - - test -r "$metadump" || return 1 - case "${FSTYP}" in "xfs") - _xfs_mdrestore "${metadump}" "${SCRATCH_DEV}" + _xfs_mdrestore "${metadump}" "${SCRATCH_DEV}" compress res=$? test $res -ne 0 && return $res @@ -876,7 +865,7 @@ _scratch_populate_restore_cached() { return $res ;; "ext2"|"ext3"|"ext4") - _ext4_mdrestore "${metadump}" "${SCRATCH_DEV}" + _ext4_mdrestore "${metadump}" "${SCRATCH_DEV}" compress ret=$? test $ret -ne 0 && return $ret diff --git a/common/xfs b/common/xfs index 216dab3bcd..833c2f4368 100644 --- a/common/xfs +++ b/common/xfs @@ -641,9 +641,20 @@ _xfs_metadump() { _xfs_mdrestore() { local metadump="$1" local device="$2" - shift; shift + local compressopt="$3" + shift; shift; shift local options="$@" + # If we're configured for compressed dumps and there isn't already an + # uncompressed dump, see if we can use DUMP_COMPRESSOR to decompress + # something. + if [ ! -e "$metadump" ] && [ -n "$DUMP_COMPRESSOR" ]; then + for compr in "$metadump".*; do + [ -e "$compr" ] && $DUMP_COMPRESSOR -d -f -k "$compr" && break + done + fi + test -r "$metadump" || return 1 + $XFS_MDRESTORE_PROG $options "${metadump}" "${device}" } @@ -666,7 +677,7 @@ _scratch_xfs_mdrestore() local metadump=$1 shift - _xfs_mdrestore "$metadump" "$SCRATCH_DEV" "$@" + _xfs_mdrestore "$metadump" "$SCRATCH_DEV" nocompress "$@" } # run xfs_check and friends on a FS.