{"id":807903,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807903/?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-19-eblake@redhat.com>","date":"2017-08-30T21:05:42","name":"[v6,18/18] dirty-bitmap: Convert internal hbitmap size/granularity","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"63c432bc6ba7a63a320819db1fbd430b3b269de9","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-19-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/807903/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xjJFP5cbjz9sNw\n\tfor ;\n\tThu, 31 Aug 2017 07:15:37 +1000 (AEST)","from localhost ([::1]:52738 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAKl-0003Xh-PU\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:15:35 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37250)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnACB-0004KM-FQ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnACA-0007no-2D\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:43 -0400","from mx1.redhat.com ([209.132.183.28]:40978)\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 1dnAC6-0007mN-Ig; Wed, 30 Aug 2017 17:06:38 -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 978CEC04B958;\n\tWed, 30 Aug 2017 21:06:37 +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 5A17577557;\n\tWed, 30 Aug 2017 21:06:36 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 978CEC04B958","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:42 -0500","Message-Id":"<20170830210542.2153-19-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.31]);\n\tWed, 30 Aug 2017 21:06:37 +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 18/18] dirty-bitmap: Convert internal\n\thbitmap size/granularity","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":"Now that all callers are using byte-based interfaces, there's no\nreason for our internal hbitmap to remain with sector-based\ngranularity. It also simplifies our internal scaling, since we\nalready know that hbitmap widens requests out to granularity\nboundaries.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv6: no change\nv5: fix bdrv_dirty_bitmap_truncate [John]\nv4: rebase to earlier changes, include serialization, R-b dropped\nv3: no change\nv2: no change\n---\n block/dirty-bitmap.c | 61 ++++++++++++++++------------------------------------\n 1 file changed, 18 insertions(+), 43 deletions(-)","diff":"diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex b54eed46e4..0b349f0b5a 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -38,7 +38,7 @@\n */\n struct BdrvDirtyBitmap {\n QemuMutex *mutex;\n- HBitmap *bitmap; /* Dirty sector bitmap implementation */\n+ HBitmap *bitmap; /* Dirty bitmap implementation */\n HBitmap *meta; /* Meta dirty bitmap */\n BdrvDirtyBitmap *successor; /* Anonymous child; implies frozen status */\n char *name; /* Optional non-empty unique ID */\n@@ -130,12 +130,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,\n }\n bitmap = g_new0(BdrvDirtyBitmap, 1);\n bitmap->mutex = &bs->dirty_bitmap_mutex;\n- /*\n- * TODO - let hbitmap track full granularity. For now, it is tracking\n- * only sector granularity, as a shortcut for our iterators.\n- */\n- bitmap->bitmap = hbitmap_alloc(DIV_ROUND_UP(bitmap_size, BDRV_SECTOR_SIZE),\n- ctz32(granularity) - BDRV_SECTOR_BITS);\n+ bitmap->bitmap = hbitmap_alloc(bitmap_size, ctz32(granularity));\n bitmap->size = bitmap_size;\n bitmap->name = g_strdup(name);\n bitmap->disabled = false;\n@@ -314,7 +309,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs)\n QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) {\n assert(!bdrv_dirty_bitmap_frozen(bitmap));\n assert(!bitmap->active_iterators);\n- hbitmap_truncate(bitmap->bitmap, DIV_ROUND_UP(size, BDRV_SECTOR_SIZE));\n+ hbitmap_truncate(bitmap->bitmap, size);\n bitmap->size = size;\n }\n bdrv_dirty_bitmaps_unlock(bs);\n@@ -444,7 +439,7 @@ bool bdrv_get_dirty_locked(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,\n int64_t offset)\n {\n if (bitmap) {\n- return hbitmap_get(bitmap->bitmap, offset >> BDRV_SECTOR_BITS);\n+ return hbitmap_get(bitmap->bitmap, offset);\n } else {\n return false;\n }\n@@ -472,7 +467,7 @@ uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs)\n\n uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap)\n {\n- return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap);\n+ return 1U << hbitmap_granularity(bitmap->bitmap);\n }\n\n BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap)\n@@ -505,19 +500,16 @@ void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter)\n\n int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)\n {\n- return hbitmap_iter_next(&iter->hbi) * BDRV_SECTOR_SIZE;\n+ return hbitmap_iter_next(&iter->hbi);\n }\n\n /* Called within bdrv_dirty_bitmap_lock..unlock */\n void bdrv_set_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n int64_t offset, int64_t bytes)\n {\n- int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n-\n assert(bdrv_dirty_bitmap_enabled(bitmap));\n assert(!bdrv_dirty_bitmap_readonly(bitmap));\n- hbitmap_set(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n- end_sector - (offset >> BDRV_SECTOR_BITS));\n+ hbitmap_set(bitmap->bitmap, offset, bytes);\n }\n\n void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n@@ -532,12 +524,9 @@ void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,\n int64_t offset, int64_t bytes)\n {\n- int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n-\n assert(bdrv_dirty_bitmap_enabled(bitmap));\n assert(!bdrv_dirty_bitmap_readonly(bitmap));\n- hbitmap_reset(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n- end_sector - (offset >> BDRV_SECTOR_BITS));\n+ hbitmap_reset(bitmap->bitmap, offset, bytes);\n }\n\n void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n@@ -557,8 +546,7 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out)\n hbitmap_reset_all(bitmap->bitmap);\n } else {\n HBitmap *backup = bitmap->bitmap;\n- bitmap->bitmap = hbitmap_alloc(DIV_ROUND_UP(bitmap->size,\n- BDRV_SECTOR_SIZE),\n+ bitmap->bitmap = hbitmap_alloc(bitmap->size,\n hbitmap_granularity(backup));\n *out = backup;\n }\n@@ -577,51 +565,40 @@ void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in)\n uint64_t bdrv_dirty_bitmap_serialization_size(const BdrvDirtyBitmap *bitmap,\n uint64_t offset, uint64_t bytes)\n {\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+ return hbitmap_serialization_size(bitmap->bitmap, offset, bytes);\n }\n\n uint64_t bdrv_dirty_bitmap_serialization_align(const BdrvDirtyBitmap *bitmap)\n {\n- return hbitmap_serialization_align(bitmap->bitmap) * BDRV_SECTOR_SIZE;\n+ return hbitmap_serialization_align(bitmap->bitmap);\n }\n\n void bdrv_dirty_bitmap_serialize_part(const BdrvDirtyBitmap *bitmap,\n uint8_t *buf, uint64_t offset,\n uint64_t bytes)\n {\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+ hbitmap_serialize_part(bitmap->bitmap, buf, offset, bytes);\n }\n\n void bdrv_dirty_bitmap_deserialize_part(BdrvDirtyBitmap *bitmap,\n uint8_t *buf, uint64_t offset,\n uint64_t bytes, bool finish)\n {\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+ hbitmap_deserialize_part(bitmap->bitmap, buf, offset, bytes, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_zeroes(BdrvDirtyBitmap *bitmap,\n uint64_t offset, uint64_t bytes,\n bool finish)\n {\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+ hbitmap_deserialize_zeroes(bitmap->bitmap, offset, bytes, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap,\n uint64_t offset, uint64_t bytes,\n bool finish)\n {\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+ hbitmap_deserialize_ones(bitmap->bitmap, offset, bytes, finish);\n }\n\n void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap)\n@@ -632,7 +609,6 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap)\n void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes)\n {\n BdrvDirtyBitmap *bitmap;\n- int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE);\n\n if (QLIST_EMPTY(&bs->dirty_bitmaps)) {\n return;\n@@ -644,8 +620,7 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes)\n continue;\n }\n assert(!bdrv_dirty_bitmap_readonly(bitmap));\n- hbitmap_set(bitmap->bitmap, offset >> BDRV_SECTOR_BITS,\n- end_sector - (offset >> BDRV_SECTOR_BITS));\n+ hbitmap_set(bitmap->bitmap, offset, bytes);\n }\n bdrv_dirty_bitmaps_unlock(bs);\n }\n@@ -655,12 +630,12 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes)\n */\n void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *iter, int64_t offset)\n {\n- hbitmap_iter_init(&iter->hbi, iter->hbi.hb, offset >> BDRV_SECTOR_BITS);\n+ hbitmap_iter_init(&iter->hbi, iter->hbi.hb, offset);\n }\n\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap)\n {\n- return hbitmap_count(bitmap->bitmap) << BDRV_SECTOR_BITS;\n+ return hbitmap_count(bitmap->bitmap);\n }\n\n int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap)\n","prefixes":["v6","18/18"]}