From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPJdk-00022j-In for qemu-devel@nongnu.org; Wed, 25 May 2011 15:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPJdj-0003nA-M8 for qemu-devel@nongnu.org; Wed, 25 May 2011 15:21:08 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:44165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPJdj-0003n5-If for qemu-devel@nongnu.org; Wed, 25 May 2011 15:21:07 -0400 Received: by vxb37 with SMTP id 37so6930946vxb.4 for ; Wed, 25 May 2011 12:21:07 -0700 (PDT) MIME-Version: 1.0 Sender: c.m.brunner@gmail.com In-Reply-To: <1306263078-18089-4-git-send-email-josh.durgin@dreamhost.com> References: <1306263078-18089-1-git-send-email-josh.durgin@dreamhost.com> <1306263078-18089-4-git-send-email-josh.durgin@dreamhost.com> Date: Wed, 25 May 2011 21:21:06 +0200 Message-ID: From: Christian Brunner Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 3/4] rbd: check return values when scheduling aio Reply-To: chb@muc.de List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Josh Durgin Cc: Kevin Wolf , ceph-devel@vger.kernel.org, qemu-devel@nongnu.org, kvm@vger.kernel.org We should not leave this out: Reviewed-by: Christian Brunner 2011/5/24 Josh Durgin : > 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 > --- > =A0block/rbd.c | =A0 24 ++++++++++++++++++++---- > =A01 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(BlockDri= verState *bs, > =A0 =A0 rbd_completion_t c; > =A0 =A0 int64_t off, size; > =A0 =A0 char *buf; > + =A0 =A0int r; > > =A0 =A0 BDRVRBDState *s =3D bs->opaque; > > =A0 =A0 acb =3D qemu_aio_get(&rbd_aio_pool, bs, cb, opaque); > + =A0 =A0if (!acb) { > + =A0 =A0 =A0 =A0return NULL; > + =A0 =A0} > =A0 =A0 acb->write =3D write; > =A0 =A0 acb->qiov =3D qiov; > =A0 =A0 acb->bounce =3D qemu_blockalign(bs, qiov->size); > @@ -610,16 +614,28 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDri= verState *bs, > =A0 =A0 rcb->buf =3D buf; > =A0 =A0 rcb->s =3D acb->s; > =A0 =A0 rcb->size =3D size; > + =A0 =A0r =3D rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish= _aiocb, &c); > + =A0 =A0if (r < 0) { > + =A0 =A0 =A0 =A0goto failed; > + =A0 =A0} > > =A0 =A0 if (write) { > - =A0 =A0 =A0 =A0rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_fini= sh_aiocb, &c); > - =A0 =A0 =A0 =A0rbd_aio_write(s->image, off, size, buf, c); > + =A0 =A0 =A0 =A0r =3D rbd_aio_write(s->image, off, size, buf, c); > =A0 =A0 } else { > - =A0 =A0 =A0 =A0rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_fini= sh_aiocb, &c); > - =A0 =A0 =A0 =A0rbd_aio_read(s->image, off, size, buf, c); > + =A0 =A0 =A0 =A0r =3D rbd_aio_read(s->image, off, size, buf, c); > + =A0 =A0} > + > + =A0 =A0if (r < 0) { > + =A0 =A0 =A0 =A0goto failed; > =A0 =A0 } > > =A0 =A0 return &acb->common; > + > +failed: > + =A0 =A0qemu_free(rcb); > + =A0 =A0s->qemu_aio_count--; > + =A0 =A0qemu_aio_release(acb); > + =A0 =A0return NULL; > =A0} > > =A0static BlockDriverAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs, > -- > 1.7.2.3 > > >