From: Sagi Grimberg <sagi@grimberg.me>
To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-rdma@vger.kernel.org, target-devel@vger.kernel.org
Subject: [PATCH rfc 02/10] nvme-pci: Add budget to __nvme_process_cq
Date: Thu, 9 Mar 2017 15:16:34 +0200 [thread overview]
Message-ID: <1489065402-14757-3-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1489065402-14757-1-git-send-email-sagi@grimberg.me>
Prepare to allow passing a batch size to nvme cq processing.
This patch does not change an functionality.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/pci.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d3f74fa40f26..4ed67f194cfd 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -716,14 +716,15 @@ static inline bool nvme_read_cqe(struct nvme_queue *nvmeq,
return false;
}
-static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
+static int __nvme_process_cq(struct nvme_queue *nvmeq, int budget, int *tag)
{
struct nvme_completion cqe;
int consumed = 0;
while (nvme_read_cqe(nvmeq, &cqe)) {
nvme_handle_cqe(nvmeq, &cqe);
- consumed++;
+ if (++consumed == budget)
+ break;
if (tag && *tag == cqe.command_id) {
*tag = -1;
@@ -741,7 +742,7 @@ static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
static int nvme_process_cq(struct nvme_queue *nvmeq)
{
- return __nvme_process_cq(nvmeq, NULL);
+ return __nvme_process_cq(nvmeq, INT_MAX, NULL);
}
static irqreturn_t nvme_irq(int irq, void *data)
@@ -772,7 +773,7 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag)
if (nvme_cqe_valid(nvmeq, nvmeq->cq_head, nvmeq->cq_phase)) {
spin_lock_irq(&nvmeq->q_lock);
- __nvme_process_cq(nvmeq, &tag);
+ __nvme_process_cq(nvmeq, INT_MAX, &tag);
spin_unlock_irq(&nvmeq->q_lock);
if (tag == -1)
--
2.7.4
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
WARNING: multiple messages have this Message-ID (diff)
From: Sagi Grimberg <sagi@grimberg.me>
To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-rdma@vger.kernel.org, target-devel@vger.kernel.org
Subject: [PATCH rfc 02/10] nvme-pci: Add budget to __nvme_process_cq
Date: Thu, 9 Mar 2017 15:16:34 +0200 [thread overview]
Message-ID: <1489065402-14757-3-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1489065402-14757-1-git-send-email-sagi@grimberg.me>
Prepare to allow passing a batch size to nvme cq processing.
This patch does not change an functionality.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/pci.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d3f74fa40f26..4ed67f194cfd 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -716,14 +716,15 @@ static inline bool nvme_read_cqe(struct nvme_queue *nvmeq,
return false;
}
-static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
+static int __nvme_process_cq(struct nvme_queue *nvmeq, int budget, int *tag)
{
struct nvme_completion cqe;
int consumed = 0;
while (nvme_read_cqe(nvmeq, &cqe)) {
nvme_handle_cqe(nvmeq, &cqe);
- consumed++;
+ if (++consumed == budget)
+ break;
if (tag && *tag == cqe.command_id) {
*tag = -1;
@@ -741,7 +742,7 @@ static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
static int nvme_process_cq(struct nvme_queue *nvmeq)
{
- return __nvme_process_cq(nvmeq, NULL);
+ return __nvme_process_cq(nvmeq, INT_MAX, NULL);
}
static irqreturn_t nvme_irq(int irq, void *data)
@@ -772,7 +773,7 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag)
if (nvme_cqe_valid(nvmeq, nvmeq->cq_head, nvmeq->cq_phase)) {
spin_lock_irq(&nvmeq->q_lock);
- __nvme_process_cq(nvmeq, &tag);
+ __nvme_process_cq(nvmeq, INT_MAX, &tag);
spin_unlock_irq(&nvmeq->q_lock);
if (tag == -1)
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH rfc 02/10] nvme-pci: Add budget to __nvme_process_cq
Date: Thu, 9 Mar 2017 15:16:34 +0200 [thread overview]
Message-ID: <1489065402-14757-3-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1489065402-14757-1-git-send-email-sagi@grimberg.me>
Prepare to allow passing a batch size to nvme cq processing.
This patch does not change an functionality.
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/pci.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d3f74fa40f26..4ed67f194cfd 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -716,14 +716,15 @@ static inline bool nvme_read_cqe(struct nvme_queue *nvmeq,
return false;
}
-static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
+static int __nvme_process_cq(struct nvme_queue *nvmeq, int budget, int *tag)
{
struct nvme_completion cqe;
int consumed = 0;
while (nvme_read_cqe(nvmeq, &cqe)) {
nvme_handle_cqe(nvmeq, &cqe);
- consumed++;
+ if (++consumed == budget)
+ break;
if (tag && *tag == cqe.command_id) {
*tag = -1;
@@ -741,7 +742,7 @@ static int __nvme_process_cq(struct nvme_queue *nvmeq, int *tag)
static int nvme_process_cq(struct nvme_queue *nvmeq)
{
- return __nvme_process_cq(nvmeq, NULL);
+ return __nvme_process_cq(nvmeq, INT_MAX, NULL);
}
static irqreturn_t nvme_irq(int irq, void *data)
@@ -772,7 +773,7 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag)
if (nvme_cqe_valid(nvmeq, nvmeq->cq_head, nvmeq->cq_phase)) {
spin_lock_irq(&nvmeq->q_lock);
- __nvme_process_cq(nvmeq, &tag);
+ __nvme_process_cq(nvmeq, INT_MAX, &tag);
spin_unlock_irq(&nvmeq->q_lock);
if (tag == -1)
--
2.7.4
next prev parent reply other threads:[~2017-03-09 13:16 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-09 13:16 [PATCH rfc 00/10] non selective polling block interface Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` [PATCH rfc 01/10] nvme-pci: Split __nvme_process_cq to poll and handle Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:57 ` Johannes Thumshirn
2017-03-09 13:57 ` Johannes Thumshirn
2017-03-09 13:57 ` Johannes Thumshirn
2017-03-22 19:07 ` Christoph Hellwig
2017-03-22 19:07 ` Christoph Hellwig
2017-03-22 19:07 ` Christoph Hellwig
2017-03-09 13:16 ` Sagi Grimberg [this message]
2017-03-09 13:16 ` [PATCH rfc 02/10] nvme-pci: Add budget to __nvme_process_cq Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:46 ` Johannes Thumshirn
2017-03-09 13:46 ` Johannes Thumshirn
2017-03-09 13:46 ` Johannes Thumshirn
2017-03-22 19:08 ` Christoph Hellwig
2017-03-22 19:08 ` Christoph Hellwig
2017-03-09 13:16 ` [PATCH rfc 03/10] nvme-pci: open-code polling logic in nvme_poll Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:56 ` Johannes Thumshirn
2017-03-09 13:56 ` Johannes Thumshirn
2017-03-09 13:56 ` Johannes Thumshirn
2017-03-22 19:09 ` Christoph Hellwig
2017-03-22 19:09 ` Christoph Hellwig
2017-03-22 19:09 ` Christoph Hellwig
2017-03-09 13:16 ` [PATCH rfc 04/10] block: Add a non-selective polling interface Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:44 ` Johannes Thumshirn
2017-03-09 13:44 ` Johannes Thumshirn
2017-03-09 13:44 ` Johannes Thumshirn
2017-03-10 3:04 ` Damien Le Moal
2017-03-10 3:04 ` Damien Le Moal
2017-03-13 8:26 ` Sagi Grimberg
2017-03-13 8:26 ` Sagi Grimberg
2017-03-09 16:25 ` Bart Van Assche
2017-03-09 16:25 ` Bart Van Assche
2017-03-09 16:25 ` Bart Van Assche
2017-03-13 8:15 ` Sagi Grimberg
2017-03-13 8:15 ` Sagi Grimberg
2017-03-14 21:21 ` Bart Van Assche
2017-03-14 21:21 ` Bart Van Assche
2017-03-14 21:21 ` Bart Van Assche
2017-03-09 13:16 ` [PATCH rfc 05/10] nvme-pci: Support blk_poll_batch Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` [PATCH rfc 06/10] IB/cq: Don't force IB_POLL_DIRECT poll context for ib_process_cq_direct Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 16:30 ` Bart Van Assche
2017-03-09 16:30 ` Bart Van Assche
2017-03-09 16:30 ` Bart Van Assche
2017-03-13 8:24 ` Sagi Grimberg
2017-03-13 8:24 ` Sagi Grimberg
2017-03-14 21:32 ` Bart Van Assche
2017-03-14 21:32 ` Bart Van Assche
2017-03-14 21:32 ` Bart Van Assche
2017-03-09 13:16 ` [PATCH rfc 07/10] nvme-rdma: Don't rearm the CQ when polling directly Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:52 ` Johannes Thumshirn
2017-03-09 13:52 ` Johannes Thumshirn
2017-03-09 13:52 ` Johannes Thumshirn
2017-03-09 13:16 ` [PATCH rfc 08/10] nvme-rdma: Support blk_poll_batch Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` [PATCH rfc 09/10] nvmet: Use non-selective polling Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:54 ` Johannes Thumshirn
2017-03-09 13:54 ` Johannes Thumshirn
2017-03-09 13:54 ` Johannes Thumshirn
2017-03-09 13:16 ` [PATCH rfc 10/10] target: " Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-09 13:16 ` Sagi Grimberg
2017-03-18 23:58 ` Nicholas A. Bellinger
2017-03-18 23:58 ` Nicholas A. Bellinger
2017-03-18 23:58 ` Nicholas A. Bellinger
2017-03-21 11:35 ` Sagi Grimberg
2017-03-21 11:35 ` Sagi Grimberg
2017-03-21 11:35 ` Sagi Grimberg
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=1489065402-14757-3-git-send-email-sagi@grimberg.me \
--to=sagi@grimberg.me \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=target-devel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.