From patchwork Thu Oct 18 14:49:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192341 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 E121B2C0081 for ; Fri, 19 Oct 2012 01:50:57 +1100 (EST) Received: from localhost ([::1]:50592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrR2-0007mg-1b for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 10:50:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrQb-0007Qs-53 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOrQS-0007no-6x for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:28 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:57775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrQR-0007mI-Vz for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:20 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so3522376dad.4 for ; Thu, 18 Oct 2012 07:50:13 -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=YE7h/AQ49vMaXlHP/pmMzesNJ1l9aWUGqawqWFuU68o=; b=rU0dqhROa/sRaL6kpYj0xu2BOVV/tIMuf4HrJN/oVbWt61/l7vY3V4irMIi6kQ+d/x 9QVSmMXzkPMf1d8uT6Iw9Y4n63VOhxbVXtJQCRRuOtHsrqE9RRQLfqCROv9ARbVDpCi8 yJ+Zde60duP5KVepDQY2SL66OEdRQsSRdKCagsuQ29U2YFbSVob+3UALQoOYRobjIVju YNtioMjJqB8EJLhUAX4xUvfbTnPRjF5Gvyvj91nooWI01NYGtoI3VSR44cbFsTdhWdyv 3ZZMHwCcwJLE1bGDBkwDFnc/xh1LrTeXOTQNTe8D8KYjeh+Kh+hl+h3+3W43vWB4Ocie 3sAg== Received: by 10.66.87.105 with SMTP id w9mr60309390paz.5.1350571813517; Thu, 18 Oct 2012 07:50:13 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id qb2sm14348236pbb.15.2012.10.18.07.50.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 07:50:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 16:49:18 +0200 Message-Id: <1350571770-9836-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350571770-9836-1-git-send-email-pbonzini@redhat.com> References: <1350571770-9836-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.210.45 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v3 04/16] block: introduce new dirty bitmap functionality 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 Assert that write_compressed is never used with the dirty bitmap. Setting the bits early is wrong, because a coroutine might concurrently examine them and copy incomplete data from the source. Signed-off-by: Paolo Bonzini --- block.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ block.h | 5 +++-- 2 file modificati, 48 inserzioni(+), 8 rimozioni(-) diff --git a/block.c b/block.c index 4787312..057b2b2 100644 --- a/block.c +++ b/block.c @@ -2389,7 +2389,7 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, } if (bs->dirty_bitmap) { - set_dirty_bitmap(bs, sector_num, nb_sectors, 1); + bdrv_set_dirty(bs, sector_num, nb_sectors); } if (bs->wr_highest_sector < sector_num + nb_sectors - 1) { @@ -2958,9 +2958,7 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, if (bdrv_check_request(bs, sector_num, nb_sectors)) return -EIO; - if (bs->dirty_bitmap) { - set_dirty_bitmap(bs, sector_num, nb_sectors, 1); - } + assert(!bs->dirty_bitmap); return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors); } @@ -4219,13 +4217,54 @@ int bdrv_get_dirty(BlockDriverState *bs, int64_t sector) if (bs->dirty_bitmap && (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bs)) { - return !!(bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] & - (1UL << (chunk % (sizeof(unsigned long) * 8)))); + return !!(bs->dirty_bitmap[chunk / BITS_PER_LONG] & + (1UL << (chunk % BITS_PER_LONG))); } else { return 0; } } +int64_t bdrv_get_next_dirty(BlockDriverState *bs, int64_t sector) +{ + int64_t chunk; + int bit, elem; + + /* Avoid an infinite loop. */ + assert(bs->dirty_count > 0); + + sector = (sector | (BDRV_SECTORS_PER_DIRTY_CHUNK - 1)) + 1; + chunk = sector / (int64_t)BDRV_SECTORS_PER_DIRTY_CHUNK; + + QEMU_BUILD_BUG_ON(sizeof(bs->dirty_bitmap[0]) * 8 != BITS_PER_LONG); + elem = chunk / BITS_PER_LONG; + bit = chunk % BITS_PER_LONG; + for (;;) { + if (sector >= bs->total_sectors) { + sector = 0; + bit = elem = 0; + } + if (bit == 0 && bs->dirty_bitmap[elem] == 0) { + sector += BDRV_SECTORS_PER_DIRTY_CHUNK * BITS_PER_LONG; + elem++; + } else { + if (bs->dirty_bitmap[elem] & (1UL << bit)) { + return sector; + } + sector += BDRV_SECTORS_PER_DIRTY_CHUNK; + if (++bit == BITS_PER_LONG) { + bit = 0; + elem++; + } + } + } +} + +void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, + int nr_sectors) +{ + set_dirty_bitmap(bs, cur_sector, nr_sectors, 1); +} + void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors) { diff --git a/block.h b/block.h index 096fa09..27b8f80 100644 --- a/block.h +++ b/block.h @@ -353,8 +353,9 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size); void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable); int bdrv_get_dirty(BlockDriverState *bs, int64_t sector); -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, - int nr_sectors); +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); +int64_t bdrv_get_next_dirty(BlockDriverState *bs, int64_t sector); int64_t bdrv_get_dirty_count(BlockDriverState *bs); void bdrv_enable_copy_on_read(BlockDriverState *bs);