Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/815106/?format=api
{ "id": 815106, "url": "http://patchwork.ozlabs.org/api/1.2/patches/815106/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-21-eblake@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.2/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170918185819.5984-21-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-18T18:58:19", "name": "[v8,20/20] dirty-bitmap: Convert internal hbitmap size/granularity", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d90b53607370a54bd1da1ed5e0fa2de9a1968019", "submitter": { "id": 6591, "url": "http://patchwork.ozlabs.org/api/1.2/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-21-eblake@redhat.com/mbox/", "series": [ { "id": 3711, "url": "http://patchwork.ozlabs.org/api/1.2/series/3711/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3711", "date": "2017-09-18T18:58:00", "name": "make dirty-bitmap byte-based", "version": 8, "mbox": "http://patchwork.ozlabs.org/series/3711/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815106/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815106/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx05.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 3xwwYt26ytz9s3T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 19 Sep 2017 05:10:09 +1000 (AEST)", "from localhost ([::1]:38416 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1du1Qk-0004Sj-Th\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 15:10:06 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:44810)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1du1GZ-0002wl-Ti\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:37 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1du1GY-0006wx-Br\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:35 -0400", "from mx1.redhat.com ([209.132.183.28]:52252)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1du1GT-0006t9-D4; Mon, 18 Sep 2017 14:59:29 -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 57C5D46287;\n\tMon, 18 Sep 2017 18:59:28 +0000 (UTC)", "from red.redhat.com (ovpn-124-97.rdu2.redhat.com [10.10.124.97])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 5BE045C1A3;\n\tMon, 18 Sep 2017 18:59:23 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 57C5D46287", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 18 Sep 2017 13:58:19 -0500", "Message-Id": "<20170918185819.5984-21-eblake@redhat.com>", "In-Reply-To": "<20170918185819.5984-1-eblake@redhat.com>", "References": "<20170918185819.5984-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.29]);\n\tMon, 18 Sep 2017 18:59:28 +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 v8 20/20] dirty-bitmap: Convert internal\n\thbitmap size/granularity", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "kwolf@redhat.com, vsementsov@virtuozzo.com, Fam Zheng <famz@redhat.com>, \n\tqemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>, jsnow@redhat.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "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 <eblake@redhat.com>\nReviewed-by: John Snow <jsnow@redhat.com>\n\n---\nv8: rebase to earlier truncate changes (R-b kept)\nv7: rebase to dirty_iter_next cleanup (no semantic change, R-b kept)\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 | 62 +++++++++++++++-------------------------------------\n 1 file changed, 18 insertions(+), 44 deletions(-)", "diff": "diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 58a3f330a9..bd04e991b1 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@@ -312,7 +307,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs, int64_t bytes)\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(bytes, BDRV_SECTOR_SIZE));\n+ hbitmap_truncate(bitmap->bitmap, bytes);\n bitmap->size = bytes;\n }\n bdrv_dirty_bitmaps_unlock(bs);\n@@ -442,7 +437,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@@ -470,7 +465,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@@ -503,20 +498,16 @@ void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter)\n\n int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)\n {\n- int64_t ret = hbitmap_iter_next(&iter->hbi);\n- return ret < 0 ? -1 : ret * 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@@ -531,12 +522,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@@ -556,8 +544,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@@ -576,51 +563,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@@ -631,7 +607,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@@ -643,8 +618,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@@ -654,12 +628,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": [ "v8", "20/20" ] }