From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPKrP-0004hx-K9 for qemu-devel@nongnu.org; Wed, 25 May 2011 16:39:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPKrO-0001Mh-CM for qemu-devel@nongnu.org; Wed, 25 May 2011 16:39:19 -0400 Received: from mail.hq.newdream.net ([66.33.206.127]:60308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPKrO-0001MW-5m for qemu-devel@nongnu.org; Wed, 25 May 2011 16:39:18 -0400 From: Josh Durgin Date: Wed, 25 May 2011 13:34:46 -0700 Message-Id: <1306355687-4647-4-git-send-email-josh.durgin@dreamhost.com> In-Reply-To: <1306355687-4647-1-git-send-email-josh.durgin@dreamhost.com> References: <1306355687-4647-1-git-send-email-josh.durgin@dreamhost.com> Subject: [Qemu-devel] [PATCH v5 3/4] rbd: check return values when scheduling aio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.orgkvm@vger.kernel.orgqemu-devel@nongnu.org Cc: Kevin Wolf , ceph-devel@vger.kernel.org, Christian Brunner 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, -- 1.7.2.3