From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Keith Busch <keith.busch@intel.com>,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Sasha Levin <sashal@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 4.14 05/26] nvme-pci: fix conflicting p2p resource adds
Date: Tue, 13 Nov 2018 00:51:29 -0500 [thread overview]
Message-ID: <20181113055150.78773-5-sashal@kernel.org> (raw)
In-Reply-To: <20181113055150.78773-1-sashal@kernel.org>
From: Keith Busch <keith.busch@intel.com>
[ Upstream commit 9fe5c59ff6a1e5e26a39b75489a1420e7eaaf0b1 ]
The nvme pci driver had been adding its CMB resource to the P2P DMA
subsystem everytime on on a controller reset. This results in the
following warning:
------------[ cut here ]------------
nvme 0000:00:03.0: Conflicting mapping in same section
WARNING: CPU: 7 PID: 81 at kernel/memremap.c:155 devm_memremap_pages+0xa6/0x380
...
Call Trace:
pci_p2pdma_add_resource+0x153/0x370
nvme_reset_work+0x28c/0x17b1 [nvme]
? add_timer+0x107/0x1e0
? dequeue_entity+0x81/0x660
? dequeue_entity+0x3b0/0x660
? pick_next_task_fair+0xaf/0x610
? __switch_to+0xbc/0x410
process_one_work+0x1cf/0x350
worker_thread+0x215/0x3d0
? process_one_work+0x350/0x350
kthread+0x107/0x120
? kthread_park+0x80/0x80
ret_from_fork+0x1f/0x30
---[ end trace f7ea76ac6ee72727 ]---
nvme nvme0: failed to register the CMB
This patch fixes this by registering the CMB with P2P only once.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/pci.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index afb99876fa9e..9eb0a2acd41f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1546,6 +1546,9 @@ static void __iomem *nvme_map_cmb(struct nvme_dev *dev)
void __iomem *cmb;
int bar;
+ if (dev->cmb_size)
+ return;
+
dev->cmbsz = readl(dev->bar + NVME_REG_CMBSZ);
if (!(NVME_CMB_SZ(dev->cmbsz)))
return NULL;
@@ -2032,7 +2035,6 @@ static void nvme_pci_disable(struct nvme_dev *dev)
{
struct pci_dev *pdev = to_pci_dev(dev->dev);
- nvme_release_cmb(dev);
pci_free_irq_vectors(pdev);
if (pci_is_enabled(pdev)) {
@@ -2432,6 +2434,7 @@ static void nvme_remove(struct pci_dev *pdev)
nvme_stop_ctrl(&dev->ctrl);
nvme_remove_namespaces(&dev->ctrl);
nvme_dev_disable(dev, true);
+ nvme_release_cmb(dev);
nvme_free_host_mem(dev);
nvme_dev_remove_admin(dev);
nvme_free_queues(dev, 0);
--
2.17.1
next prev parent reply other threads:[~2018-11-13 5:58 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 5:51 [PATCH AUTOSEL 4.14 01/26] bfs: add sanity check at bfs_fill_super() Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 02/26] cifs: don't dereference smb_file_target before null check Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 03/26] cifs: fix return value for cifs_listxattr Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 04/26] arm64: kprobe: make page to RO mode when allocate it Sasha Levin
2018-11-13 5:51 ` Sasha Levin [this message]
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 06/26] ixgbe: fix MAC anti-spoofing filter after VFLR Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 07/26] mm: Fix warning in insert_pfn() Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 08/26] mm/memory_hotplug: make add_memory() take the device_hotplug_lock Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 09/26] reiserfs: propagate errors from fill_with_dentries() properly Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 10/26] hfs: prevent btree data loss on root split Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 11/26] hfsplus: " Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 12/26] um: Give start_idle_thread() a return code Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 13/26] drm/edid: Add 6 bpc quirk for BOE panel Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 14/26] platform/x86: intel_telemetry: report debugfs failure Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 15/26] clk: fixed-rate: fix of_node_get-put imbalance Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 16/26] perf symbols: Set PLT entry/header sizes properly on Sparc Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 17/26] fs/exofs: fix potential memory leak in mount option parsing Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 18/26] clk: samsung: exynos5420: Enable PERIS clocks for suspend Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 19/26] apparmor: Fix uninitialized value in aa_split_fqname Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 20/26] x86/earlyprintk: Add a force option for pciserial device Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 21/26] platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 22/26] arm64: percpu: Initialize ret in the default case Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 23/26] mm/vmstat.c: assert that vmstat_text is in sync with stat_items_size Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 24/26] userfaultfd: allow get_mempolicy(MPOL_F_NODE|MPOL_F_ADDR) to trigger userfaults Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 25/26] mm: don't miss the last page because of round-off error Sasha Levin
2018-11-13 5:51 ` [PATCH AUTOSEL 4.14 26/26] mm: don't warn about large allocations for slab Sasha Levin
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=20181113055150.78773-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=stable@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).