On Mon, May 14, 2018 at 06:33:35PM -0600, Keith Busch wrote:
> On Tue, May 15, 2018 at 07:47:07AM +0800, Ming Lei wrote:
> > > > > [ 760.727485] nvme nvme1: EH 0: after recovery -19
> > > > > [ 760.727488] nvme nvme1: EH: fail controller
> > > >
> > > > The above issue(hang in nvme_remove()) is still an old issue, which
> > > > is because queues are kept as quiesce during remove, so could you
> > > > please test the following change?
> > > >
> > > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> > > > index 1dec353388be..c78e5a0cde06 100644
> > > > --- a/drivers/nvme/host/core.c
> > > > +++ b/drivers/nvme/host/core.c
> > > > @@ -3254,6 +3254,11 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
> > > > */
> > > > if (ctrl->state == NVME_CTRL_DEAD)
> > > > nvme_kill_queues(ctrl);
> > > > + else {
> > > > + if (ctrl->admin_q)
> > > > + blk_mq_unquiesce_queue(ctrl->admin_q);
> > > > + nvme_start_queues(ctrl);
> > > > + }
> > > >
> > > > down_write(&ctrl->namespaces_rwsem);
> > > > list_splice_init(&ctrl->namespaces, &ns_list);
> > >
> > > The above won't actually do anything here since the broken link puts the
> > > controller in the DEAD state, so we've killed the queues which also
> > > unquiesces them.
> >
> > I suggest you to double check if the controller is set as DEAD
> > in nvme_remove() since there won't be any log dumped when this happen.
>
> Yes, it's dead. pci_device_is_present returns false when the link is
> broken.
>
> Also, the logs showed the capacity was set to 0, which only happens when
> we kill the namespace queues, which supposedly restarts the queues too.
>
> > If controller is set as DEAD and queues are killed, and all IO should
> > have been dispatched to driver and nvme_queueu_rq() will fail them all,
> > then there isn't any reason to see the hang in your stack trace log.
>
> Right, that's the idea. It just doesn't appear to be working here.
Hi Keith,
This issue may probably be fixed by Jianchao's patch of 'nvme: pci: set nvmeq->cq_vector
after alloc cq/sq'[1] and my another patch of 'nvme: pci: unquiesce admin
queue after controller is shutdown'[2], and both two have been included in the
posted V6.
[1] https://marc.info/?l=linux-block&m=152644346006002&w=2
[2] https://marc.info/?l=linux-block&m=152644344805995&w=2
So please retest V6 and see if this issue can be addressed, if not,
could you share the debugfs log, then we might see where is wrong
from the log?
Thanks,
Ming
