From nobody Mon Feb 9 06:34:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502118616867351.35691622951765; Mon, 7 Aug 2017 08:10:16 -0700 (PDT) Received: from localhost ([::1]:37802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejfb-000374-F4 for importer@patchew.org; Mon, 07 Aug 2017 11:10:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJE-0007YI-Vi for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejIz-00042s-B2 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIY-0003dw-5e; Mon, 07 Aug 2017 10:46:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03D3CDB946; Mon, 7 Aug 2017 14:46:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C9AD9521A; Mon, 7 Aug 2017 14:46:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AEB181133050; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 03D3CDB946 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Aug 2017 16:45:52 +0200 Message-Id: <1502117160-24655-49-git-send-email-armbru@redhat.com> In-Reply-To: <1502117160-24655-1-git-send-email-armbru@redhat.com> References: <1502117160-24655-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 07 Aug 2017 14:46:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 48/56] block: Make mirror buffer size unsigned in QAPI/QMP 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: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, jcody@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Byte counts should use QAPI type 'size' (uint64_t). Parameter @buf-size of drive-mirror and blockdev-mirror is 'int' (int64_t). The underlying MirrorBlockJob abstraction takes size_t. mirror_start_job() converts from int64_t to size_t, rejecting negative sizes (but not values exceeding SIZE_MAX). Change the two parameters to 'size', and lift the (fixed) check and the conversion into blockdev_mirror_common(). Signed-off-by: Markus Armbruster --- block/mirror.c | 11 +++-------- blockdev.c | 9 +++++++-- include/block/block_int.h | 2 +- qapi/block-core.json | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index f1adda5..f9a5416 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -333,7 +333,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlo= ckJob *s) int nb_chunks =3D 1; int sectors_per_chunk =3D s->granularity >> BDRV_SECTOR_BITS; bool write_zeroes_ok =3D bdrv_can_write_zeroes_with_unmap(blk_bs(s->ta= rget)); - int max_io_bytes =3D MAX(s->buf_size / MAX_IN_FLIGHT, MAX_IO_BYTES); + unsigned max_io_bytes =3D MAX(s->buf_size / MAX_IN_FLIGHT, MAX_IO_BYTE= S); =20 bdrv_dirty_bitmap_lock(s->dirty_bitmap); offset =3D bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE; @@ -1120,7 +1120,7 @@ static BlockDriver bdrv_mirror_top =3D { static void mirror_start_job(const char *job_id, BlockDriverState *bs, int creation_flags, BlockDriverState *target, const char *replaces, uint64_t speed, - uint64_t granularity, int64_t buf_size, + uint64_t granularity, size_t buf_size, BlockMirrorBackingMode backing_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, @@ -1147,11 +1147,6 @@ static void mirror_start_job(const char *job_id, Blo= ckDriverState *bs, /* Granularity must be large enough for sector-based dirty bitmap */ assert(granularity >=3D BDRV_SECTOR_SIZE); =20 - if (buf_size < 0) { - error_setg(errp, "Invalid parameter 'buf-size'"); - return; - } - if (buf_size =3D=3D 0) { buf_size =3D DEFAULT_MIRROR_BUF_SIZE; } @@ -1283,7 +1278,7 @@ fail: =20 void mirror_start(const char *job_id, BlockDriverState *bs, BlockDriverState *target, const char *replaces, - uint64_t speed, uint64_t granularity, int64_t buf_size, + uint64_t speed, uint64_t granularity, size_t buf_size, MirrorSyncMode mode, BlockMirrorBackingMode backing_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, diff --git a/blockdev.c b/blockdev.c index 7feed7a..ba1a960 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3403,7 +3403,7 @@ static void blockdev_mirror_common(const char *job_id= , BlockDriverState *bs, BlockMirrorBackingMode backing_mode, bool has_speed, uint64_t speed, bool has_granularity, uint64_t granular= ity, - bool has_buf_size, int64_t buf_size, + bool has_buf_size, uint64_t buf_size, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, @@ -3447,6 +3447,11 @@ static void blockdev_mirror_common(const char *job_i= d, BlockDriverState *bs, return; } =20 + if (buf_size > SIZE_MAX) { + error_setg(errp, "Parameter 'buf-size' is too large"); + return; + } + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) { return; } @@ -3619,7 +3624,7 @@ void qmp_blockdev_mirror(bool has_job_id, const char = *job_id, MirrorSyncMode sync, bool has_speed, uint64_t speed, bool has_granularity, uint64_t granularity, - bool has_buf_size, int64_t buf_size, + bool has_buf_size, uint64_t buf_size, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, diff --git a/include/block/block_int.h b/include/block/block_int.h index 75116e5..8bde408 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -897,7 +897,7 @@ void commit_active_start(const char *job_id, BlockDrive= rState *bs, */ void mirror_start(const char *job_id, BlockDriverState *bs, BlockDriverState *target, const char *replaces, - uint64_t speed, uint64_t granularity, int64_t buf_size, + uint64_t speed, uint64_t granularity, size_t buf_size, MirrorSyncMode mode, BlockMirrorBackingMode backing_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, diff --git a/qapi/block-core.json b/qapi/block-core.json index b8442f3..51caee9 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1534,7 +1534,7 @@ '*format': 'str', '*node-name': 'str', '*replaces': 'str', 'sync': 'MirrorSyncMode', '*mode': 'NewImageMode', '*speed': 'size', '*granularity': 'size', - '*buf-size': 'int', '*on-source-error': 'BlockdevOnError', + '*buf-size': 'size', '*on-source-error': 'BlockdevOnError', '*on-target-error': 'BlockdevOnError', '*unmap': 'bool' } } =20 @@ -1733,7 +1733,7 @@ '*replaces': 'str', 'sync': 'MirrorSyncMode', '*speed': 'size', '*granularity': 'size', - '*buf-size': 'int', '*on-source-error': 'BlockdevOnError', + '*buf-size': 'size', '*on-source-error': 'BlockdevOnError', '*on-target-error': 'BlockdevOnError', '*filter-node-name': 'str' } } =20 --=20 2.7.5