From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsZEw-0008Pm-Nx for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsZEo-0003c4-MO for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:06:00 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:46248 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsZEo-0003bu-FK for qemu-devel@nongnu.org; Thu, 05 Jun 2014 11:05:54 -0400 Date: Thu, 5 Jun 2014 17:05:54 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140605150553.GC6430@irqsave.net> References: <1401975393-7255-1-git-send-email-kwolf@redhat.com> <1401975393-7255-16-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1401975393-7255-16-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 15/21] rbd: Handle failure for potentially large allocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: benoit.canet@irqsave.net, qemu-devel@nongnu.org, stefanha@redhat.com The Thursday 05 Jun 2014 =E0 15:36:27 (+0200), Kevin Wolf wrote : > Some code in the block layer makes potentially huge allocations. Failur= e > is not completely unexpected there, so avoid aborting qemu and handle > out-of-memory situations gracefully. >=20 > This patch addresses the allocations in the rbd block driver. >=20 > Signed-off-by: Kevin Wolf > Reviewed-by: Stefan Hajnoczi > --- > block/rbd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) >=20 > diff --git a/block/rbd.c b/block/rbd.c > index 09af484..d0b2329 100644 > --- a/block/rbd.c > +++ b/block/rbd.c > @@ -623,7 +623,7 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverS= tate *bs, > RBDAIOCmd cmd) > { > RBDAIOCB *acb; > - RADOSCB *rcb; > + RADOSCB *rcb =3D NULL; > rbd_completion_t c; > int64_t off, size; > char *buf; > @@ -637,7 +637,10 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriver= State *bs, > if (cmd =3D=3D RBD_AIO_DISCARD || cmd =3D=3D RBD_AIO_FLUSH) { > acb->bounce =3D NULL; > } else { > - acb->bounce =3D qemu_blockalign(bs, qiov->size); > + acb->bounce =3D qemu_try_blockalign(bs, qiov->size); > + if (acb->bounce =3D=3D NULL) { > + goto failed; > + } > } > acb->ret =3D 0; > acb->error =3D 0; > --=20 > 1.8.3.1 >=20 >=20 Reviewed-by: Benoit Canet