From: Israel Rukshin <israelr@mellanox.com>

Date: Sun, 13 Oct 2019 19:57:31 +0300

Subject: [PATCH] nvme: introduce nvme_is_aen_req function

Git-commit: 58a8df67e057e979e76f8dc881766da3f7137f99

Patch-mainline: v5.5-rc1

References: bsc#1169045

This function improves code readability and reduces code duplication.

Signed-off-by: Israel Rukshin <israelr@mellanox.com>

Signed-off-by: Max Gurtovoy <maxg@mellanox.com>

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

Signed-off-by: Keith Busch <kbusch@kernel.org>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/host/nvme.h   | 5 +++++

 drivers/nvme/host/pci.c    | 3 +--

 drivers/nvme/host/rdma.c   | 4 ++--

 drivers/nvme/host/tcp.c    | 4 ++--

 drivers/nvme/target/loop.c | 4 ++--

 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h

index 38a83ef5bcd3..912f9500ed11 100644

--- a/drivers/nvme/host/nvme.h

+++ b/drivers/nvme/host/nvme.h

@@ -445,6 +445,11 @@ static inline void nvme_put_ctrl(struct nvme_ctrl *ctrl)

 	put_device(ctrl->device);

 }

+static inline bool nvme_is_aen_req(u16 qid, __u16 command_id)

+{

+	return !qid && command_id >= NVME_AQ_BLK_MQ_DEPTH;

+}

+

 void nvme_complete_rq(struct request *req);

 bool nvme_cancel_request(struct request *req, void *data, bool reserved);

 bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c

index bb88681f4dc3..7082116e9206 100644

--- a/drivers/nvme/host/pci.c

+++ b/drivers/nvme/host/pci.c

@@ -967,8 +967,7 @@ static inline void nvme_handle_cqe(struct nvme_queue *nvmeq, u16 idx)

 	 * aborts.  We don't even bother to allocate a struct request

 	 * for them but rather special case them here.

 	 */

-	if (unlikely(nvmeq->qid == 0 &&

-			cqe->command_id >= NVME_AQ_BLK_MQ_DEPTH)) {

+	if (unlikely(nvme_is_aen_req(nvmeq->qid, cqe->command_id))) {

 		nvme_complete_async_event(&nvmeq->dev->ctrl,

 				cqe->status, &cqe->result);

 		return;

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c

index 4d280160dd3f..154fa4e32ad8 100644

--- a/drivers/nvme/host/rdma.c

+++ b/drivers/nvme/host/rdma.c

@@ -1501,8 +1501,8 @@ static void nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc)

 	 * aborts.  We don't even bother to allocate a struct request

 	 * for them but rather special case them here.

 	 */

-	if (unlikely(nvme_rdma_queue_idx(queue) == 0 &&

-			cqe->command_id >= NVME_AQ_BLK_MQ_DEPTH))

+	if (unlikely(nvme_is_aen_req(nvme_rdma_queue_idx(queue),

+				     cqe->command_id)))

 		nvme_complete_async_event(&queue->ctrl->ctrl, cqe->status,

 				&cqe->result);

 	else

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c

index 385a5212c10f..124fda67613a 100644

--- a/drivers/nvme/host/tcp.c

+++ b/drivers/nvme/host/tcp.c

@@ -491,8 +491,8 @@ static int nvme_tcp_handle_comp(struct nvme_tcp_queue *queue,

 	 * aborts.  We don't even bother to allocate a struct request

 	 * for them but rather special case them here.

 	 */

-	if (unlikely(nvme_tcp_queue_id(queue) == 0 &&

-	    cqe->command_id >= NVME_AQ_BLK_MQ_DEPTH))

+	if (unlikely(nvme_is_aen_req(nvme_tcp_queue_id(queue),

+				     cqe->command_id)))

 		nvme_complete_async_event(&queue->ctrl->ctrl, cqe->status,

 				&cqe->result);

 	else

diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c

index 748a39fca771..bd1f81f97ab7 100644

--- a/drivers/nvme/target/loop.c

+++ b/drivers/nvme/target/loop.c

@@ -102,8 +102,8 @@ static void nvme_loop_queue_response(struct nvmet_req *req)

 	 * aborts.  We don't even bother to allocate a struct request

 	 * for them but rather special case them here.

 	 */

-	if (unlikely(nvme_loop_queue_idx(queue) == 0 &&

-			cqe->command_id >= NVME_AQ_BLK_MQ_DEPTH)) {

+	if (unlikely(nvme_is_aen_req(nvme_loop_queue_idx(queue),

+				     cqe->command_id))) {

 		nvme_complete_async_event(&queue->ctrl->ctrl, cqe->status,

 				&cqe->result);

 	} else {

-- 

2.16.4