[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefull
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefully |
Date: |
Tue, 30 Jun 2020 21:13:09 +0200 |
As nvme_create_queue_pair() is allowed to fail, replace the
alloc() calls by try_alloc() to avoid aborting QEMU.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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(BlockDriverState *bs,
int i, r;
BDRVNVMeState *s = bs->opaque;
Error *local_err = NULL;
- NVMeQueuePair *q = g_new0(NVMeQueuePair, 1);
+ NVMeQueuePair *q;
uint64_t prp_list_iova;
+ q = g_try_new0(NVMeQueuePair, 1);
+ if (!q) {
+ return NULL;
+ }
+ q->prp_list_pages = qemu_try_blockalign0(bs,
+ s->page_size * NVME_QUEUE_SIZE);
+ if (!q->prp_list_pages) {
+ goto fail;
+ }
qemu_mutex_init(&q->lock);
q->s = s;
q->index = idx;
qemu_co_queue_init(&q->free_req_queue);
- q->prp_list_pages = qemu_blockalign0(bs, s->page_size * NVME_NUM_REQS);
q->completion_bh = aio_bh_new(bdrv_get_aio_context(bs),
nvme_process_completion_bh, q);
r = qemu_vfio_dma_map(s->vfio, q->prp_list_pages,
--
2.21.3
- [PATCH v2 00/12] block/nvme: Various cleanups required to use multiple queues, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 01/12] block/nvme: Replace magic value by SCALE_MS definition, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 02/12] block/nvme: Avoid further processing if trace event not enabled, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 03/12] block/nvme: Let nvme_create_queue_pair() fail gracefully,
Philippe Mathieu-Daudé <=
- [PATCH v2 04/12] block/nvme: Define QUEUE_INDEX macros to ease code review, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 05/12] block/nvme: Rename local variable, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 09/12] block/nvme: Simplify nvme_init_queue() arguments, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 10/12] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 08/12] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz), Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 11/12] block/nvme: Simplify nvme_create_queue_pair() arguments, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 06/12] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 12/12] block/nvme: Use per-queue AIO context, Philippe Mathieu-Daudé, 2020/06/30
- [PATCH v2 07/12] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset, Philippe Mathieu-Daudé, 2020/06/30