From patchwork Wed Nov 23 11:47:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 127296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1611A1007D2 for ; Wed, 23 Nov 2011 23:40:11 +1100 (EST) Received: from localhost ([::1]:46409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBa9-0007Pg-PA for incoming@patchwork.ozlabs.org; Wed, 23 Nov 2011 07:05:41 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBZi-0004DC-8J for qemu-devel@nongnu.org; Wed, 23 Nov 2011 07:05:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTBK2-0002CR-Ky for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:49:13 -0500 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:50596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBK2-00023z-CI for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:49:02 -0500 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pANBm6cB017186 for ; Wed, 23 Nov 2011 11:48:06 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pANBm6Pi2584718 for ; Wed, 23 Nov 2011 11:48:06 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pANBm5fC000418 for ; Wed, 23 Nov 2011 04:48:05 -0700 Received: from localhost (sig-9-79-13-177.uk.ibm.com [9.79.13.177]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pANBm5Zj000393; Wed, 23 Nov 2011 04:48:05 -0700 From: Stefan Hajnoczi To: Date: Wed, 23 Nov 2011 11:47:55 +0000 Message-Id: <1322048878-26348-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1322048878-26348-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1322048878-26348-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.163 Cc: Kevin Wolf , Paolo Bonzini , Marcelo Tosatti , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v4 5/8] block: wait for overlapping requests 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 When copy-on-read is enabled it is necessary to wait for overlapping requests before issuing new requests. This prevents races between the copy-on-read and a write request. Signed-off-by: Stefan Hajnoczi --- block.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index c90880b..da7aaa2 100644 --- a/block.c +++ b/block.c @@ -1099,6 +1099,7 @@ struct BdrvTrackedRequest { int nb_sectors; bool is_write; QLIST_ENTRY(BdrvTrackedRequest) list; + CoQueue wait_queue; /* coroutines blocked on this request */ }; /** @@ -1109,6 +1110,7 @@ struct BdrvTrackedRequest { static void tracked_request_end(BdrvTrackedRequest *req) { QLIST_REMOVE(req, list); + qemu_co_queue_restart_all(&req->wait_queue); } /** @@ -1126,9 +1128,34 @@ static void tracked_request_begin(BdrvTrackedRequest *req, .is_write = is_write, }; + qemu_co_queue_init(&req->wait_queue); + QLIST_INSERT_HEAD(&bs->tracked_requests, req, list); } +static bool tracked_request_overlaps(BdrvTrackedRequest *req, + int64_t sector_num, int nb_sectors) { + return false; /* not yet implemented */ +} + +static void coroutine_fn wait_for_overlapping_requests(BlockDriverState *bs, + int64_t sector_num, int nb_sectors) +{ + BdrvTrackedRequest *req; + bool retry; + + do { + retry = false; + QLIST_FOREACH(req, &bs->tracked_requests, list) { + if (tracked_request_overlaps(req, sector_num, nb_sectors)) { + qemu_co_queue_wait(&req->wait_queue); + retry = true; + break; + } + } + } while (retry); +} + /* * Return values: * 0 - success @@ -1423,6 +1450,10 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, bdrv_io_limits_intercept(bs, false, nb_sectors); } + if (bs->copy_on_read) { + wait_for_overlapping_requests(bs, sector_num, nb_sectors); + } + tracked_request_begin(&req, bs, sector_num, nb_sectors, false); ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov); tracked_request_end(&req); @@ -1462,6 +1493,10 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, bdrv_io_limits_intercept(bs, true, nb_sectors); } + if (bs->copy_on_read) { + wait_for_overlapping_requests(bs, sector_num, nb_sectors); + } + tracked_request_begin(&req, bs, sector_num, nb_sectors, true); ret = drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov);