From nobody Thu Mar 28 20:34:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610473426; cv=none; d=zohomail.com; s=zohoarc; b=haK3lPg2Pg0ymzQmC4N6rvNz0w0U+KlQ1RXTyi/fGmpHAc/o/as4yQjntsZ+cCEII5thh8wDDh0ooUWCwRcto4jcaEMqi+eY4MmBCBNenJ4Sak/icTeo5ljXbg7QWBAcg+WEc1ssYdYnZ9B4PmLULXnPYniTV5+WI0ALD49wt48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473426; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=yiA3qtphvoIAezpn5/htIwuf9PdVO2omXZL721Z1hEg=; b=gMO2RlTcxvb4dkH3EPL+3PrsYnTXT5aG88/Wh+JldjyIVjznoFhDLrQpOuYSkYDoLV3GqDs/6dSUwmQgg58fdJv7JWdVa428zosp4EkuSPktJOGmpaXOJZ9FYLT9PcFaYF3EXQkfqysy5n4uPi9JI4N4I35gKT8ebACwSa3TEUI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473425316207.7280355667483; Tue, 12 Jan 2021 09:43:45 -0800 (PST) Received: from localhost ([::1]:35940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNhn-0003Zx-PG for importer@patchew.org; Tue, 12 Jan 2021 12:43:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzN7h-0001Ct-Hv; Tue, 12 Jan 2021 12:06:26 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:42030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzN7c-0001BH-Je; Tue, 12 Jan 2021 12:06:24 -0500 Received: from [213.94.31.64] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1kzN7F-0003p7-3K; Tue, 12 Jan 2021 18:05:57 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1kzN72-0000ln-4b; Tue, 12 Jan 2021 18:05:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; bh=yiA3qtphvoIAezpn5/htIwuf9PdVO2omXZL721Z1hEg=; b=f0s+H5ZXjWGTLsuhSuwwIQxf51oN+B/p7N0YuFclbL6ndmMfOU/YvsUEKF7vwRUh+zQkGPBX5qkTdF+/bQMIxwZGdVZ0/M3wkVq4e5QK+NFfvbKOwFsIgz4OV3Qykfw9qhzBHj8GGcGv9hJHVA6UoNgyOQz825CprorKKLBXZ+KEblqEEexxM/OU5Q6xkB7/K2sNHv6qVn1zCnjoqV8lLEMNyfwdjnQ2rO4XW3J77elVMQ0MfUB8v2vyGCI4L9YP3rGRWi5fvvL9sWCu9XeQ+VGy24SLMzR9fqUtKyFZozAlFKt1jk35Fpm9NiK93jqnApnMBbUg4gQE3Xca7BiTAA==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v2] iotests: Add test for the regression fixed in c8bf9a9169 Date: Tue, 12 Jan 2021 18:05:40 +0100 Message-Id: <20210112170540.2912-1-berto@igalia.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Maxim Levitsky , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alberto Garcia Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky --- v2: Rebase on top of the latest master tests/qemu-iotests/313 | 103 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/313.out | 29 +++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 133 insertions(+) create mode 100755 tests/qemu-iotests/313 create mode 100644 tests/qemu-iotests/313.out diff --git a/tests/qemu-iotests/313 b/tests/qemu-iotests/313 new file mode 100755 index 0000000000..0a5202ad49 --- /dev/null +++ b/tests/qemu-iotests/313 @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +# +# Test for the regression fixed in commit c8bf9a9169 +# +# Copyright (C) 2020 Igalia, S.L. +# Author: Alberto Garcia +# Based on a test case by Maxim Levitsky +# +# 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; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will 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, see . +# + +# creator +owner=3Dberto@igalia.com + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux +_unsupported_imgopts cluster_size refcount_bits extended_l2 compat=3D0.10 = data_file + +# The cluster size must be at least the granularity of the mirror job (4KB) +# Note that larger cluster sizes will produce very large images (several G= Bs) +cluster_size=3D4096 +refcount_bits=3D64 # Make it equal to the L2 entry size for convenience +options=3D"cluster_size=3D${cluster_size},refcount_bits=3D${refcount_bits}" + +# Number of refcount entries per refcount blocks +ref_entries=3D$(( ${cluster_size} * 8 / ${refcount_bits} )) + +# Number of data clusters needed to fill a refcount block +# Equals ${ref_entries} minus two (one L2 table and one refcount block) +data_clusters_per_refblock=3D$(( ${ref_entries} - 2 )) + +# Number of entries in the refcount cache +ref_blocks=3D4 + +# Write enough data clusters to fill the refcount cache and allocate +# one more refcount block. +# Subtract 3 clusters from the total: qcow2 header, refcount table, L1 tab= le +total_data_clusters=3D$(( ${data_clusters_per_refblock} * ${ref_blocks} + = 1 - 3 )) + +# Total size to write in bytes +total_size=3D$(( ${total_data_clusters} * ${cluster_size} )) + +echo +echo '### Create the image' +echo +TEST_IMG_FILE=3D$TEST_IMG.base _make_test_img -o $options $total_size | _f= ilter_img_create_size + +echo +echo '### Write data to allocate more refcount blocks than the cache can h= old' +echo +$QEMU_IO -c "write -P 1 0 $total_size" $TEST_IMG.base | _filter_qemu_io + +echo +echo '### Create an overlay' +echo +_make_test_img -F $IMGFMT -b $TEST_IMG.base -o $options | _filter_img_crea= te_size + +echo +echo '### Fill the overlay with zeroes' +echo +$QEMU_IO -c "write -z 0 $total_size" $TEST_IMG | _filter_qemu_io + +echo +echo '### Commit changes to the base image' +echo +$QEMU_IMG commit $TEST_IMG + +echo +echo '### Check the base image' +echo +$QEMU_IMG check $TEST_IMG.base + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/313.out b/tests/qemu-iotests/313.out new file mode 100644 index 0000000000..adb9f7bd95 --- /dev/null +++ b/tests/qemu-iotests/313.out @@ -0,0 +1,29 @@ +QA output created by 313 + +### Create the image + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3DSIZE + +### Write data to allocate more refcount blocks than the cache can hold + +wrote 8347648/8347648 bytes at offset 0 +7.961 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +### Create an overlay + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3DSIZE backing_file=3DTE= ST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT + +### Fill the overlay with zeroes + +wrote 8347648/8347648 bytes at offset 0 +7.961 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +### Commit changes to the base image + +Image committed. + +### Check the base image + +No errors were found on the image. +Image end offset: 8396800 +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index bc5bc324fe..26c9c67c45 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -319,3 +319,4 @@ 308 rw 309 rw auto quick 312 rw quick +313 rw auto quick --=20 2.20.1