From nobody Tue Feb 10 02:50:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593544587; cv=none; d=zohomail.com; s=zohoarc; b=HOq6uM0oQ5AZULhnKyr4KiRb9EDd/XhIJZSXaEnIr9KtUjajLJhXt85VyDAa52RUGMT9xQatA0PBD8zof3ncoiZRvNkqpYFeoX3tvAhAgoeOYm2zGj5usOdMp4PP+qdJDU0WScdtzAnY3Yjp/JNjwoTos/VuXR47Q7aHunSm88g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593544587; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KdE6JsIw8dAhfeVIz93JjPSKDmry/14DEkZ0JE7PkKI=; b=Ru+c/qi+583AJqSTzo8H6/0u1KErbqLmJgjq3e495lBxEG7qYSsjhsgv8gDqAWoRUHPIUdB8vXVKpPrfHsMnjf7ZZ4OPKUB13jfyO1m+ehUNztetTQh069s1Zb0chech8DefHKWRudU3KTQrmF3DvlQzODjaD5sudUSw6yyJAG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15935445867061013.3565967467949; Tue, 30 Jun 2020 12:16:26 -0700 (PDT) Received: from localhost ([::1]:53292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqLk0-0001ge-VT for importer@patchew.org; Tue, 30 Jun 2020 15:16:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqLhO-00068n-0x for qemu-devel@nongnu.org; Tue, 30 Jun 2020 15:13:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51489 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqLhM-0005We-IQ for qemu-devel@nongnu.org; Tue, 30 Jun 2020 15:13:41 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-dLk15A7RNcKnXnv2Qh9C4A-1; Tue, 30 Jun 2020 15:13:37 -0400 Received: by mail-wm1-f69.google.com with SMTP id f68so9848695wmf.1 for ; Tue, 30 Jun 2020 12:13:37 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p29sm4524114wmi.43.2020.06.30.12.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:13:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593544419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KdE6JsIw8dAhfeVIz93JjPSKDmry/14DEkZ0JE7PkKI=; b=YR4YaC1aE5u9Bf8s2zFxIQRmhcZ2yLhuXhqA75u4bDRedToyGafGASEFS9XkvCKb7Iwlff 5rSJ7aOZWU55nU/UoeYvdgFrdJCBPvjm9oYi6R4kK/jzKCyIalT7qZOuDnKlmQ4XH5kntJ IZ9e4+dY9cy4OImfKqnSIPls4bCW8Xc= X-MC-Unique: dLk15A7RNcKnXnv2Qh9C4A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KdE6JsIw8dAhfeVIz93JjPSKDmry/14DEkZ0JE7PkKI=; b=QSixNxp//kXSZugMz02iyBhMS/NJmZnMi/2Cj18o57yKJsywkxUd247Smoae9N7xYu GELcYdY1qjFBzqNT7chuGe8u3sWPwwlg2HumUBsIuZqQDcYhoUg06yck/5EW7a9vrxRn b17Idmp87DQcFXOfkittFbPzO9+PQ6LFqst33NNYlWMwUw4iGjbgB6dbLUKhNSm/a2sY EYf6iPu4dd2RM3OFuNsQxvCHFy7stQ1XTTyZPyxgrYzc7uEQK9rBVB8q0d75JNM7d6xk IxZZSL+h8Icql9EJcNLZnUVN9fb2w/EpOxfAdiTcEPr4Zj3PBV1P4ess3TFCqp6VySnB BA0w== X-Gm-Message-State: AOAM530LwmQPaYegNahmEXwRKIf8eppZWtzQ0gG7ARiwbv7C4lvSTQib MKgJ52Z/ZhUqX9+AYGy/cV43TTwqHxzLEjDzHoxQWLrfDTN2HJk6teosSWIr7A5DK+gh8plwd1z c1VST7ckzl50oYjI= X-Received: by 2002:adf:8168:: with SMTP id 95mr23392316wrm.104.1593544415496; Tue, 30 Jun 2020 12:13:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhGtkqbtq5kDafv1A2Eo+oeXUyQvOonJJ/uL4Ooy6GdcKDkFti91dhNzt9/l6aG6NaBC3gEQ== X-Received: by 2002:adf:8168:: with SMTP id 95mr23392299wrm.104.1593544415295; Tue, 30 Jun 2020 12:13:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefully Date: Tue, 30 Jun 2020 21:13:09 +0200 Message-Id: <20200630191318.30021-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630191318.30021-1-philmd@redhat.com> References: <20200630191318.30021-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/30 03:55:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Maxim Levitsky , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As nvme_create_queue_pair() is allowed to fail, replace the alloc() calls by try_alloc() to avoid aborting QEMU. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 8c30a5fee2..e1893b4e79 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -213,14 +213,22 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDri= verState *bs, int i, r; BDRVNVMeState *s =3D bs->opaque; Error *local_err =3D NULL; - NVMeQueuePair *q =3D g_new0(NVMeQueuePair, 1); + NVMeQueuePair *q; uint64_t prp_list_iova; =20 + q =3D g_try_new0(NVMeQueuePair, 1); + if (!q) { + return NULL; + } + q->prp_list_pages =3D qemu_try_blockalign0(bs, + s->page_size * NVME_QUEUE_SIZE); + if (!q->prp_list_pages) { + goto fail; + } qemu_mutex_init(&q->lock); q->s =3D s; q->index =3D idx; qemu_co_queue_init(&q->free_req_queue); - q->prp_list_pages =3D qemu_blockalign0(bs, s->page_size * NVME_NUM_REQ= S); q->completion_bh =3D aio_bh_new(bdrv_get_aio_context(bs), nvme_process_completion_bh, q); r =3D qemu_vfio_dma_map(s->vfio, q->prp_list_pages, --=20 2.21.3