Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813051/?format=api
{ "id": 813051, "url": "http://patchwork.ozlabs.org/api/patches/813051/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912203119.24166-6-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-6-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-12T20:31:04", "name": "[v7,05/20] dirty-bitmap: Check for size query failure during truncate", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "28fe39820d99fc504e2939e628a16a0c489cd18f", "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-6-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/813051/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813051/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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx01.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 3xsGlG2Zx4z9sNw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 06:35:38 +1000 (AEST)", "from localhost ([::1]:38449 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 1drruC-00052i-EJ\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 16:35:36 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:39359)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqP-0001eM-VJ\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:31:43 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqO-0005b4-Pj\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:31:41 -0400", "from mx1.redhat.com ([209.132.183.28]:38376)\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 1drrqK-0005Uj-NC; Tue, 12 Sep 2017 16:31:36 -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 C62C381DED;\n\tTue, 12 Sep 2017 20:31:35 +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 5B9A55C6D7;\n\tTue, 12 Sep 2017 20:31:34 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com C62C381DED", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 15:31:04 -0500", "Message-Id": "<20170912203119.24166-6-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.25]);\n\tTue, 12 Sep 2017 20:31:35 +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 05/20] dirty-bitmap: Check for size query\n\tfailure during truncate", "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": "We've previously fixed several places where we failed to account\nfor possible errors from bdrv_nb_sectors(). Fix another one by\nmaking bdrv_dirty_bitmap_truncate() report the error rather then\nsilently resizing bitmaps to -1. Then adjust the sole caller\nbdrv_truncate() to both reduce the likelihood of failure (blindly\ncalling bdrv_dirty_bitmap_truncate() after refresh_total_sectors()\nfails was not nice) as well as propagate any actual failures.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv7: new patch [Kevin]\n---\n include/block/dirty-bitmap.h | 2 +-\n block.c | 19 ++++++++++++++-----\n block/dirty-bitmap.c | 12 ++++++++----\n 3 files changed, 23 insertions(+), 10 deletions(-)", "diff": "diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex 8fd842eac9..15101b59d5 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -83,7 +83,7 @@ int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter);\n void bdrv_set_dirty_iter(BdrvDirtyBitmapIter *hbi, int64_t sector_num);\n int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap);\n int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap);\n-void bdrv_dirty_bitmap_truncate(BlockDriverState *bs);\n+int bdrv_dirty_bitmap_truncate(BlockDriverState *bs);\n bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);\n bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);\n bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);\ndiff --git a/block.c b/block.c\nindex ee6a48976e..790dcce360 100644\n--- a/block.c\n+++ b/block.c\n@@ -3450,12 +3450,21 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc,\n assert(!(bs->open_flags & BDRV_O_INACTIVE));\n\n ret = drv->bdrv_truncate(bs, offset, prealloc, errp);\n- if (ret == 0) {\n- ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);\n- bdrv_dirty_bitmap_truncate(bs);\n- bdrv_parent_cb_resize(bs);\n- atomic_inc(&bs->write_gen);\n+ if (ret < 0) {\n+ return ret;\n }\n+ ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);\n+ if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Could not refresh total sector count\");\n+ return ret;\n+ }\n+ ret = bdrv_dirty_bitmap_truncate(bs);\n+ if (ret < 0) {\n+ error_setg_errno(errp, -ret, \"Could not refresh total sector count\");\n+ return ret;\n+ }\n+ bdrv_parent_cb_resize(bs);\n+ atomic_inc(&bs->write_gen);\n return ret;\n }\n\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 42a55e4a4b..52f7a399b2 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -1,7 +1,7 @@\n /*\n * Block Dirty Bitmap\n *\n- * Copyright (c) 2016 Red Hat. Inc\n+ * Copyright (c) 2016-2017 Red Hat. Inc\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n@@ -300,13 +300,16 @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap(BlockDriverState *bs,\n\n /**\n * Truncates _all_ bitmaps attached to a BDS.\n- * Called with BQL taken.\n+ * Called with BQL taken, returns -errno on failure.\n */\n-void bdrv_dirty_bitmap_truncate(BlockDriverState *bs)\n+int bdrv_dirty_bitmap_truncate(BlockDriverState *bs)\n {\n BdrvDirtyBitmap *bitmap;\n- uint64_t size = bdrv_nb_sectors(bs);\n+ int64_t size = bdrv_nb_sectors(bs);\n\n+ if (size < 0) {\n+ return size;\n+ }\n bdrv_dirty_bitmaps_lock(bs);\n QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) {\n assert(!bdrv_dirty_bitmap_frozen(bitmap));\n@@ -315,6 +318,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs)\n bitmap->size = size;\n }\n bdrv_dirty_bitmaps_unlock(bs);\n+ return 0;\n }\n\n static bool bdrv_dirty_bitmap_has_name(BdrvDirtyBitmap *bitmap)\n", "prefixes": [ "v7", "05/20" ] }