{"id":807897,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807897/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830210542.2153-7-eblake@redhat.com>","date":"2017-08-30T21:05:30","name":"[v6,06/18] dirty-bitmap: Change bdrv_dirty_bitmap_*serialize*() to take bytes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5ec246e85e78f91cf1f7d95e9b3190fada476809","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830210542.2153-7-eblake@redhat.com/mbox/","series":[{"id":700,"url":"http://patchwork.ozlabs.org/api/1.0/series/700/?format=json","date":"2017-08-30T21:05:25","name":"make dirty-bitmap byte-based","version":6,"mbox":"http://patchwork.ozlabs.org/series/700/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807897/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjJ8z6sNxz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 07:11:47 +1000 (AEST)","from localhost ([::1]:52715 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAH3-0008So-V1\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:11:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36941)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABZ-0003lE-Fs\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:07 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABY-0007UN-4n\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:05 -0400","from mx1.redhat.com ([209.132.183.28]:34022)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnABU-0007Og-0T; Wed, 30 Aug 2017 17:06:00 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0CD667E433;\n\tWed, 30 Aug 2017 21:05:59 +0000 (UTC)","from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C674977557;\n\tWed, 30 Aug 2017 21:05:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0CD667E433","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:30 -0500","Message-Id":"<20170830210542.2153-7-eblake@redhat.com>","In-Reply-To":"<20170830210542.2153-1-eblake@redhat.com>","References":"<20170830210542.2153-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 30 Aug 2017 21:05:59 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v6 06/18] dirty-bitmap: Change\n\tbdrv_dirty_bitmap_*serialize*() to take bytes","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, vsementsov@virtuozzo.com, Fam Zheng , \n\tqemu-block@nongnu.org, Max Reitz , jsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Right now, the dirty-bitmap code exposes the fact that we use\na scale of sector granularity in the underlying hbitmap to anything\nthat wants to serialize a dirty bitmap. It's nicer to uniformly\nexpose bytes as our dirty-bitmap interface, matching the previous\nchange to bitmap size. The only caller to serialization is currently\nqcow2-cluster.c, which becomes a bit more verbose because it is still\ntracking sectors for other reasons, but a later patch will fix that\nto more uniformly use byte offsets everywhere. Likewise, within\ndirty-bitmap, we have to add more assertions that we are not\ntruncating incorrectly, which can go away once the internal hbitmap\nis byte-based rather than sector-based.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv5: no change\nv4: new patch\n---\n include/block/dirty-bitmap.h | 14 +++++++-------\n block/dirty-bitmap.c | 37 ++++++++++++++++++++++++-------------\n block/qcow2-bitmap.c | 22 ++++++++++++++--------\n 3 files changed, 45 insertions(+), 28 deletions(-)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex 8fd842eac9..f4ccd3f33f 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -49,19 +49,19 @@ BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap,\n void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter);\n\n uint64_t bdrv_dirty_bitmap_serialization_size(const BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count);\n+ uint64_t offset, uint64_t bytes);\n uint64_t bdrv_dirty_bitmap_serialization_align(const BdrvDirtyBitmap *bitmap);\n void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap,\n- uint8_t *buf, uint64_t start,\n- uint64_t count);\n+ uint8_t *buf, uint64_t offset,\n+ uint64_t bytes);\n void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap,\n- uint8_t *buf, uint64_t start,\n- uint64_t count, bool finish);\n+ uint8_t *buf, uint64_t offset,\n+ uint64_t bytes, bool finish);\n void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count,\n+ uint64_t offset, uint64_t bytes,\n bool finish);\n void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count,\n+ uint64_t offset, uint64_t bytes,\n bool finish);\n void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap);\n\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex e65ec4f7ec..034effc8cd 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -570,42 +570,53 @@ void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in)\n }\n\n uint64_t bdrv_dirty_bitmap_serialization_size(const BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count)\n+ uint64_t offset, uint64_t bytes)\n {\n- return hbitmap_serialization_size(bitmap->bitmap, start, count);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));\n+ return hbitmap_serialization_size(bitmap->bitmap,\n+ offset >> BDRV_SECTOR_BITS,\n+ bytes >> BDRV_SECTOR_BITS);\n }\n\n uint64_t bdrv_dirty_bitmap_serialization_align(const BdrvDirtyBitmap *bitmap)\n {\n- return hbitmap_serialization_align(bitmap->bitmap);\n+ return hbitmap_serialization_align(bitmap->bitmap) * BDRV_SECTOR_SIZE;\n }\n\n void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap,\n- uint8_t *buf, uint64_t start,\n- uint64_t count)\n+ uint8_t *buf, uint64_t offset,\n+ uint64_t bytes)\n {\n- hbitmap_serialize_part(bitmap->bitmap, buf, start, count);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));\n+ hbitmap_serialize_part(bitmap->bitmap, buf, offset >> BDRV_SECTOR_BITS,\n+ bytes >> BDRV_SECTOR_BITS);\n }\n\n void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap,\n- uint8_t *buf, uint64_t start,\n- uint64_t count, bool finish)\n+ uint8_t *buf, uint64_t offset,\n+ uint64_t bytes, bool finish)\n {\n- hbitmap_deserialize_part(bitmap->bitmap, buf, start, count, finish);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));\n+ hbitmap_deserialize_part(bitmap->bitmap, buf, offset >> BDRV_SECTOR_BITS,\n+ bytes >> BDRV_SECTOR_BITS, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count,\n+ uint64_t offset, uint64_t bytes,\n bool finish)\n {\n- hbitmap_deserialize_zeroes(bitmap->bitmap, start, count, finish);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));\n+ hbitmap_deserialize_zeroes(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n+ bytes >> BDRV_SECTOR_BITS, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,\n- uint64_t start, uint64_t count,\n+ uint64_t offset, uint64_t bytes,\n bool finish)\n {\n- hbitmap_deserialize_ones(bitmap->bitmap, start, count, finish);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE));\n+ hbitmap_deserialize_ones(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n+ bytes >> BDRV_SECTOR_BITS, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap)\ndiff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex 65122e9ae1..92098bfa49 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -278,7 +278,7 @@ static uint64_t sectors_covered_by_bitmap_cluster(const BDRVQcow2State *s,\n bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS;\n uint64_t sbc = sector_granularity * (s->cluster_size << 3);\n\n- assert(QEMU_IS_ALIGNED(sbc,\n+ assert(QEMU_IS_ALIGNED(sbc << BDRV_SECTOR_BITS,\n bdrv_dirty_bitmap_serialization_align(bitmap)));\n return sbc;\n }\n@@ -299,7 +299,7 @@ static int load_bitmap_data(BlockDriverState *bs,\n uint8_t *buf = NULL;\n uint64_t i, tab_size =\n size_to_clusters(s,\n- bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_sectors));\n+ bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_size));\n\n if (tab_size != bitmap_table_size || tab_size > BME_MAX_TABLE_SIZE) {\n return -EINVAL;\n@@ -316,7 +316,9 @@ static int load_bitmap_data(BlockDriverState *bs,\n\n if (offset == 0) {\n if (entry & BME_TABLE_ENTRY_FLAG_ALL_ONES) {\n- bdrv_dirty_bitmap_deserialize_ones(bitmap, sector, count,\n+ bdrv_dirty_bitmap_deserialize_ones(bitmap,\n+ sector * BDRV_SECTOR_SIZE,\n+ count * BDRV_SECTOR_SIZE,\n false);\n } else {\n /* No need to deserialize zeros because the dirty bitmap is\n@@ -327,7 +329,9 @@ static int load_bitmap_data(BlockDriverState *bs,\n if (ret < 0) {\n goto finish;\n }\n- bdrv_dirty_bitmap_deserialize_part(bitmap, buf, sector, count,\n+ bdrv_dirty_bitmap_deserialize_part(bitmap, buf,\n+ sector * BDRV_SECTOR_SIZE,\n+ count * BDRV_SECTOR_SIZE,\n false);\n }\n }\n@@ -1085,7 +1089,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n uint64_t *tb;\n uint64_t tb_size =\n size_to_clusters(s,\n- bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_sectors));\n+ bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_size));\n\n if (tb_size > BME_MAX_TABLE_SIZE ||\n tb_size * s->cluster_size > BME_MAX_PHYS_SIZE)\n@@ -1112,8 +1116,8 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n\n sector = cluster * sbc;\n end = MIN(bm_sectors, sector + sbc);\n- write_size =\n- bdrv_dirty_bitmap_serialization_size(bitmap, sector, end - sector);\n+ write_size = bdrv_dirty_bitmap_serialization_size(bitmap,\n+ sector * BDRV_SECTOR_SIZE, (end - sector) * BDRV_SECTOR_SIZE);\n assert(write_size <= s->cluster_size);\n\n off = qcow2_alloc_clusters(bs, s->cluster_size);\n@@ -1125,7 +1129,9 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n }\n tb[cluster] = off;\n\n- bdrv_dirty_bitmap_serialize_part(bitmap, buf, sector, end - sector);\n+ bdrv_dirty_bitmap_serialize_part(bitmap, buf,\n+ sector * BDRV_SECTOR_SIZE,\n+ (end - sector) * BDRV_SECTOR_SIZE);\n if (write_size < s->cluster_size) {\n memset(buf + write_size, 0, s->cluster_size - write_size);\n }\n","prefixes":["v6","06/18"]}