From patchwork Wed May 25 20:34:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Durgin X-Patchwork-Id: 817582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4PKdVV0004908 for ; Wed, 25 May 2011 20:39:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755818Ab1EYUjU (ORCPT ); Wed, 25 May 2011 16:39:20 -0400 Received: from mail.hq.newdream.net ([66.33.206.127]:48235 "EHLO mail.hq.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755053Ab1EYUjR (ORCPT ); Wed, 25 May 2011 16:39:17 -0400 Received: from mail.hq.newdream.net (localhost [127.0.0.1]) by mail.hq.newdream.net (Postfix) with ESMTP id BD836C65B; Wed, 25 May 2011 13:39:17 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=dreamhost.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:to; q=dns; s= dreamhost.com; b=GDeXfunTmo2MSv/bBT+WUJPkO/JiARPA28PdAzYMMHnfqSn 2rLYu9g052RisepaeGbR9o7FGTrkFnaKjNkd1gwFD+vfu3JTT/WN2Uod5mqY0PqB iCO5jZnvKb20FIpYeKHj4GhX0V49vW8euGb8g+Swt5WnWO/zup6UBaeikLk4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=dreamhost.com; h=from:to :cc:subject:date:message-id:in-reply-to:references:to; s= dreamhost.com; bh=vZWM7PAlOLcAC6JqtTMfsMtNBTs=; b=Up7z2IL7G8kkz7 PppsSicXlRUGe2fT2SMVJBEmI7ZJA/Yp5aEargcHMbxEj1ixkhWT5wgGW8i2p4oY jOP1ZFxF+jqnkcxlwYt7duoh4Mce9hoZAw8trbaBAkJBgzyypKvJJoERhNwgnljd IYIDR894HDRit0S75QaPlzUBsFtJ8= Received: from pudgy.ops.newdream.net (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by mail.hq.newdream.net (Postfix) with ESMTP id A5B52C12E; Wed, 25 May 2011 13:39:17 -0700 (PDT) From: Josh Durgin To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: ceph-devel@vger.kernel.org, Kevin Wolf , Christian Brunner Subject: [PATCH v5 3/4] rbd: check return values when scheduling aio Date: Wed, 25 May 2011 13:34:46 -0700 Message-Id: <1306355687-4647-4-git-send-email-josh.durgin@dreamhost.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1306355687-4647-1-git-send-email-josh.durgin@dreamhost.com> References: <1306355687-4647-1-git-send-email-josh.durgin@dreamhost.com> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 25 May 2011 20:39:32 +0000 (UTC) If scheduling fails, the number of outstanding I/Os must be correct, or there will be a hang when waiting for everything to be flushed. Reported-by: Stefan Hajnoczi Signed-off-by: Josh Durgin --- block/rbd.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index d346a21..a44d160 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -581,10 +581,14 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs, rbd_completion_t c; int64_t off, size; char *buf; + int r; BDRVRBDState *s = bs->opaque; acb = qemu_aio_get(&rbd_aio_pool, bs, cb, opaque); + if (!acb) { + return NULL; + } acb->write = write; acb->qiov = qiov; acb->bounce = qemu_blockalign(bs, qiov->size); @@ -611,16 +615,28 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs, rcb->buf = buf; rcb->s = acb->s; rcb->size = size; + r = rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c); + if (r < 0) { + goto failed; + } if (write) { - rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c); - rbd_aio_write(s->image, off, size, buf, c); + r = rbd_aio_write(s->image, off, size, buf, c); } else { - rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c); - rbd_aio_read(s->image, off, size, buf, c); + r = rbd_aio_read(s->image, off, size, buf, c); + } + + if (r < 0) { + goto failed; } return &acb->common; + +failed: + qemu_free(rcb); + s->qemu_aio_count--; + qemu_aio_release(acb); + return NULL; } static BlockDriverAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs,