[PATCH RESENT] nvme-pci: suspend queues based on online_queues

[Keith Busch]

On Mon, Feb 12, 2018 at 09:05:13PM +0800, Jianchao Wang wrote:
> @@ -1315,9 +1315,6 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)
>  	nvmeq->cq_vector = -1;
>  	spin_unlock_irq(&nvmeq->q_lock);
>  
> -	if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q)
> -		blk_mq_quiesce_queue(nvmeq->dev->ctrl.admin_q);
> -

This doesn't look related to this patch.

>  	pci_free_irq(to_pci_dev(nvmeq->dev->dev), vector, nvmeq);
>  
>  	return 0;
> @@ -1461,13 +1458,14 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
>  	nvme_init_queue(nvmeq, qid);
>  	result = queue_request_irq(nvmeq);
>  	if (result < 0)
> -		goto release_sq;
> +		goto offline;
>  
>  	return result;
>  
> - release_sq:
> +offline:
> +	dev->online_queues--;
>  	adapter_delete_sq(dev, qid);

In addition to the above, set nvmeq->cq_vector to -1.

Everything else that follows doesn't appear to be necessary.

> @@ -2167,6 +2167,7 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
>  	int i;
>  	bool dead = true;
>  	struct pci_dev *pdev = to_pci_dev(dev->dev);
> +	int onlines;
>  
>  	mutex_lock(&dev->shutdown_lock);
>  	if (pci_is_enabled(pdev)) {
> @@ -2175,8 +2176,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
>  		if (dev->ctrl.state == NVME_CTRL_LIVE ||
>  		    dev->ctrl.state == NVME_CTRL_RESETTING)
>  			nvme_start_freeze(&dev->ctrl);
> -		dead = !!((csts & NVME_CSTS_CFS) || !(csts & NVME_CSTS_RDY) ||
> -			pdev->error_state  != pci_channel_io_normal);
> +
> +		dead = !!((csts & NVME_CSTS_CFS) ||
> +				!(csts & NVME_CSTS_RDY) ||
> +				(pdev->error_state  != pci_channel_io_normal) ||
> +				(dev->online_queues == 0));
>  	}
>  
>  	/*
> @@ -2200,9 +2204,14 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
>  		nvme_disable_io_queues(dev);
>  		nvme_disable_admin_queue(dev, shutdown);
>  	}
> -	for (i = dev->ctrl.queue_count - 1; i >= 0; i--)
> +
> +	onlines = dev->online_queues;
> +	for (i = onlines - 1; i >= 0; i--)
>  		nvme_suspend_queue(&dev->queues[i]);
>  
> +	if (dev->ctrl.admin_q)
> +		blk_mq_quiesce_queue(dev->ctrl.admin_q);
> +
>  	nvme_pci_disable(dev);
>  
>  	blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_request, &dev->ctrl);
> @@ -2341,16 +2350,18 @@ static void nvme_reset_work(struct work_struct *work)
>  	if (result)
>  		goto out;
>  
> -	/*
> -	 * Keep the controller around but remove all namespaces if we don't have
> -	 * any working I/O queue.
> -	 */
> -	if (dev->online_queues < 2) {
> +
> +	/* In case of online_queues is zero, it has gone to out */
> +	if (dev->online_queues == 1) {
> +		/*
> +		 * Keep the controller around but remove all namespaces if we
> +		 * don't have any working I/O queue.
> +		 */
>  		dev_warn(dev->ctrl.device, "IO queues not created\n");
>  		nvme_kill_queues(&dev->ctrl);
>  		nvme_remove_namespaces(&dev->ctrl);
>  		new_state = NVME_CTRL_ADMIN_ONLY;
> -	} else {
> +	} else if (dev->online_queues > 1) {
>  		nvme_start_queues(&dev->ctrl);
>  		nvme_wait_freeze(&dev->ctrl);
>  		/* hit this only when allocate tagset fails */
> --