qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Christian Brunner <chb@muc.de>
To: Josh Durgin <josh.durgin@dreamhost.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
	ceph-devel@vger.kernel.org, qemu-devel@nongnu.org,
	kvm@vger.kernel.org
Subject: Re: [Qemu-devel] [PATCH v4 3/4] rbd: check return values when scheduling aio
Date: Wed, 25 May 2011 21:21:06 +0200	[thread overview]
Message-ID: <BANLkTik3u7XuMYiUN4PLFs90GEz+2Szu=Q@mail.gmail.com> (raw)
In-Reply-To: <1306263078-18089-4-git-send-email-josh.durgin@dreamhost.com>

We should not leave this out:

Reviewed-by: Christian Brunner <chb@muc.de>

2011/5/24 Josh Durgin <josh.durgin@dreamhost.com>:
> 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 <stefanha@gmail.com>
> Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
> ---
>  block/rbd.c |   24 ++++++++++++++++++++----
>  1 files changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/block/rbd.c b/block/rbd.c
> index ff74e8b..c9f32e4 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -580,10 +580,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);
> @@ -610,16 +614,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
>
>
>

  reply	other threads:[~2011-05-25 19:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-24 18:51 [Qemu-devel] [PATCH v4 0/4] rbd improvements Josh Durgin
2011-05-24 18:51 ` [Qemu-devel] [PATCH v4 1/4] rbd: use the higher level librbd instead of just librados Josh Durgin
2011-05-25 19:18   ` Christian Brunner
2011-05-25 20:46     ` Josh Durgin
2011-05-24 18:51 ` [Qemu-devel] [PATCH v4 2/4] rbd: allow configuration of rados from the rbd filename Josh Durgin
2011-05-25 19:19   ` Christian Brunner
2011-05-24 18:51 ` [Qemu-devel] [PATCH v4 3/4] rbd: check return values when scheduling aio Josh Durgin
2011-05-25 19:21   ` Christian Brunner [this message]
2011-05-24 18:51 ` [Qemu-devel] [PATCH v4 4/4] rbd: Add bdrv_truncate implementation Josh Durgin
2011-05-25 19:22   ` Christian Brunner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='BANLkTik3u7XuMYiUN4PLFs90GEz+2Szu=Q@mail.gmail.com' \
    --to=chb@muc.de \
    --cc=ceph-devel@vger.kernel.org \
    --cc=josh.durgin@dreamhost.com \
    --cc=kvm@vger.kernel.org \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).