From patchwork Mon May 8 15:11:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 9716303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6654B6035D for ; Mon, 8 May 2017 15:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A09820453 for ; Mon, 8 May 2017 15:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D40D2094F; Mon, 8 May 2017 15:04:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF8C820453 for ; Mon, 8 May 2017 15:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754614AbdEHPEG (ORCPT ); Mon, 8 May 2017 11:04:06 -0400 Received: from mga11.intel.com ([192.55.52.93]:43619 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbdEHPEF (ORCPT ); Mon, 8 May 2017 11:04:05 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2017 08:04:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,309,1491289200"; d="scan'208";a="98774452" Received: from unknown (HELO localhost.localdomain) ([10.232.112.96]) by fmsmga005.fm.intel.com with ESMTP; 08 May 2017 08:04:04 -0700 Date: Mon, 8 May 2017 11:11:24 -0400 From: Keith Busch To: Ming Lei Cc: Jens Axboe , Sagi Grimberg , stable@vger.kernel.org, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Christoph Hellwig Subject: Re: [PATCH] nvme: remove disk after hw queue is started Message-ID: <20170508151123.GA463@localhost.localdomain> References: <20170508112457.10236-1-ming.lei@redhat.com> <20170508124638.GD5696@ming.t460p> <20170508150720.GB32736@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170508150720.GB32736@localhost.localdomain> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, May 08, 2017 at 11:07:20AM -0400, Keith Busch wrote: > I'm almost certain the remove_work shouldn't even be running in this > case. If the reset work can't transition the controller state correctly, > it should assume something is handling the controller. Here's the more complete version of what I had in mind. Does this solve the reported issue? --- -- diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 26a5fd0..46a37fb 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1792,7 +1792,7 @@ static void nvme_reset_work(struct work_struct *work) nvme_dev_disable(dev, false); if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RESETTING)) - goto out; + return; result = nvme_pci_enable(dev); if (result) @@ -1854,7 +1854,7 @@ static void nvme_reset_work(struct work_struct *work) if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_LIVE)) { dev_warn(dev->ctrl.device, "failed to mark controller live\n"); - goto out; + return; } if (dev->online_queues > 1)