From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.211]:59340 "EHLO newverein.lst.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1754709AbdERNtd (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 18 May 2017 09:49:33 -0400
Date: Thu, 18 May 2017 15:49:31 +0200
From: Christoph Hellwig <hch@lst.de>
To: Ming Lei <ming.lei@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>, Keith Busch <keith.busch@intel.com>,
        Christoph Hellwig <hch@lst.de>,
        Sagi Grimberg <sagi@grimberg.me>,
        linux-nvme@lists.infradead.org, Zhang Yi <yizhan@redhat.com>,
        linux-block@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 2/2] nvme: avoid to hang in remove disk
Message-ID: <20170518134931.GB31489@lst.de>
References: <20170517012729.13469-1-ming.lei@redhat.com> <20170517012729.13469-3-ming.lei@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170517012729.13469-3-ming.lei@redhat.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Wed, May 17, 2017 at 09:27:29AM +0800, Ming Lei wrote:
> If some writeback requests are submitted just before queue is killed,
> and these requests may not be canceled in nvme_dev_disable() because
> they are not started yet, it is still possible for blk-mq to hold
> these requests in .requeue list.
> 
> So we have to abort these requests first before del_gendisk(), because
> del_gendisk() may wait for completion of these requests.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
>  drivers/nvme/host/core.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index d5e0906262ea..8eaeea86509a 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -2097,6 +2097,14 @@ static void nvme_ns_remove(struct nvme_ns *ns)
>  					&nvme_ns_attr_group);
>  		if (ns->ndev)
>  			nvme_nvm_unregister_sysfs(ns);
> +		/*
> +		 * If queue is dead, we have to abort requests in
> +		 * requeue list because fsync_bdev() in removing disk
> +		 * path may wait for these IOs, which can't
> +		 * be submitted to hardware too.
> +		 */
> +		if (blk_queue_dying(ns->queue))
> +			blk_mq_abort_requeue_list(ns->queue);
>  		del_gendisk(ns->disk);
>  		blk_mq_abort_requeue_list(ns->queue);

Why can't we just move the blk_mq_abort_requeue_list call before
del_gendisk in general?