Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH V5 0/2] nvme-pci: fix the timeout case when reset is
 ongoing
To:     Keith Busch <keith.busch@intel.com>
Cc:     axboe@fb.com, hch@lst.de, sagi@grimberg.me, maxg@mellanox.com,
        james.smart@broadcom.com, linux-nvme@lists.infradead.org,
        linux-kernel@vger.kernel.org
References: <1516270202-8051-1-git-send-email-jianchao.w.wang@oracle.com>
 <20180119080130.GE12043@localhost.localdomain>
 <0639aa2f-d153-5aac-ce08-df0d4b45f9a0@oracle.com>
 <20180119084218.GF12043@localhost.localdomain>
 <84b4e3bc-fe23-607e-9d5e-bb5644eedb54@oracle.com>
 <20180119115255.GH12043@localhost.localdomain>
 <3cc0d180-0b7e-e71f-66ce-43f4dfffb701@oracle.com>
 <20180120021119.GJ12043@localhost.localdomain>
 <ea00677b-6d79-e9c0-e0af-78e287f29ddd@oracle.com>
From:   "jianchao.wang" <jianchao.w.wang@oracle.com>
Message-ID: <b5056edd-4806-0815-ec5e-b023b313a086@oracle.com>
Date:   Sat, 20 Jan 2018 22:14:51 +0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <ea00677b-6d79-e9c0-e0af-78e287f29ddd@oracle.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 01/20/2018 10:07 PM, jianchao.wang wrote:
> Hi Keith
> 
> Thanks for you kindly response.
> 
> On 01/20/2018 10:11 AM, Keith Busch wrote:
>> On Fri, Jan 19, 2018 at 09:56:48PM +0800, jianchao.wang wrote:
>>> In nvme_dev_disable, the outstanding requests will be requeued finally.
>>> I'm afraid the requests requeued on the q->requeue_list will be blocked until another requeue
>>> occurs, if we cancel the requeue work before it get scheduled.
>>
>> We should kick the request list in nvme_start_queues.
>>
> Yes
> 
> @@ -3513,8 +3513,10 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)
>         struct nvme_ns *ns;
>  
>         mutex_lock(&ctrl->namespaces_mutex);
> -       list_for_each_entry(ns, &ctrl->namespaces, list)
> +       list_for_each_entry(ns, &ctrl->namespaces, list) {
>                 blk_mq_unquiesce_queue(ns->queue);
> +               blk_mq_kick_requeue_list(ns->queue);
> +       }
>         mutex_unlock(&ctrl->namespaces_mutex);
>  }

We have to also add blk_mq_kick_requeue_list in nvme_kill_queues in case of queue_count < 2.

> 
> Then, nvme_sync_queues could be more universal.
> 
> Many thanks for your directive.
> 
> Jianchao
>