From patchwork Fri Jul 3 13:13:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Shinkevich X-Patchwork-Id: 11641935 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE18313B4 for ; Fri, 3 Jul 2020 13:22:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD82E20760 for ; Fri, 3 Jul 2020 13:22:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD82E20760 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrLdv-0003jB-5c for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Jul 2020 09:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrLW3-0006sb-7h; Fri, 03 Jul 2020 09:14:07 -0400 Received: from relay.sw.ru ([185.231.240.75]:60337 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrLVw-0007eO-0N; Fri, 03 Jul 2020 09:14:06 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jrLVj-0004Vj-Th; Fri, 03 Jul 2020 16:13:47 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v8 07/10] qcow2_format.py: Dump bitmap table serialized entries Date: Fri, 3 Jul 2020 16:13:47 +0300 Message-Id: <1593782030-521984-8-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593782030-521984-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1593782030-521984-1-git-send-email-andrey.shinkevich@virtuozzo.com> Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.shinkevich@virtuozzo.com; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/03 09:13:53 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add bitmap table information to the QCOW2 metadata dump. It extends the output of the test case #291 Bitmap name bitmap-1 ... Bitmap table type offset size 0 serialized 4718592 65536 1 serialized 4294967296 65536 2 serialized 5348033147437056 65536 3 serialized 13792273858822144 65536 4 serialized 4718592 65536 5 serialized 4294967296 65536 6 serialized 4503608217305088 65536 7 serialized 14073748835532800 65536 Signed-off-by: Andrey Shinkevich --- tests/qemu-iotests/291.out | 45 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/qcow2_format.py | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out index 53a8eeb..9f465c6 100644 --- a/tests/qemu-iotests/291.out +++ b/tests/qemu-iotests/291.out @@ -41,6 +41,15 @@ type 1 granularity_bits 19 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5046272 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 Bitmap name b2 bitmap_table_offset 0x500000 @@ -50,6 +59,15 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5177344 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 === Bitmap preservation not possible to non-qcow2 === @@ -124,6 +142,15 @@ type 1 granularity_bits 19 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 4587520 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 Bitmap name b2 bitmap_table_offset 0x490000 @@ -133,6 +160,15 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 4718592 65536 +1 serialized 4294967296 65536 +2 serialized 5348033147437056 65536 +3 serialized 13792273858822144 65536 +4 serialized 4718592 65536 +5 serialized 4294967296 65536 +6 serialized 4503608217305088 65536 +7 serialized 14073748835532800 65536 Bitmap name b0 bitmap_table_offset 0x510000 @@ -142,6 +178,15 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5242880 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 === Check bitmap contents === diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py index cfd9646..b512f84 100644 --- a/tests/qemu-iotests/qcow2_format.py +++ b/tests/qemu-iotests/qcow2_format.py @@ -171,14 +171,56 @@ class Qcow2BitmapDirEntry(Qcow2Struct): entry_raw_size = self.bitmap_dir_entry_raw_size() padding = ((entry_raw_size + 7) & ~7) - entry_raw_size fd.seek(padding, 1) + position = fd.tell() + self.read_bitmap_table(fd) + fd.seek(position) def bitmap_dir_entry_raw_size(self): return struct.calcsize(self.fmt) + self.name_size + \ self.extra_data_size + def read_bitmap_table(self, fd): + fd.seek(self.bitmap_table_offset) + table_size = self.bitmap_table_size * 8 * 8 + table = [e[0] for e in struct.iter_unpack('>Q', fd.read(table_size))] + self.bitmap_table = Qcow2BitmapTable(raw_table=table, + cluster_size=self.cluster_size) + def dump(self): print(f'{"Bitmap name":<25} {self.name}') super(Qcow2BitmapDirEntry, self).dump() + self.bitmap_table.dump() + + +class Qcow2BitmapTableEntry: + + BME_TABLE_ENTRY_OFFSET_MASK = 0x00fffffffffffe00 + BME_TABLE_ENTRY_FLAG_ALL_ONES = 1 + + def __init__(self, entry): + self.offset = entry & self.BME_TABLE_ENTRY_OFFSET_MASK + if self.offset: + self.type = 'serialized' + elif entry & self.BME_TABLE_ENTRY_FLAG_ALL_ONES: + self.type = 'all-ones' + else: + self.type = 'all-zeroes' + + +class Qcow2BitmapTable: + + def __init__(self, raw_table, cluster_size): + self.entries = [] + self.cluster_size = cluster_size + for entry in raw_table: + self.entries.append(Qcow2BitmapTableEntry(entry)) + + def dump(self): + size = self.cluster_size + bitmap_table = enumerate(self.entries) + print(f'{"Bitmap table":<14} {"type":<15} {"offset":<24} {"size"}') + for i, entry in bitmap_table: + print(f'{i:<14} {entry.type:<15} {entry.offset:<24} {size}') QCOW2_EXT_MAGIC_BITMAPS = 0x23852875