[PATCH v2] nvme: fix error-handling for io_uring nvme-passthrough

[Niklas Cassel]

On Thu, Oct 19, 2023 at 12:54:30AM +0530, Kanchan Joshi wrote:
> From: Anuj Gupta <anuj20.g at samsung.com>
> 
> Driver may return an error before submitting the command to the device.
> Ensure that such error is propagated up.
> 
> Fixes: 456cba386e94 ("nvme: wire-up uring-cmd support for io-passthru on char-device.")
> Signed-off-by: Anuj Gupta <anuj20.g at samsung.com>
> Signed-off-by: Kanchan Joshi <joshi.k at samsung.com>
> ---
> Changes since v1:
> - Coding and comment style change (Niklas)
> 
>  drivers/nvme/host/ioctl.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
> index d8ff796fd5f2..92273a5a2202 100644
> --- a/drivers/nvme/host/ioctl.c
> +++ b/drivers/nvme/host/ioctl.c
> @@ -506,10 +506,13 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
>  	struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd);
>  
>  	req->bio = pdu->bio;
> -	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
> +	if (nvme_req(req)->flags & NVME_REQ_CANCELLED) {
>  		pdu->nvme_status = -EINTR;
> -	else
> +	} else {
>  		pdu->nvme_status = nvme_req(req)->status;
> +		if (!pdu->nvme_status)
> +			pdu->nvme_status = blk_status_to_errno(err);
> +	}
>  	pdu->u.result = le64_to_cpu(nvme_req(req)->result.u64);
>  
>  	/*
> -- 
> 2.25.1
> 

Reviewed-by: Niklas Cassel <niklas.cassel at wdc.com>