From 03fdd7923622e398954c5e61baf83d9de6fe37f5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Nov 2018 11:00:50 +0100 Subject: [PATCH] drop nvme-pci-fix-conflicting-p2p-resource-adds.patch from 4.14 and 4.19 --- ...ci-fix-conflicting-p2p-resource-adds.patch | 71 ----------------- queue-4.14/series | 1 - ...ci-fix-conflicting-p2p-resource-adds.patch | 76 ------------------- queue-4.19/series | 1 - 4 files changed, 149 deletions(-) delete mode 100644 queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch delete mode 100644 queue-4.19/nvme-pci-fix-conflicting-p2p-resource-adds.patch diff --git a/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch b/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch deleted file mode 100644 index 486e5830e6a..00000000000 --- a/queue-4.14/nvme-pci-fix-conflicting-p2p-resource-adds.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6157e59780c9139749829165cf4c82ac6fc51f39 Mon Sep 17 00:00:00 2001 -From: Keith Busch -Date: Wed, 31 Oct 2018 13:15:29 -0600 -Subject: nvme-pci: fix conflicting p2p resource adds - -[ 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 -Reviewed-by: Logan Gunthorpe -Signed-off-by: Christoph Hellwig -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/nvme/host/pci.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -1546,6 +1546,9 @@ static void __iomem *nvme_map_cmb(struct - void __iomem *cmb; - int bar; - -+ if (dev->cmb_size) -+ return NULL; -+ - 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 - { - 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 * - 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); diff --git a/queue-4.14/series b/queue-4.14/series index 4d47534994c..32e6dcec6e0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,7 +1,6 @@ cifs-don-t-dereference-smb_file_target-before-null-c.patch cifs-fix-return-value-for-cifs_listxattr.patch arm64-kprobe-make-page-to-ro-mode-when-allocate-it.patch -nvme-pci-fix-conflicting-p2p-resource-adds.patch ixgbe-fix-mac-anti-spoofing-filter-after-vflr.patch reiserfs-propagate-errors-from-fill_with_dentries-pr.patch hfs-prevent-btree-data-loss-on-root-split.patch diff --git a/queue-4.19/nvme-pci-fix-conflicting-p2p-resource-adds.patch b/queue-4.19/nvme-pci-fix-conflicting-p2p-resource-adds.patch deleted file mode 100644 index 103e35ad92f..00000000000 --- a/queue-4.19/nvme-pci-fix-conflicting-p2p-resource-adds.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 7fda1c39674aff4b743da6cdca41c82cef741f40 Mon Sep 17 00:00:00 2001 -From: Keith Busch -Date: Wed, 31 Oct 2018 13:15:29 -0600 -Subject: nvme-pci: fix conflicting p2p resource adds - -[ 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 -Reviewed-by: Logan Gunthorpe -Signed-off-by: Christoph Hellwig -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-4.19/series b/queue-4.19/series index ca6e65b761c..d694beba1c7 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -2,7 +2,6 @@ drm-i915-replace-some-page_size-with-i915_gtt_page_size.patch cifs-don-t-dereference-smb_file_target-before-null-c.patch cifs-fix-return-value-for-cifs_listxattr.patch arm64-kprobe-make-page-to-ro-mode-when-allocate-it.patch -nvme-pci-fix-conflicting-p2p-resource-adds.patch block-brd-associate-with-queue-until-adding-disk.patch net-hns3-bugfix-for-rtnl_lock-s-range-in-the-hclgevf.patch net-hns3-bugfix-for-rtnl_lock-s-range-in-the-hclge_r.patch -- 2.47.3