From patchwork Fri Feb 17 02:32:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9578639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 360C660244 for ; Fri, 17 Feb 2017 02:34:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27B912867B for ; Fri, 17 Feb 2017 02:34:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C6B128696; Fri, 17 Feb 2017 02:34:39 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 EB3D62867B for ; Fri, 17 Feb 2017 02:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754993AbdBQCeh (ORCPT ); Thu, 16 Feb 2017 21:34:37 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34795 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754965AbdBQCef (ORCPT ); Thu, 16 Feb 2017 21:34:35 -0500 Received: by mail-pf0-f175.google.com with SMTP id e4so9865682pfg.1 for ; Thu, 16 Feb 2017 18:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=rX/gGu7wKMhmE9is5y8QRBmEp/BzsfY9FyHq3KbgFOo=; b=c6S5vvrHdlinz/zFWLVYHAFN8Wp+8Kl49DH4rK4R9NoHtaMfFGNO6tFoxdu5+2K59j RLvncUxtoj8iKpDuvqoa62rPQqdbptHKOn75LHknk/NRl72o0/5fumI7QLbks9zoq3AG rFvDQ3t+7U54toJE5yKok7BB84qQfQGJ+gnocYqKdtFXcskFdv/dPhU9kAD4fUaBXWIb OeBqMsnxJb9Z+14KpmdwZZ0xINIfiwTWo2rg7+Awj8JtZhZbHlhUtst9Oryuv1eWb24D k+Gnu9r8eAGX3kmxND5Feis38FRT0zq2UD5UlJCyOn+ogkFOQWCgwyHWbZIF+yZlXHnc bwfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=rX/gGu7wKMhmE9is5y8QRBmEp/BzsfY9FyHq3KbgFOo=; b=QbZ+YLZpwMHJSA/Y4cVq0YvXPsyKL7stEmC7Xgp1Gc67fOSvPLgSBmIdfJ+Ihrl/Hv 7Fe4dwwdyOFcac5roo35BeQqO86DnhxTgm5GwsPrs4quwhcNyxrNlp6frr/2uH1Va9V7 v1fbiqSFl22bNdCwcTfUqAwTO5D+2ri99H9QUsAW5W3CrbHKMm/hVIfPYv6kCdTJhkhJ +dA7Po5GlSdueLnT8zNOJOAfY9nOo1/SybH4XOja6qy2oHdMlcOlQ4XvrOuMt4TcB7UO zmYlSf5FL8qk+m+r0l0FD7LM9QX/h21cmZkouqSccpz58bTCnYSuDk5u/tVqHNRzZhsV uqxg== X-Gm-Message-State: AMke39nFVnw0M3YuzmTiDnsvrjNGWVcv8I6wJvheH3p2ST086whpZ3GamSNNZrRwfZQfpVxg X-Received: by 10.99.140.28 with SMTP id m28mr7182203pgd.174.1487298874447; Thu, 16 Feb 2017 18:34:34 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:180::1:c10e]) by smtp.gmail.com with ESMTPSA id j78sm15869256pfk.39.2017.02.16.18.34.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 18:34:33 -0800 (PST) From: Omar Sandoval To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/2] btrfs: test decompression in the middle of large extents Date: Thu, 16 Feb 2017 18:32:49 -0800 Message-Id: <300ecd5f733d77c68969818db0a4e4f53d951adc.1487298611.git.osandov@fb.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <7e55bbd20c8e6515e0b76b1ee4c348fb6066c502.1487298611.git.osandov@fb.com> References: <7e55bbd20c8e6515e0b76b1ee4c348fb6066c502.1487298611.git.osandov@fb.com> In-Reply-To: <7e55bbd20c8e6515e0b76b1ee4c348fb6066c502.1487298611.git.osandov@fb.com> References: <7e55bbd20c8e6515e0b76b1ee4c348fb6066c502.1487298611.git.osandov@fb.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval This is a regression test for "Btrfs: fix btrfs_decompress_buf2page()". It fails for zlib on v4.10-rc[1-7]. Signed-off-by: Omar Sandoval --- This runs in <60 seconds on my test VM, which I think qualifies for the quick group? common/btrfs | 8 +++++ tests/btrfs/137 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/137.out | 2 ++ tests/btrfs/group | 1 + 4 files changed, 107 insertions(+) create mode 100755 tests/btrfs/137 create mode 100644 tests/btrfs/137.out diff --git a/common/btrfs b/common/btrfs index 96c3635b..015ce4d2 100644 --- a/common/btrfs +++ b/common/btrfs @@ -364,3 +364,11 @@ _reload_btrfs_ko() modprobe -r btrfs || _fail "btrfs unload failed" modprobe btrfs || _fail "btrfs load failed" } + +_btrfs_compression_algos() +{ + echo zlib + if [ -e /sys/fs/btrfs/features/compress_lzo ]; then + echo lzo + fi +} diff --git a/tests/btrfs/137 b/tests/btrfs/137 new file mode 100755 index 00000000..c3f28cc0 --- /dev/null +++ b/tests/btrfs/137 @@ -0,0 +1,96 @@ +#! /bin/bash +# FS QA Test 137 +# +# Test decompression in the middle of large extents. Regression test for Linux +# kernel commit 6e78b3f7a193 ("Btrfs: fix btrfs_decompress_buf2page()"). +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Facebook. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +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 + +_supported_fs btrfs +_supported_os Linux +_require_scratch + +algos=($(_btrfs_compression_algos)) + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount +# Need 1GB for the uncompressed file plus <1GB for each compressed file. +_require_fs_space $SCRATCH_MNT $((1024 * 1024 * (1 + ${#algos[@]}))) + +# Checksum a piece in the middle of the file. This hits the unaligned case that +# caused the original bug. +do_csum() +{ + dd if="$1" bs=4K skip=555 count=100 2>>$seqres.full| md5sum | cut -d ' ' -f 1 +} + +# Create a large, uncompressed (but compressible) file. +touch "${SCRATCH_MNT}/uncompressed" +$BTRFS_UTIL_PROG property set "${SCRATCH_MNT}/uncompressed" compression "" +_ddt of="${SCRATCH_MNT}/uncompressed" bs=1M count=1K 2>&1 | _filter_dd + +csum="$(do_csum "${SCRATCH_MNT}/uncompressed")" + +for algo in ${algos[@]}; do + echo "Testing ${algo}" >> $seqres.full + + # Copy the same data, but with compression enabled. + touch "${SCRATCH_MNT}/${algo}" + $BTRFS_UTIL_PROG property set "${SCRATCH_MNT}/${algo}" compression "${algo}" + dd if="${SCRATCH_MNT}/uncompressed" of="${SCRATCH_MNT}/${algo}" bs=1M 2>&1 | _filter_dd + + # The correct data is likely still cached. Cycle the mount to drop the + # cache and start fresh. + _scratch_cycle_mount + + # Check the checksum. + compressed_csum="$(do_csum "${SCRATCH_MNT}/${algo}")" + if [ "${compressed_csum}" != "${csum}" ]; then + echo "Checksum mismatch for ${algo} (expected ${csum}, got ${compressed_csum})" + fi +done + +echo "Silence is golden" + +status=0 +exit diff --git a/tests/btrfs/137.out b/tests/btrfs/137.out new file mode 100644 index 00000000..eb48dd21 --- /dev/null +++ b/tests/btrfs/137.out @@ -0,0 +1,2 @@ +QA output created by 137 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index ea88ba4e..0a119e4b 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -139,3 +139,4 @@ 134 auto quick send 135 auto quick send 136 auto convert +137 auto quick compress