Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B150C433E0 for ; Thu, 25 Feb 2021 10:56:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D20F364EFA for ; Thu, 25 Feb 2021 10:56:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D20F364EFA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HaqD+4XI30sqYNOGS6+PaT7ug0Wsl5Yzwd2wZTTSS74=; b=D6sHHI1CgksAg6MkjKlsDrvOI if532f/ulaUfHutvMMVdJwpqbe9BdzPuL1c6B57kVGNnMoauZqYwZf/A5RonH/w7nIolrlvI8E2XF rLqNA+QA3dtPKnakwTiP18CcT2SMtZuTGT/SYtsEYfwOkQaJCyYiCBBP81NFHT6seBTKFa4tWrMCJ FfM61hwX4wkjnHA4d4spmUptLkEj42YCZJBwQY78UZcKQzMsWNZCD/tB63uQCvS6pQKsZWRZhBdLd GLboTrVi/oADupvm2T7yBHUlJ2CFjjlYssPqFCxdyaB/VrTQTF/KFGKNUYEStfR/njLxyVdke1BYB hPMLe+s+w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFEJF-0005NW-Fg; Thu, 25 Feb 2021 10:55:53 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFEJ6-0005L4-HE for linux-nvme@lists.infradead.org; Thu, 25 Feb 2021 10:55:46 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 065E9ADE5; Thu, 25 Feb 2021 10:55:41 +0000 (UTC) From: Hannes Reinecke To: Christoph Hellwig Subject: [PATCH 5/6] nvme: return NVME_SC_ABORT_QUEUE for cancelled commands Date: Thu, 25 Feb 2021 11:55:26 +0100 Message-Id: <20210225105527.75277-6-hare@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210225105527.75277-1-hare@suse.de> References: <20210225105527.75277-1-hare@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210225_055544_737562_A69B2396 X-CRM114-Status: GOOD ( 15.74 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvme@lists.infradead.org, Daniel Wagner , Sagi Grimberg , Keith Busch , Hannes Reinecke Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org A request will be cancelled when a queue is deleted, so we should be returning a status of NVME_SC_ABORT_QUEUE. Signed-off-by: Hannes Reinecke --- 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 04dc85e0810c..624531a6b7c6 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -379,7 +379,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; 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) { status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1); dev_info(ctrl->ctrl.device, "NVME-FC{%d}: io failed due to lldd error %d\n", -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme