[PATCH] nvme-tcp: fix bogus request completion when failing to send AER

[Hannes Reinecke]

On 2/6/22 23:40, Sagi Grimberg wrote:
> AER is not backed by a real request, hence we should not incorrectly
> assume that when failing to send a nvme command, it is a normal request
> but rather check if this is an aer and if so complete the aer (similar
> to the normal completion path).
> 
> Cc: stable at vger.kernel.org
> Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
> ---
>   drivers/nvme/host/tcp.c | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 01e24b5703db..1096a0b0a268 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -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,
> +			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)
Reviewed-by: Hannes Reinecke <hare at suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		           Kernel Storage Architect
hare at suse.de			                  +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer