| Message ID | ff412bfb-548c-c4fc-5180-78ede8a19ef2@sandisk.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> Avoid that nvme_queue_rq() is still running when nvme_stop_queues() > returns. Untested. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Keith Busch <keith.busch@intel.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Sagi Grimberg <sagi@grimberg.me> Bart this looks really good! and possibly fixes an issue I've been chasing with fabrics a while ago. I'll take it for testing but you can add my: Reviewed-by: Sagi Grimberg <sagi@grimberg.me> -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 28, 2016 at 05:01:45PM -0700, Bart Van Assche wrote: > Avoid that nvme_queue_rq() is still running when nvme_stop_queues() > returns. Untested. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Keith Busch <keith.busch@intel.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Sagi Grimberg <sagi@grimberg.me> > --- > drivers/nvme/host/core.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index d791fba..98f1f29 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -201,13 +201,9 @@ fail: > > void nvme_requeue_req(struct request *req) > { > - unsigned long flags; > - > blk_mq_requeue_request(req); > - spin_lock_irqsave(req->q->queue_lock, flags); > - if (!blk_mq_queue_stopped(req->q)) > - blk_mq_kick_requeue_list(req->q); > - spin_unlock_irqrestore(req->q->queue_lock, flags); > + WARN_ON_ONCE(blk_mq_queue_stopped(req->q)); > + blk_mq_kick_requeue_list(req->q); > } > EXPORT_SYMBOL_GPL(nvme_requeue_req); Can we just add a 'bool kick' argument to blk_mq_requeue_request and move all this handling to the core? -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/11/16 09:46, Christoph Hellwig wrote: > On Wed, Sep 28, 2016 at 05:01:45PM -0700, Bart Van Assche wrote: >> Avoid that nvme_queue_rq() is still running when nvme_stop_queues() >> returns. Untested. >> >> Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> >> Cc: Keith Busch <keith.busch@intel.com> >> Cc: Christoph Hellwig <hch@lst.de> >> Cc: Sagi Grimberg <sagi@grimberg.me> >> --- >> drivers/nvme/host/core.c | 20 ++++++++++++-------- >> 1 file changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c >> index d791fba..98f1f29 100644 >> --- a/drivers/nvme/host/core.c >> +++ b/drivers/nvme/host/core.c >> @@ -201,13 +201,9 @@ fail: >> >> void nvme_requeue_req(struct request *req) >> { >> - unsigned long flags; >> - >> blk_mq_requeue_request(req); >> - spin_lock_irqsave(req->q->queue_lock, flags); >> - if (!blk_mq_queue_stopped(req->q)) >> - blk_mq_kick_requeue_list(req->q); >> - spin_unlock_irqrestore(req->q->queue_lock, flags); >> + WARN_ON_ONCE(blk_mq_queue_stopped(req->q)); >> + blk_mq_kick_requeue_list(req->q); >> } >> EXPORT_SYMBOL_GPL(nvme_requeue_req); > > Can we just add a 'bool kick' argument to blk_mq_requeue_request and > move all this handling to the core? Hello Christoph, That sounds like a good idea to me. Thanks also for the other review comments you posted on this patch series. I will rework patch 6/7 such that the code for waiting is moved into the SCSI core. Bart. -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index d791fba..98f1f29 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -201,13 +201,9 @@ fail: void nvme_requeue_req(struct request *req) { - unsigned long flags; - blk_mq_requeue_request(req); - spin_lock_irqsave(req->q->queue_lock, flags); - if (!blk_mq_queue_stopped(req->q)) - blk_mq_kick_requeue_list(req->q); - spin_unlock_irqrestore(req->q->queue_lock, flags); + WARN_ON_ONCE(blk_mq_queue_stopped(req->q)); + blk_mq_kick_requeue_list(req->q); } EXPORT_SYMBOL_GPL(nvme_requeue_req); @@ -2077,11 +2073,19 @@ EXPORT_SYMBOL_GPL(nvme_kill_queues); void nvme_stop_queues(struct nvme_ctrl *ctrl) { struct nvme_ns *ns; + struct request_queue *q; mutex_lock(&ctrl->namespaces_mutex); list_for_each_entry(ns, &ctrl->namespaces, list) { - blk_mq_cancel_requeue_work(ns->queue); - blk_mq_stop_hw_queues(ns->queue); + q = ns->queue; + blk_mq_quiesce_queue(q); + blk_mq_cancel_requeue_work(q); + blk_mq_stop_hw_queues(q); + /* + * Note: blk_mq_resume_queue() does not affect the value + * of the BLK_MQ_S_STOPPED bit. + */ + blk_mq_resume_queue(q); } mutex_unlock(&ctrl->namespaces_mutex); }
Avoid that nvme_queue_rq() is still running when nvme_stop_queues() returns. Untested. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Keith Busch <keith.busch@intel.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> --- drivers/nvme/host/core.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)