From patchwork Thu May 26 23:07:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Durgin X-Patchwork-Id: 822262 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4QNBxhr032544 for ; Thu, 26 May 2011 23:12:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758618Ab1EZXLy (ORCPT ); Thu, 26 May 2011 19:11:54 -0400 Received: from mail.hq.newdream.net ([66.33.206.127]:49527 "EHLO mail.hq.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758533Ab1EZXLw (ORCPT ); Thu, 26 May 2011 19:11:52 -0400 Received: from mail.hq.newdream.net (localhost [127.0.0.1]) by mail.hq.newdream.net (Postfix) with ESMTP id BCA7DC3B1; Thu, 26 May 2011 16:11:52 -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=bggk1IqWbDh8HYXFk3NhI1mWk9YlR0W8Zily7FFRPmS9CJM 51YZf4lEVbpQ7VVHYF7P1YDl5BbUkfnEYbP1s32Eu+ltdR4MjsOQbEghtIg/OMo9 ai2YVwuExci0LN8vhsmEeEkNIvfc/AXx/3W4itDlKqvAU+0wredy/sQIfhdA= 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=LyHYza8/VOYewB/l6b2Z5s1Pz3o=; b=k7rcMzvPboB6M1 MWbbFdlv6dL1awLqWoalkfeWAe6cfiP2KLQ5J7wEpqh1qngvC8AgqsZDFXMQdKUL LpgNfhlfh0BudK6q/rcxqrndeeb6TS0QA4ravR6WoN7LH+lUmQalQssgiHjaX20A 9zRizjD2fKDlNgeQBdl88PtJalWJc= 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 B8038C248; Thu, 26 May 2011 16:11:52 -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 v6 3/4] rbd: check return values when scheduling aio Date: Thu, 26 May 2011 16:07:33 -0700 Message-Id: <1306451254-25864-4-git-send-email-josh.durgin@dreamhost.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1306451254-25864-1-git-send-email-josh.durgin@dreamhost.com> References: <1306451254-25864-1-git-send-email-josh.durgin@dreamhost.com> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 26 May 2011 23:12:00 +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. Reviewed-by: Christian Brunner 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 edf1086..f4da6ab 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,