From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 E9A29C433E1 for ; Fri, 14 Aug 2020 15:04:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C40D920855 for ; Fri, 14 Aug 2020 15:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597417479; bh=oisErVD0u+lyl37V1wBsI8bt6Y7+p7CbVMU/YvPDXtQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=feAdczJ7Mhm80JbxZK/rLeFO4/Y9XcbR8+o133b5xPrYWNomeWzKgSf6bkeG3YaO8 Y5FZ9I2YAHfcGkhGBxcviVJiPvQ3/XrtEB95GvJ0ZoegCXExHUABkH7q23HqEU65vn lF6/xJYAt/dW5CWWQ/7lHL092weMXhFPOjUFXAcA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728099AbgHNPEi (ORCPT ); Fri, 14 Aug 2020 11:04:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:45588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726196AbgHNPEg (ORCPT ); Fri, 14 Aug 2020 11:04:36 -0400 Received: from dhcp-10-100-145-180.wdl.wdc.com (unknown [199.255.45.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9396A20774; Fri, 14 Aug 2020 15:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597417476; bh=oisErVD0u+lyl37V1wBsI8bt6Y7+p7CbVMU/YvPDXtQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CrTxXsd1uArNVJnUs+ss6N08rc0GDHeyOnV/HaAHn0kjrRVBpJKfhpX7Q848Unzxm HTMX/XkrnvZztSYLgOghV6i4G0XxInbW0Gg6mYtsoc6uIKXUG2I9aVJwYa4o1dryRi fnPEdxXyrqpHLX83WXeO7t0EDMYe3WmxhPba1lyw= Date: Fri, 14 Aug 2020 08:04:33 -0700 From: Keith Busch To: Tong Zhang Cc: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me Subject: Re: [PATCH] nvme-pci: cancel nvme device request before disabling Message-ID: <20200814150433.GA3498391@dhcp-10-100-145-180.wdl.wdc.com> References: <20200814071431.201400-1-ztong0001@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200814071431.201400-1-ztong0001@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 14, 2020 at 03:14:31AM -0400, Tong Zhang wrote: > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index ba725ae47305..c4f1ce0ee1e3 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -1249,8 +1249,8 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) > dev_warn_ratelimited(dev->ctrl.device, > "I/O %d QID %d timeout, disable controller\n", > req->tag, nvmeq->qid); > - nvme_dev_disable(dev, true); > nvme_req(req)->flags |= NVME_REQ_CANCELLED; > + nvme_dev_disable(dev, true); > return BLK_EH_DONE; Shouldn't this flag have been set in nvme_cancel_request()? It's not like the timeout out command is the only command to have been cancelled by this action, nor is it guaranteed that getting here will mean the request was in fact cancelled. The controller could still provide a real completion.