Linux-NVME Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: hch@infradead.org (Christoph Hellwig)
Subject: [PATCH] NVMe: Fix possible scheduling while atomic error
Date: Mon, 23 May 2016 03:58:07 -0700	[thread overview]
Message-ID: <20160523105807.GC26331@infradead.org> (raw)
In-Reply-To: <1463521062-16488-1-git-send-email-keith.busch@intel.com>

On Tue, May 17, 2016@03:37:42PM -0600, Keith Busch wrote:
>  		spin_unlock_irq(ns->queue->queue_lock);
>  
> -		blk_mq_cancel_requeue_work(ns->queue);
>  		blk_mq_stop_hw_queues(ns->queue);
>  	}
>  	rcu_read_unlock();
> @@ -1836,7 +1835,10 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)
>  
>  	rcu_read_lock();
>  	list_for_each_entry_rcu(ns, &ctrl->namespaces, list) {
> -		queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);
> +		spin_lock_irq(ns->queue->queue_lock);
> +		queue_flag_clear(QUEUE_FLAG_STOPPED, ns->queue);
> +		spin_unlock_irq(ns->queue->queue_lock);

What's the rationale for this change? 

> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -609,6 +609,12 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
>  	spin_unlock_irq(&nvmeq->q_lock);
>  	return BLK_MQ_RQ_QUEUE_OK;
>  out:
> +	if (ret == BLK_MQ_RQ_QUEUE_BUSY) {
> +		spin_lock_irq(ns->queue->queue_lock);
> +		if (blk_queue_stopped(req->q))
> +			blk_mq_stop_hw_queues(ns->queue);
> +		spin_unlock_irq(ns->queue->queue_lock);

Shouldn't we do this where set the stopped flag on the queue instead?

  reply	other threads:[~2016-05-23 10:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-17 21:37 [PATCH] NVMe: Fix possible scheduling while atomic error Keith Busch
2016-05-23 10:58 ` Christoph Hellwig [this message]
2016-05-23 13:41   ` Keith Busch
2016-05-23 14:36     ` Christoph Hellwig
2016-05-23 14:55       ` Keith Busch
2016-05-24 18:43         ` Ming Lin
2016-05-24 19:59           ` Keith Busch
2016-05-25  8:18             ` Christoph Hellwig
2016-05-25 17:57               ` Keith Busch
2016-05-27  7:40                 ` Christoph Hellwig
2016-06-08 11:17                   ` Sagi Grimberg
2016-06-08 14:43                     ` Keith Busch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160523105807.GC26331@infradead.org \
    --to=hch@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox