From: jthumshirn@suse.de (Johannes Thumshirn)
Subject: [PATCH] NVMe: init nvme queue before enabling irq
Date: Wed, 20 Jan 2016 10:09:31 +0100 [thread overview]
Message-ID: <20160120090931.GO2742@c203.arch.suse.de> (raw)
In-Reply-To: <1453265860-31080-1-git-send-email-mail_weber_wang@163.com>
On Tue, Jan 19, 2016@11:57:40PM -0500, Wenbo Wang wrote:
> During reset process, the nvme_dev->bar (ioremapped) may change,
> so nvmeq->q_db shall be also updated by nvme_init_queue().
>
> Currently nvmeq irq is enabled before queue init, so a spurious
> interrupt triggered nvme_process_cq may access nvmeq->q_db just
> before it is updated, this could cause kernel panic.
If it can cause a kernel panic shouldn't it go through stable then as well?
>
> Signed-off-by: Wenbo Wang <wenbo.wang at memblaze.com>
> Reviewed-by: Wenwei Tao <wenwei.tao at memblaze.com>
> ---
> drivers/nvme/host/pci.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index f5c0e26..df55f28 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -1590,11 +1590,17 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
> if (result < 0)
> goto release_cq;
>
> + /*
> + * Init queue door bell ioremap address before enabling irq, if not,
> + * a spurious interrupt triggered nvme_process_cq may access invalid
> + * address
> + */
> + nvme_init_queue(nvmeq, qid);
> +
> result = queue_request_irq(dev, nvmeq, nvmeq->irqname);
> if (result < 0)
> goto release_sq;
>
> - nvme_init_queue(nvmeq, qid);
> return result;
>
> release_sq:
> @@ -1789,6 +1795,8 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
> if (result)
> goto free_nvmeq;
>
> + nvme_init_queue(nvmeq, 0);
> +
> nvmeq->cq_vector = 0;
> result = queue_request_irq(dev, nvmeq, nvmeq->irqname);
> if (result) {
> @@ -3164,7 +3172,6 @@ static void nvme_probe_work(struct work_struct *work)
> goto disable;
> }
>
> - nvme_init_queue(dev->queues[0], 0);
> result = nvme_alloc_admin_tags(dev);
> if (result)
> goto disable;
> --
> 1.8.3.1
>
>
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
Other than that
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
--
Johannes Thumshirn Storage
jthumshirn at suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
next prev parent reply other threads:[~2016-01-20 9:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 4:57 [PATCH] NVMe: init nvme queue before enabling irq Wenbo Wang
2016-01-20 9:06 ` Sagi Grimberg
2016-01-20 10:52 ` Wenbo Wang
2016-01-20 9:09 ` Johannes Thumshirn [this message]
2016-01-20 9:45 ` Wenbo Wang
2016-01-20 9:56 ` Sagi Grimberg
2016-01-20 10:22 ` Johannes Thumshirn
2016-01-20 10:41 ` Wenbo Wang
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=20160120090931.GO2742@c203.arch.suse.de \
--to=jthumshirn@suse.de \
/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