[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/15] hw/nvme: Update the initalization place for the AER queue
From: |
Klaus Jensen |
Subject: |
[PULL 11/15] hw/nvme: Update the initalization place for the AER queue |
Date: |
Thu, 23 Jun 2022 23:34:38 +0200 |
From: Łukasz Gieryk <lukasz.gieryk@linux.intel.com>
This patch updates the initialization place for the AER queue, so it’s
initialized once, at controller initialization, and not every time
controller is enabled.
While the original version works for a non-SR-IOV device, as it’s hard
to interact with the controller if it’s not enabled, the multiple
reinitialization is not necessarily correct.
With the SR/IOV feature enabled a segfault can happen: a VF can have its
controller disabled, while a namespace can still be attached to the
controller through the parent PF. An event generated in such case ends
up on an uninitialized queue.
While it’s an interesting question whether a VF should support AER in
the first place, I don’t think it must be answered today.
Signed-off-by: Łukasz Gieryk <lukasz.gieryk@linux.intel.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ctrl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 20f1a7399592..658584d417fe 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -6328,8 +6328,6 @@ static int nvme_start_ctrl(NvmeCtrl *n)
nvme_set_timestamp(n, 0ULL);
- QTAILQ_INIT(&n->aer_queue);
-
nvme_select_iocs(n);
return 0;
@@ -6989,6 +6987,7 @@ static void nvme_init_state(NvmeCtrl *n)
n->features.temp_thresh_hi = NVME_TEMPERATURE_WARNING;
n->starttime_ms = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL);
n->aer_reqs = g_new0(NvmeRequest *, n->params.aerl + 1);
+ QTAILQ_INIT(&n->aer_queue);
list->numcntl = cpu_to_le16(max_vfs);
for (i = 0; i < max_vfs; i++) {
--
2.36.1
- [PULL 00/15] hw/nvme updates, Klaus Jensen, 2022/06/23
- [PULL 01/15] hw/nvme: Add support for SR-IOV, Klaus Jensen, 2022/06/23
- [PULL 02/15] hw/nvme: Add support for Primary Controller Capabilities, Klaus Jensen, 2022/06/23
- [PULL 03/15] hw/nvme: Add support for Secondary Controller List, Klaus Jensen, 2022/06/23
- [PULL 04/15] hw/nvme: Implement the Function Level Reset, Klaus Jensen, 2022/06/23
- [PULL 05/15] hw/nvme: Make max_ioqpairs and msix_qsize configurable in runtime, Klaus Jensen, 2022/06/23
- [PULL 06/15] hw/nvme: Remove reg_size variable and update BAR0 size calculation, Klaus Jensen, 2022/06/23
- [PULL 07/15] hw/nvme: Calculate BAR attributes in a function, Klaus Jensen, 2022/06/23
- [PULL 08/15] hw/nvme: Initialize capability structures for primary/secondary controllers, Klaus Jensen, 2022/06/23
- [PULL 09/15] hw/nvme: Add support for the Virtualization Management command, Klaus Jensen, 2022/06/23
- [PULL 11/15] hw/nvme: Update the initalization place for the AER queue,
Klaus Jensen <=
- [PULL 10/15] docs: Add documentation for SR-IOV and Virtualization Enhancements, Klaus Jensen, 2022/06/23
- [PULL 12/15] hw/acpi: Make the PCI hot-plug aware of SR-IOV, Klaus Jensen, 2022/06/23
- [PULL 13/15] hw/nvme: clean up CC register write logic, Klaus Jensen, 2022/06/23
- [PULL 14/15] Revert "hw/block/nvme: add support for sgl bit bucket descriptor", Klaus Jensen, 2022/06/23
- [PULL 15/15] hw/nvme: clear aen mask on reset, Klaus Jensen, 2022/06/23
- Re: [PULL 00/15] hw/nvme updates, Richard Henderson, 2022/06/23