Commit 93e2c52d authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.17-2022-02-10' of git://git.infradead.org/nvme into block-5.17 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.17

 - nvme-tcp: fix bogus request completion when failing to send AER
   (Sagi Grimberg)
 - add the missing nvme_complete_req tracepoint for batched completion
   (Bean Huo)"

* tag 'nvme-5.17-2022-02-10' of git://git.infradead.org/nvme:
  nvme-tcp: fix bogus request completion when failing to send AER
  nvme: add nvme_complete_req tracepoint for batched completion
parents b13e0c71 63573807

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ EXPORT_SYMBOL_GPL(nvme_complete_rq); 


void nvme_complete_batch_req(struct request *req)

{

	trace_nvme_complete_rq(req);

	nvme_cleanup_cmd(req);

	nvme_end_req_zoned(req);

}

drivers/nvme/host/tcp.c

+9 −1
Original line number Diff line number Diff line
@@ -913,7 +913,15 @@ static inline void nvme_tcp_done_send_req(struct nvme_tcp_queue *queue) 


static void nvme_tcp_fail_request(struct nvme_tcp_request *req)

{

	nvme_tcp_end_request(blk_mq_rq_from_pdu(req), NVME_SC_HOST_PATH_ERROR);

	if (nvme_tcp_async_req(req)) {

		union nvme_result res = {};



		nvme_complete_async_event(&req->queue->ctrl->ctrl,

				cpu_to_le16(NVME_SC_HOST_PATH_ERROR), &res);

	} else {

		nvme_tcp_end_request(blk_mq_rq_from_pdu(req),

				NVME_SC_HOST_PATH_ERROR);

	}

}



static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)