From patchwork Tue Jun 24 15:36:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 363532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 227A6140087 for ; Wed, 25 Jun 2014 02:37:46 +1000 (EST) Received: from localhost ([::1]:60445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzSyA-0004RJ-UF for incoming@patchwork.ozlabs.org; Tue, 24 Jun 2014 11:49:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzSn6-0007PO-6U for qemu-devel@nongnu.org; Tue, 24 Jun 2014 11:37:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzSmy-0000Ai-KW for qemu-devel@nongnu.org; Tue, 24 Jun 2014 11:37:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzSmy-0000AP-DY for qemu-devel@nongnu.org; Tue, 24 Jun 2014 11:37:40 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5OFbawY023264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jun 2014 11:37:37 -0400 Received: from noname.redhat.com (ovpn-116-75.ams2.redhat.com [10.36.116.75]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5OFb5Gt000684; Tue, 24 Jun 2014 11:37:34 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Tue, 24 Jun 2014 17:36:57 +0200 Message-Id: <1403624224-2084-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1403624224-2084-1-git-send-email-kwolf@redhat.com> References: <1403624224-2084-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, benoit.canet@irqsave.net, maxa@catit.be, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v4 15/21] rbd: Handle failure for potentially large allocations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 2b797d3..4459102 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -617,7 +617,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; @@ -631,7 +631,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;