[PATCH] nvme-pci: cancel nvme device request before disabling

[Tong Zhang]

On Fri, Aug 14, 2020 at 11:42 AM Keith Busch <kbusch at kernel.org> wrote:
> > > On Fri, Aug 14, 2020 at 03:14:31AM -0400, Tong Zhang wrote:
> > > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> > > > index ba725ae47305..c4f1ce0ee1e3 100644
> > > > --- a/drivers/nvme/host/pci.c
> > > > +++ b/drivers/nvme/host/pci.c
> > > > @@ -1249,8 +1249,8 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
> > > >               dev_warn_ratelimited(dev->ctrl.device,
> > > >                        "I/O %d QID %d timeout, disable controller\n",
> > > >                        req->tag, nvmeq->qid);
> > > > -             nvme_dev_disable(dev, true);
> > > >               nvme_req(req)->flags |= NVME_REQ_CANCELLED;
> > > > +             nvme_dev_disable(dev, true);
> > > >               return BLK_EH_DONE;

> anymore. The driver is not reporting   non-response back for all
> cancelled requests, and that is probably not what we should be doing.

OK, thanks for the explanation. I think the bottom line here is to let the
probe function know and stop proceeding when there's an error.
I also don't see an obvious reason to set NVME_REQ_CANCELLED
after nvme_dev_disable(dev, true).