[PATCH 0/3] update request retries (loop, rdma, fc)

[PATCH 0/3] update request retries (loop, rdma, fc)

[Sagi Grimberg]

Keep a consistent behavior with what's checked in the core which
does not requeue if we exhausted nvme_max_retries.

Sagi Grimberg (3):
  nvme-rdma: increment request retries counter before requeuing
  nvme-loop:  increment request retries counter before requeuing
  nvme-fc:  increment request retries counter before requeuing

 drivers/nvme/host/fc.c     | 1 +
 drivers/nvme/host/rdma.c   | 1 +
 drivers/nvme/target/loop.c | 1 +
 3 files changed, 3 insertions(+)

-- 
2.7.4

[PATCH 1/3] nvme-rdma: increment request retries counter before requeuing

[Sagi Grimberg]

This way our max retry limit holds as well.

Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
 drivers/nvme/host/rdma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index a92791c485d1..c8f703e68d73 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1526,6 +1526,7 @@ static void nvme_rdma_complete_rq(struct request *rq)
 
 	if (unlikely(rq->errors)) {
 		if (nvme_req_needs_retry(rq, rq->errors)) {
+			rq->retries++;
 			nvme_requeue_req(rq);
 			return;
 		}
-- 
2.7.4

[PATCH 1/3] nvme-rdma: increment request retries counter before requeuing

[Max Gurtovoy]

On 3/29/2017 9:00 PM, Sagi Grimberg wrote:
> This way our max retry limit holds as well.
>
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
> ---


Looks good

Reviewed-by: Max Gurtovoy <maxg at mellanox.com>

[PATCH 2/3] nvme-loop: increment request retries counter before requeuing

[Sagi Grimberg]

This way our max retry limit holds as well.

Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
 drivers/nvme/target/loop.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index 227a5320879e..6a54e387379e 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -98,6 +98,7 @@ static void nvme_loop_complete_rq(struct request *req)
 
 	if (unlikely(req->errors)) {
 		if (nvme_req_needs_retry(req, req->errors)) {
+			req->retries++;
 			nvme_requeue_req(req);
 			return;
 		}
-- 
2.7.4

[PATCH 2/3] nvme-loop: increment request retries counter before requeuing

[Max Gurtovoy]

On 3/29/2017 9:00 PM, Sagi Grimberg wrote:
> This way our max retry limit holds as well.
>
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
> ---

Looks good

Reviewed-by: Max Gurtovoy <maxg at mellanox.com>

[PATCH 3/3] nvme-fc: increment request retries counter before requeuing

[Sagi Grimberg]

This way our max retry limit holds as well.

Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
 drivers/nvme/host/fc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 331ae9f8924d..2987f5ecd496 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1935,6 +1935,7 @@ nvme_fc_complete_rq(struct request *rq)
 
 	if (unlikely(rq->errors)) {
 		if (nvme_req_needs_retry(rq, rq->errors)) {
+			rq->retries++;
 			nvme_requeue_req(rq);
 			return;
 		}
-- 
2.7.4

[PATCH 3/3] nvme-fc: increment request retries counter before requeuing

[Max Gurtovoy]

On 3/29/2017 9:00 PM, Sagi Grimberg wrote:
> This way our max retry limit holds as well.
>
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>


Looks good

Reviewed-by: Max Gurtovoy <maxg at mellanox.com>

[PATCH 0/3] update request retries (loop, rdma, fc)

[Christoph Hellwig]

On Wed, Mar 29, 2017@09:00:24PM +0300, Sagi Grimberg wrote:
> Keep a consistent behavior with what's checked in the core which
> does not requeue if we exhausted nvme_max_retries.

Looks fine:

Reviewed-by: Christoph Hellwig <hch at lst.de>

But we really need to move this to common code.  I'll send a series
to do that, but it will be on top of your series.