From patchwork Tue Jul 24 11:04:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172841 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 91DA32C0091 for ; Tue, 24 Jul 2012 21:34:52 +1000 (EST) Received: from localhost ([::1]:37161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StdO6-0004bf-Lm for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 07:34:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcx0-0000Dt-7e for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:06:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stcwu-0005vk-2Z for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:06:50 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:59147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcwt-0005Rh-U6 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:06:43 -0400 Received: by mail-gh0-f173.google.com with SMTP id r14so6581704ghr.4 for ; Tue, 24 Jul 2012 04:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=I0nmikYzfGPzcRTZaAuXQtgRGXHfJuXEdQUgk9MEjjA=; b=soSnwInumQdD0+jcIHVadz7Pd270eWbaPznl7HgGxIW1edTR/JqELjC2PbYZhlF8Cd Bt/4T99mB8uFppCvpXlJ+JUhphaf7mBCVbGrVwApw0FVxe0cL1upcppBGQwmyGRy4SxV 4EmYKjHs3ZxGZ5kA6yv4NGcrwWTu4NehIwBFF56aV4X2M7oVxHti7sIGNihlQtlzVfgq KGCoTFN6mStB/9ggfrV7F/M7BlOPrhkspFCQb5Mmd4eQmu8h8+hwVYtiJGauAVe99U0Q FM2z6/iwhch5ak5kzRJQ8CpbLeWpMYSa6fNcaW1lAW5tQsRuC5b9PKx4aBOq0Smw+POI bzpA== Received: by 10.42.19.131 with SMTP id c3mr14417809icb.36.1343128003561; Tue, 24 Jul 2012 04:06:43 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id if4sm1752561igc.10.2012.07.24.04.06.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 04:06:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 13:04:20 +0200 Message-Id: <1343127865-16608-43-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> References: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Cc: kwolf@redhat.com, jcody@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 42/47] block: allow customizing the granularity of the dirty bitmap 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 Signed-off-by: Paolo Bonzini --- block-migration.c | 6 ++++-- block.c | 14 +++++++------- block.h | 5 +---- block/mirror.c | 14 ++++---------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/block-migration.c b/block-migration.c index 7ff188a..fa952e5 100644 --- a/block-migration.c +++ b/block-migration.c @@ -23,7 +23,8 @@ #include "blockdev.h" #include -#define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS) +#define BLOCK_SIZE (1 << 20) +#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLOCK_SIZE >> BDRV_SECTOR_BITS) #define BLK_MIG_FLAG_DEVICE_BLOCK 0x01 #define BLK_MIG_FLAG_EOS 0x02 @@ -264,7 +265,8 @@ static void set_dirty_tracking(int enable) BlkMigDevState *bmds; QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { - bdrv_set_dirty_tracking(bmds->bs, enable); + bdrv_set_dirty_tracking(bmds->bs, + enable ? BDRV_SECTORS_PER_DIRTY_CHUNK : 0); } } diff --git a/block.c b/block.c index f3dd2a7..972200f 100644 --- a/block.c +++ b/block.c @@ -3778,16 +3778,16 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size) return qemu_memalign((bs && bs->buffer_alignment) ? bs->buffer_alignment : 512, size); } -void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable) +void bdrv_set_dirty_tracking(BlockDriverState *bs, int granularity) { int64_t bitmap_size; - if (enable) { - if (!bs->dirty_bitmap) { - bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS); - bs->dirty_bitmap = hbitmap_alloc(bitmap_size, - BDRV_LOG_SECTORS_PER_DIRTY_CHUNK); - } + assert((granularity & (granularity - 1)) == 0); + + if (granularity) { + assert(!bs->dirty_bitmap); + bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS); + bs->dirty_bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1); } else { if (bs->dirty_bitmap) { hbitmap_free(bs->dirty_bitmap); diff --git a/block.h b/block.h index d0312a0..3513b24 100644 --- a/block.h +++ b/block.h @@ -328,11 +328,8 @@ int bdrv_img_create(const char *filename, const char *fmt, void bdrv_set_buffer_alignment(BlockDriverState *bs, int align); void *qemu_blockalign(BlockDriverState *bs, size_t size); -#define BDRV_SECTORS_PER_DIRTY_CHUNK (1 << BDRV_LOG_SECTORS_PER_DIRTY_CHUNK) -#define BDRV_LOG_SECTORS_PER_DIRTY_CHUNK 11 - struct HBitmapIter; -void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable); +void bdrv_set_dirty_tracking(BlockDriverState *bs, int granularity); int bdrv_get_dirty(BlockDriverState *bs, int64_t sector); void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); diff --git a/block/mirror.c b/block/mirror.c index 8d242ef..48ee963 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -17,14 +17,8 @@ #include "qemu/ratelimit.h" #include "bitmap.h" -enum { - /* - * Size of data buffer for populating the image file. This should be large - * enough to process multiple clusters in a single call, so that populating - * contiguous regions of the image is efficient. - */ - BLOCK_SIZE = 512 * BDRV_SECTORS_PER_DIRTY_CHUNK, /* in bytes */ -}; +#define BLOCK_SIZE (1 << 20) +#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLOCK_SIZE >> BDRV_SECTOR_BITS) #define SLICE_TIME 100000000ULL /* ns */ @@ -258,7 +252,7 @@ static void coroutine_fn mirror_run(void *opaque) immediate_exit: g_free(s->buf); g_free(s->cow_bitmap); - bdrv_set_dirty_tracking(bs, false); + bdrv_set_dirty_tracking(bs, 0); bdrv_iostatus_disable(s->target); if (s->complete && ret == 0) { bdrv_swap(s->target, s->common.bs); @@ -355,7 +349,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, s->mode = mode; s->buf_size = BLOCK_SIZE; - bdrv_set_dirty_tracking(bs, true); + bdrv_set_dirty_tracking(bs, BDRV_SECTORS_PER_DIRTY_CHUNK); bdrv_set_on_error(s->target, on_target_error, on_target_error); bdrv_iostatus_enable(s->target); s->common.co = qemu_coroutine_create(mirror_run);