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.19 05/44] nvme-pci: fix conflicting p2p resource adds
Date: Tue, 13 Nov 2018 00:49:11 -0500 [thread overview]
Message-ID: <20181113054950.77898-5-sashal@kernel.org> (raw)
In-Reply-To: <20181113054950.77898-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 d668682f91df..da18e0ac9fa2 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1647,6 +1647,9 @@ static void nvme_map_cmb(struct nvme_dev *dev)
struct pci_dev *pdev = to_pci_dev(dev->dev);
int bar;
+ if (dev->cmb_size)
+ return;
+
dev->cmbsz = readl(dev->bar + NVME_REG_CMBSZ);
if (!dev->cmbsz)
return;
@@ -2129,7 +2132,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)) {
@@ -2577,6 +2579,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
WARNING: multiple messages have this Message-ID (diff)
From: sashal@kernel.org (Sasha Levin)
Subject: [PATCH AUTOSEL 4.19 05/44] nvme-pci: fix conflicting p2p resource adds
Date: Tue, 13 Nov 2018 00:49:11 -0500 [thread overview]
Message-ID: <20181113054950.77898-5-sashal@kernel.org> (raw)
In-Reply-To: <20181113054950.77898-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 at intel.com>
Reviewed-by: Logan Gunthorpe <logang at deltatee.com>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jens Axboe <axboe at kernel.dk>
Signed-off-by: Sasha Levin <sashal at 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 d668682f91df..da18e0ac9fa2 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1647,6 +1647,9 @@ static void nvme_map_cmb(struct nvme_dev *dev)
struct pci_dev *pdev = to_pci_dev(dev->dev);
int bar;
+ if (dev->cmb_size)
+ return;
+
dev->cmbsz = readl(dev->bar + NVME_REG_CMBSZ);
if (!dev->cmbsz)
return;
@@ -2129,7 +2132,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)) {
@@ -2577,6 +2579,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 6:06 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 5:49 [PATCH AUTOSEL 4.19 01/44] bfs: add sanity check at bfs_fill_super() Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 02/44] cifs: don't dereference smb_file_target before null check Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 03/44] cifs: fix return value for cifs_listxattr Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 04/44] arm64: kprobe: make page to RO mode when allocate it Sasha Levin
2018-11-13 5:49 ` Sasha Levin [this message]
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 05/44] nvme-pci: fix conflicting p2p resource adds Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 06/44] block: brd: associate with queue until adding disk Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 07/44] bpf: fix partial copy of map_ptr when dst is scalar Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 08/44] net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset() Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 09/44] net: hns3: bugfix for rtnl_lock's range in the hclge_reset() Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 10/44] net: hns3: bugfix for handling mailbox while the command queue reinitialized Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 11/44] net: hns3: bugfix for the initialization of command queue's spin lock Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 12/44] ixgbe: fix MAC anti-spoofing filter after VFLR Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 13/44] mm: Fix warning in insert_pfn() Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 14/44] mm/memory_hotplug: make add_memory() take the device_hotplug_lock Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 15/44] reiserfs: propagate errors from fill_with_dentries() properly Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 16/44] hfs: prevent btree data loss on root split Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 17/44] hfsplus: " Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 18/44] mm/gup_benchmark.c: prevent integer overflow in ioctl Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 19/44] perf unwind: Take pgoff into account when reporting elf to libdwfl Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 20/44] um: Give start_idle_thread() a return code Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 21/44] drm/edid: Add 6 bpc quirk for BOE panel Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 22/44] afs: Handle EIO from delivery function Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 23/44] platform/x86: intel_telemetry: report debugfs failure Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 24/44] clk: fixed-rate: fix of_node_get-put imbalance Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 25/44] perf symbols: Set PLT entry/header sizes properly on Sparc Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 26/44] fs/exofs: fix potential memory leak in mount option parsing Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 27/44] clk: samsung: exynos5420: Enable PERIS clocks for suspend Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 28/44] apparmor: Fix uninitialized value in aa_split_fqname Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 29/44] x86/earlyprintk: Add a force option for pciserial device Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 30/44] platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 31/44] clk: meson-axg: pcie: drop the mpll3 clock parent Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 32/44] arm64: percpu: Initialize ret in the default case Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 33/44] clk: meson: clk-pll: drop CLK_GET_RATE_NOCACHE where unnecessary Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 34/44] clk: renesas: r9a06g032: Fix UART34567 clock rate Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 35/44] clk: sunxi-ng: sun50i: h6: Add 2x fixed post-divider to MMC module clocks Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 36/44] clk: ti: fix OF child-node lookup Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 37/44] mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 38/44] mm: thp: fix mmu_notifier in migrate_misplaced_transhuge_page() Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 39/44] mm: calculate deferred pages after skipping mirrored memory Sasha Levin
2018-11-13 5:49 ` Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 40/44] mm: don't raise MEMCG_OOM event due to failed high-order allocation Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 41/44] mm/vmstat.c: assert that vmstat_text is in sync with stat_items_size Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 42/44] userfaultfd: allow get_mempolicy(MPOL_F_NODE|MPOL_F_ADDR) to trigger userfaults Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 43/44] mm: don't miss the last page because of round-off error Sasha Levin
2018-11-13 5:49 ` [PATCH AUTOSEL 4.19 44/44] 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=20181113054950.77898-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.