[PATCH 4/5] nvme: return NVME_SC_ABORT_QUEUE for cancelled commands

[Daniel Wagner]

On Wed, Jan 27, 2021 at 11:30:31AM +0100, Hannes Reinecke wrote:
> A request will be cancelled when a queue is deleted, so we should
> be returning a status of NVME_SC_ABORT_QUEUE.

I think this patch should be spitted as it does two different
things.

> Signed-off-by: Hannes Reinecke <hare at suse.de>
> ---
>  drivers/nvme/host/core.c | 2 +-
>  drivers/nvme/host/fc.c   | 9 ++++++---
>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 4a5059472625..1f723b7e9efb 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -364,7 +364,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
>       if (blk_mq_request_completed(req))
>               return true;
>
> -     nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
> +     nvme_req(req)->status = NVME_SC_ABORT_QUEUE;
>       nvme_req(req)->flags |= NVME_REQ_CANCELLED;
>       blk_mq_complete_request(req);
>       return true;

The commit message describes this part of the change.

> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 97e3424c7b03..86395b66310d 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -1955,9 +1955,12 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req)
>       fc_dma_sync_single_for_cpu(ctrl->lport->dev, op->fcp_req.rspdma,
>                               sizeof(op->rsp_iu), DMA_FROM_DEVICE);
>
> -     if (opstate == FCPOP_STATE_ABORTED)
> -             status = cpu_to_le16(NVME_SC_HOST_ABORTED_CMD << 1);
> -     else if (freq->status) {
> +     if (opstate == FCPOP_STATE_ABORTED) {
> +             if (op->nreq.flags & NVME_REQ_CANCELLED)
> +                     status = cpu_to_le16(NVME_SC_ABORT_QUEUE << 1);
> +             else
> +                     status = cpu_to_le16(NVME_SC_HOST_ABORTED_CMD << 1);
> +     } else if (freq->status) {

IMO, this part is not explained in the commit message.