From patchwork Mon Nov 8 19:02:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 70449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 722B1B70FB for ; Tue, 9 Nov 2010 06:23:58 +1100 (EST) Received: from localhost ([127.0.0.1]:45782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PFXEx-0003Gt-Ej for incoming@patchwork.ozlabs.org; Mon, 08 Nov 2010 14:18:51 -0500 Received: from [140.186.70.92] (port=53314 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PFXAU-0000cV-HR for qemu-devel@nongnu.org; Mon, 08 Nov 2010 14:14:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PFXAB-0003NR-Rg for qemu-devel@nongnu.org; Mon, 08 Nov 2010 14:13:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PFXAB-0003Mb-K2 for qemu-devel@nongnu.org; Mon, 08 Nov 2010 14:13:55 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA8JDg8Y021027 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Nov 2010 14:13:42 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oA8JDecb004413; Mon, 8 Nov 2010 14:13:41 -0500 Received: from amt.cnet (vpn-11-126.rdu.redhat.com [10.11.11.126]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oA8JDdec011351; Mon, 8 Nov 2010 14:13:39 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id BFBE068A05F; Mon, 8 Nov 2010 17:13:12 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id oA8JDBGw009275; Mon, 8 Nov 2010 17:13:11 -0200 Message-Id: <20101108190918.138813908@redhat.com> User-Agent: quilt/0.47-1 Date: Mon, 08 Nov 2010 17:02:55 -0200 From: Marcelo Tosatti To: Liran Schour , Kevin Wolf References: <20101108190253.560821111@redhat.com> Content-Disposition: inline; filename=02-block-aio-write-dirty-bitmap X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Marcelo Tosatti , Yoshiaki Tamura , qemu-devel@nongnu.org Subject: [Qemu-devel] [patch 2/3] block: set sector dirty on AIO write completion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sectors are marked dirty in the bitmap on AIO submission. This is wrong since data has not reached storage. Set a given sector as dirty in the dirty bitmap on AIO completion, so that reading a sector marked as dirty is guaranteed to return uptodate data. Signed-off-by: Marcelo Tosatti Reviewed-by: Kevin Wolf Index: qemu-kvm/block.c =================================================================== --- qemu-kvm.orig/block.c +++ qemu-kvm/block.c @@ -2018,12 +2018,49 @@ BlockDriverAIOCB *bdrv_aio_readv(BlockDr return ret; } +typedef struct BlockCompleteData { + BlockDriverCompletionFunc *cb; + void *opaque; + BlockDriverState *bs; + int64_t sector_num; + int nb_sectors; +} BlockCompleteData; + +static void block_complete_cb(void *opaque, int ret) +{ + BlockCompleteData *b = opaque; + + if (b->bs->dirty_bitmap) { + set_dirty_bitmap(b->bs, b->sector_num, b->nb_sectors, 1); + } + b->cb(b->opaque, ret); + qemu_free(b); +} + +static BlockCompleteData *blk_dirty_cb_alloc(BlockDriverState *bs, + int64_t sector_num, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BlockCompleteData *blkdata = qemu_mallocz(sizeof(BlockCompleteData)); + + blkdata->bs = bs; + blkdata->cb = cb; + blkdata->opaque = opaque; + blkdata->sector_num = sector_num; + blkdata->nb_sectors = nb_sectors; + + return blkdata; +} + BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque) { BlockDriver *drv = bs->drv; BlockDriverAIOCB *ret; + BlockCompleteData *blk_cb_data; trace_bdrv_aio_writev(bs, sector_num, nb_sectors, opaque); @@ -2035,7 +2072,10 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockD return NULL; if (bs->dirty_bitmap) { - set_dirty_bitmap(bs, sector_num, nb_sectors, 1); + blk_cb_data = blk_dirty_cb_alloc(bs, sector_num, nb_sectors, cb, + opaque); + cb = &block_complete_cb; + opaque = blk_cb_data; } ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,