From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroVB-0005nn-H5 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WroV5-0002hn-D3 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17342) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WroV5-0002hf-56 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 09:11:35 -0400 From: Kevin Wolf Date: Tue, 3 Jun 2014 15:10:56 +0200 Message-Id: <1401801062-9154-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1401801062-9154-1-git-send-email-kwolf@redhat.com> References: <1401801062-9154-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 15/21] rbd: Handle failure for potentially large allocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com Some code in the block layer makes potentially huge allocations. Failure is not completely unexpected there, so avoid aborting qemu and handle out-of-memory situations gracefully. This patch addresses the allocations in the rbd block driver. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/rbd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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(BlockDriverState *bs, RBDAIOCmd cmd) { RBDAIOCB *acb; - RADOSCB *rcb; + RADOSCB *rcb = NULL; rbd_completion_t c; int64_t off, size; char *buf; @@ -637,7 +637,10 @@ static BlockDriverAIOCB *rbd_start_aio(BlockDriverState *bs, if (cmd == RBD_AIO_DISCARD || cmd == RBD_AIO_FLUSH) { acb->bounce = NULL; } else { - acb->bounce = qemu_blockalign(bs, qiov->size); + acb->bounce = qemu_try_blockalign(bs, qiov->size); + if (acb->bounce == NULL) { + goto failed; + } } acb->ret = 0; acb->error = 0; -- 1.8.3.1