From patchwork Fri Sep 21 22:28:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 10611103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4944112B for ; Fri, 21 Sep 2018 22:33:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B56772D796 for ; Fri, 21 Sep 2018 22:33:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A98102D79F; Fri, 21 Sep 2018 22:33:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 619302D796 for ; Fri, 21 Sep 2018 22:33:25 +0000 (UTC) Received: from localhost ([::1]:57641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3TzI-0002yD-K2 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 21 Sep 2018 18:33:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3TvD-0008IS-Sm for qemu-devel@nongnu.org; Fri, 21 Sep 2018 18:29:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g3TvD-0005KQ-6P for qemu-devel@nongnu.org; Fri, 21 Sep 2018 18:29:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g3Tv8-0005CQ-DB; Fri, 21 Sep 2018 18:29:06 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B892C5277D; Fri, 21 Sep 2018 22:29:05 +0000 (UTC) Received: from probe.redhat.com (ovpn-121-77.rdu2.redhat.com [10.10.121.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17CC41073033; Fri, 21 Sep 2018 22:29:02 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 21 Sep 2018 18:28:44 -0400 Message-Id: <20180921222847.1012-4-jsnow@redhat.com> In-Reply-To: <20180921222847.1012-1-jsnow@redhat.com> References: <20180921222847.1012-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 21 Sep 2018 22:29:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH v2 3/6] bitmaps: prohibit merge on locked bitmaps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Fam Zheng , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Like frozen, "qmp locked" bitmaps must not be modified by the user. Signed-off-by: John Snow --- block/dirty-bitmap.c | 1 + blockdev.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 5c8a7bbf6f..216baec388 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -798,6 +798,7 @@ void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap *src, qemu_mutex_lock(dest->mutex); assert(!bdrv_dirty_bitmap_frozen(dest)); + assert(!bdrv_dirty_bitmap_qmp_locked(dest)); assert(!bdrv_dirty_bitmap_readonly(dest)); if (!hbitmap_merge(dest->bitmap, src->bitmap)) { diff --git a/blockdev.c b/blockdev.c index bb8d75c832..b21e635c68 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2955,6 +2955,10 @@ void qmp_x_block_dirty_bitmap_merge(const char *node, const char *dst_name, error_setg(errp, "Bitmap '%s' is readonly and cannot be modified", dst_name); return; + } else if (bdrv_dirty_bitmap_qmp_locked(dst)) { + error_setg(errp, "Bitmap '%s' is in-use by an operation " + "and cannot be modified", dst_name); + return; } src = bdrv_find_dirty_bitmap(bs, src_name);