From: Keith Busch <kbusch@kernel.org>
To: linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me
Cc: Keith Busch <kbusch@kernel.org>, bijan.mottahedeh@oracle.com
Subject: [PATCHv2 3/3] nvme-pci: Simplify nvme_poll_irqdisable
Date: Wed, 4 Mar 2020 10:12:46 -0800 [thread overview]
Message-ID: <20200304181246.481835-4-kbusch@kernel.org> (raw)
In-Reply-To: <20200304181246.481835-1-kbusch@kernel.org>
The timeout handler can use the existing nvme_poll() if it needs to
check a polled queue, allowing nvme_poll_irqdisable() to handle only
irq driven queues for the remaining callers.
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
drivers/nvme/host/pci.c | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 02f22c63adcf..227e2aed7e08 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1020,35 +1020,20 @@ static irqreturn_t nvme_irq_check(int irq, void *data)
}
/*
- * Poll for completions any queue, including those not dedicated to polling.
+ * Poll for completions for any interrupt driven queue
* Can be called from any context.
*/
-static int nvme_poll_irqdisable(struct nvme_queue *nvmeq)
+static void nvme_poll_irqdisable(struct nvme_queue *nvmeq)
{
struct pci_dev *pdev = to_pci_dev(nvmeq->dev->dev);
- int found;
- /*
- * For a poll queue we need to protect against the polling thread
- * using the CQ lock. For normal interrupt driven threads we have
- * to disable the interrupt to avoid racing with it.
- */
- if (test_bit(NVMEQ_POLLED, &nvmeq->flags)) {
- spin_lock(&nvmeq->cq_poll_lock);
- found = nvme_process_cq(nvmeq);
- spin_unlock(&nvmeq->cq_poll_lock);
- } else {
- disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
- found = nvme_process_cq(nvmeq);
- enable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
- }
-
- return found;
+ disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
+ nvme_process_cq(nvmeq);
+ enable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));
}
-static int nvme_poll(struct blk_mq_hw_ctx *hctx)
+static int __nvme_poll(struct nvme_queue *nvmeq)
{
- struct nvme_queue *nvmeq = hctx->driver_data;
bool found;
if (!nvme_cqe_pending(nvmeq))
@@ -1061,6 +1046,11 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx)
return found;
}
+static int nvme_poll(struct blk_mq_hw_ctx *hctx)
+{
+ return __nvme_poll(hctx->driver_data);
+}
+
static void nvme_pci_submit_async_event(struct nvme_ctrl *ctrl)
{
struct nvme_dev *dev = to_nvme_dev(ctrl);
@@ -1232,7 +1222,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
/*
* Did we miss an interrupt?
*/
- nvme_poll_irqdisable(nvmeq);
+ if (!test_bit(NVMEQ_POLLED, &nvmeq->flags))
+ nvme_poll_irqdisable(nvmeq);
+ else
+ __nvme_poll(nvmeq);
+
if (blk_mq_request_completed(req)) {
dev_warn(dev->ctrl.device,
"I/O %d QID %d timeout, completion polled\n",
--
2.24.1
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-03-04 18:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 18:12 [PATCHv2 0/3] nvme-pci: process cq improvements Keith Busch
2020-03-04 18:12 ` [PATCHv2 1/3] nvme-pci: Remove tag from process cq Keith Busch
2020-03-05 20:53 ` Sagi Grimberg
2020-03-10 16:56 ` Christoph Hellwig
2020-03-04 18:12 ` [PATCHv2 2/3] nvme-pci: Remove two-pass completions Keith Busch
2020-03-05 9:50 ` Dongli Zhang
2020-03-05 15:15 ` Keith Busch
2020-03-05 20:53 ` Sagi Grimberg
2020-03-10 16:57 ` Christoph Hellwig
2020-03-04 18:12 ` Keith Busch [this message]
2020-03-05 20:55 ` [PATCHv2 3/3] nvme-pci: Simplify nvme_poll_irqdisable Sagi Grimberg
2020-03-10 17:02 ` Christoph Hellwig
2020-03-10 19:16 ` Keith Busch
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=20200304181246.481835-4-kbusch@kernel.org \
--to=kbusch@kernel.org \
--cc=bijan.mottahedeh@oracle.com \
--cc=hch@lst.de \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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 NNTP newsgroup(s).