Commit 58a8df67 authored by Israel Rukshin's avatar Israel Rukshin Committed by Jens Axboe
Browse files

nvme: introduce nvme_is_aen_req function 



This function improves code readability and reduces code duplication.

Signed-off-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bcde5f0f

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -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,

drivers/nvme/host/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/nvme/host/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/nvme/host/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/nvme/target/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE