{"id":807908,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807908/?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-14-eblake@redhat.com>","date":"2017-08-30T21:05:37","name":"[v6,13/18] mirror: Switch mirror_dirty_init() to byte-based iteration","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5ddedf55157665b1537207fa2f96bf7acfb7828b","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-14-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/807908/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 3xjJNx0gCJz9sN5\n\tfor ;\n\tThu, 31 Aug 2017 07:22:09 +1000 (AEST)","from localhost ([::1]:52776 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAR5-0001c5-4C\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:22:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37118)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABv-00044F-Gf\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABu-0007ht-A6\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:27 -0400","from mx1.redhat.com ([209.132.183.28]:40418)\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 1dnABr-0007fl-Mf; Wed, 30 Aug 2017 17:06:23 -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 AC9B6C04B958;\n\tWed, 30 Aug 2017 21:06:22 +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 5E0939816D;\n\tWed, 30 Aug 2017 21:06:18 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com AC9B6C04B958","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:37 -0500","Message-Id":"<20170830210542.2153-14-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:22 +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 13/18] mirror: Switch mirror_dirty_init() to\n\tbyte-based iteration","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, qemu-block@nongnu.org,\n\tJeff Cody , Max Reitz ,\n\tjsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Now that we have adjusted the majority of the calls this function\nmakes to be byte-based, it is easier to read the code if it makes\npasses over the image using bytes rather than sectors.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv6: no change\nv5: rebase to earlier changes\nv2-v4: no change\n---\n block/mirror.c | 38 ++++++++++++++------------------------\n 1 file changed, 14 insertions(+), 24 deletions(-)","diff":"diff --git a/block/mirror.c b/block/mirror.c\nindex 18172a56a3..87d9857475 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -613,15 +613,13 @@ static void mirror_throttle(MirrorBlockJob *s)\n\n static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n {\n- int64_t sector_num, end;\n+ int64_t offset;\n BlockDriverState *base = s->base;\n BlockDriverState *bs = s->source;\n BlockDriverState *target_bs = blk_bs(s->target);\n- int ret, n;\n+ int ret;\n int64_t count;\n\n- end = s->bdev_length / BDRV_SECTOR_SIZE;\n-\n if (base == NULL && !bdrv_has_zero_init(target_bs)) {\n if (!bdrv_can_write_zeroes_with_unmap(target_bs)) {\n bdrv_set_dirty_bitmap(s->dirty_bitmap, 0, s->bdev_length);\n@@ -629,9 +627,9 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n }\n\n s->initial_zeroing_ongoing = true;\n- for (sector_num = 0; sector_num < end; ) {\n- int nb_sectors = MIN(end - sector_num,\n- QEMU_ALIGN_DOWN(INT_MAX, s->granularity) >> BDRV_SECTOR_BITS);\n+ for (offset = 0; offset < s->bdev_length; ) {\n+ int bytes = MIN(s->bdev_length - offset,\n+ QEMU_ALIGN_DOWN(INT_MAX, s->granularity));\n\n mirror_throttle(s);\n\n@@ -647,9 +645,8 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n continue;\n }\n\n- mirror_do_zero_or_discard(s, sector_num * BDRV_SECTOR_SIZE,\n- nb_sectors * BDRV_SECTOR_SIZE, false);\n- sector_num += nb_sectors;\n+ mirror_do_zero_or_discard(s, offset, bytes, false);\n+ offset += bytes;\n }\n\n mirror_wait_for_all_io(s);\n@@ -657,10 +654,10 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n }\n\n /* First part, loop on the sectors and initialize the dirty bitmap. */\n- for (sector_num = 0; sector_num < end; ) {\n+ for (offset = 0; offset < s->bdev_length; ) {\n /* Just to make sure we are not exceeding int limit. */\n- int nb_sectors = MIN(INT_MAX >> BDRV_SECTOR_BITS,\n- end - sector_num);\n+ int bytes = MIN(s->bdev_length - offset,\n+ QEMU_ALIGN_DOWN(INT_MAX, s->granularity));\n\n mirror_throttle(s);\n\n@@ -668,23 +665,16 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n return 0;\n }\n\n- ret = bdrv_is_allocated_above(bs, base, sector_num * BDRV_SECTOR_SIZE,\n- nb_sectors * BDRV_SECTOR_SIZE, &count);\n+ ret = bdrv_is_allocated_above(bs, base, offset, bytes, &count);\n if (ret < 0) {\n return ret;\n }\n\n- /* TODO: Relax this once bdrv_is_allocated_above and dirty\n- * bitmaps no longer require sector alignment. */\n- assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE));\n- n = count >> BDRV_SECTOR_BITS;\n- assert(n > 0);\n+ assert(count);\n if (ret == 1) {\n- bdrv_set_dirty_bitmap(s->dirty_bitmap,\n- sector_num * BDRV_SECTOR_SIZE,\n- n * BDRV_SECTOR_SIZE);\n+ bdrv_set_dirty_bitmap(s->dirty_bitmap, offset, count);\n }\n- sector_num += n;\n+ offset += count;\n }\n return 0;\n }\n","prefixes":["v6","13/18"]}