From patchwork Wed Jul 15 02:26:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 495377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 452A61402C9 for ; Wed, 15 Jul 2015 12:29:01 +1000 (AEST) Received: from localhost ([::1]:33552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFCRP-0005gT-1H for incoming@patchwork.ozlabs.org; Tue, 14 Jul 2015 22:28:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFCPg-0002L7-Mj for qemu-devel@nongnu.org; Tue, 14 Jul 2015 22:27:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFCPf-0001DG-Qw for qemu-devel@nongnu.org; Tue, 14 Jul 2015 22:27:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFCPd-00019I-La; Tue, 14 Jul 2015 22:27:09 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 576853CA17A; Wed, 15 Jul 2015 02:27:09 +0000 (UTC) Received: from localhost (ovpn-112-22.phx2.redhat.com [10.3.112.22]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6F2R7ci027427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Tue, 14 Jul 2015 22:27:08 -0400 From: Jeff Cody To: qemu-block@nongnu.org Date: Tue, 14 Jul 2015 22:26:56 -0400 Message-Id: <1436927217-383-5-git-send-email-jcody@redhat.com> In-Reply-To: <1436927217-383-1-git-send-email-jcody@redhat.com> References: <1436927217-383-1-git-send-email-jcody@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: jcody@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL for-2.4 4/5] mirror: correct buf_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wen Congyang If bus_size is less than 0, the command fails. If buf_size is 0, use DEFAULT_MIRROR_BUF_SIZE. If buf_size % granularity is not 0, mirror_free_init() will do dangerous things. Signed-off-by: Wen Congyang Reviewed-by: Fam Zheng Message-id: 5555A588.3080907@cn.fujitsu.com Signed-off-by: Jeff Cody --- block/mirror.c | 11 ++++++++++- blockdev.c | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index a2700ca..323f747 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -20,6 +20,7 @@ #define SLICE_TIME 100000000ULL /* ns */ #define MAX_IN_FLIGHT 16 +#define DEFAULT_MIRROR_BUF_SIZE (10 << 20) /* The mirroring buffer is a list of granularity-sized chunks. * Free chunks are organized in a list. @@ -701,6 +702,14 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, return; } + if (buf_size < 0) { + error_setg(errp, "Invalid parameter 'buf-size'"); + return; + } + + if (buf_size == 0) { + buf_size = DEFAULT_MIRROR_BUF_SIZE; + } s = block_job_create(driver, bs, speed, cb, opaque, errp); if (!s) { @@ -714,7 +723,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, s->is_none_mode = is_none_mode; s->base = base; s->granularity = granularity; - s->buf_size = MAX(buf_size, granularity); + s->buf_size = ROUND_UP(buf_size, granularity); s->unmap = unmap; s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); diff --git a/blockdev.c b/blockdev.c index 50421c8..62a4586 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2639,8 +2639,6 @@ out: aio_context_release(aio_context); } -#define DEFAULT_MIRROR_BUF_SIZE (10 << 20) - void qmp_drive_mirror(const char *device, const char *target, bool has_format, const char *format, bool has_node_name, const char *node_name, @@ -2682,7 +2680,7 @@ void qmp_drive_mirror(const char *device, const char *target, granularity = 0; } if (!has_buf_size) { - buf_size = DEFAULT_MIRROR_BUF_SIZE; + buf_size = 0; } if (!has_unmap) { unmap = true;