Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813067/?format=api
{ "id": 813067, "url": "http://patchwork.ozlabs.org/api/patches/813067/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912203119.24166-16-eblake@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/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": "<20170912203119.24166-16-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-12T20:31:14", "name": "[v7,15/20] 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/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912203119.24166-16-eblake@redhat.com/mbox/", "series": [ { "id": 2770, "url": "http://patchwork.ozlabs.org/api/series/2770/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2770", "date": "2017-09-12T20:31:00", "name": "make dirty-bitmap byte-based", "version": 7, "mbox": "http://patchwork.ozlabs.org/series/2770/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/813067/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813067/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx10.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 3xsGzJ604Yz9sPk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 06:46:04 +1000 (AEST)", "from localhost ([::1]:38528 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 1drs4J-0008A9-0N\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 16:46:03 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:39771)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqu-00027W-QV\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:32:13 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqt-0006Oy-TC\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:32:12 -0400", "from mx1.redhat.com ([209.132.183.28]:39184)\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 1drrqp-0006I9-OV; Tue, 12 Sep 2017 16:32:07 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 C35D05D689;\n\tTue, 12 Sep 2017 20:32:06 +0000 (UTC)", "from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D82B860466;\n\tTue, 12 Sep 2017 20:32:02 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com C35D05D689", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 15:31:14 -0500", "Message-Id": "<20170912203119.24166-16-eblake@redhat.com>", "In-Reply-To": "<20170912203119.24166-1-eblake@redhat.com>", "References": "<20170912203119.24166-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tTue, 12 Sep 2017 20:32:06 +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 v7 15/20] 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": "<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, qemu-block@nongnu.org,\n\tJeff Cody <jcody@redhat.com>, Max Reitz <mreitz@redhat.com>,\n\tjsnow@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 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 <eblake@redhat.com>\nReviewed-by: John Snow <jsnow@redhat.com>\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 c2f73c91c5..5cdaaed7be 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -612,15 +612,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@@ -628,9 +626,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@@ -646,9 +644,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@@ -656,10 +653,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@@ -667,23 +664,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": [ "v7", "15/20" ] }