From: "Jakub Jermář" <jakub.jermar@kernkonzept.com>
To: qemu-devel@nongnu.org
Cc: "Jakub Jermář" <jakub.jermar@kernkonzept.com>
Subject: [PATCH] hw/nvme: be more careful when deasserting IRQs
Date: Thu, 10 Jun 2021 13:46:24 +0200 [thread overview]
Message-ID: <20210610114624.304681-1-jakub.jermar@kernkonzept.com> (raw)
An IRQ vector used by a completion queue cannot be deasserted without
first checking if the same vector does not need to stay asserted for
some other completion queue.
Signed-off-by: Jakub Jermar <jakub.jermar@kernkonzept.com>
---
hw/nvme/ctrl.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 0bcaf7192f..c0980929eb 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -473,6 +473,21 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq)
}
}
+/*
+ * Check if the vector used by the cq can be deasserted, i.e. it needn't be
+ * asserted for some other cq.
+ */
+static bool nvme_irq_can_deassert(NvmeCtrl *n, NvmeCQueue *cq)
+{
+ for (unsigned qid = 0; qid < n->params.max_ioqpairs + 1; qid++) {
+ NvmeCQueue *q = n->cq[qid];
+
+ if (q && q->vector == cq->vector && q->head != q->tail)
+ return false; /* some queue needs this to stay asserted */
+ }
+ return true;
+}
+
static void nvme_req_clear(NvmeRequest *req)
{
req->ns = NULL;
@@ -4089,7 +4104,9 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeRequest *req)
trace_pci_nvme_err_invalid_del_cq_notempty(qid);
return NVME_INVALID_QUEUE_DEL;
}
- nvme_irq_deassert(n, cq);
+ if (nvme_irq_can_deassert(n, cq)) {
+ nvme_irq_deassert(n, cq);
+ }
trace_pci_nvme_del_cq(qid);
nvme_free_cq(cq, n);
return NVME_SUCCESS;
@@ -5757,7 +5774,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)
timer_mod(cq->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 500);
}
- if (cq->tail == cq->head) {
+ if (nvme_irq_can_deassert(n, cq)) {
nvme_irq_deassert(n, cq);
}
} else {
--
2.31.1
next reply other threads:[~2021-06-10 13:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 11:46 Jakub Jermář [this message]
2021-06-10 17:33 ` [PATCH] hw/nvme: be more careful when deasserting IRQs Klaus Jensen
2021-06-10 18:14 ` Klaus Jensen
2021-06-14 13:52 ` Jakub Jermář
2021-06-14 22:39 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610114624.304681-1-jakub.jermar@kernkonzept.com \
--to=jakub.jermar@kernkonzept.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).