* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-15 16:00 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:00 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Linus Walleij, Jingoo Han, Joao Pinto,
Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring, Tanmay Inamdar,
Ryder Lee, Matthias Brugger
Cc: linux-arm-kernel, linux-mediatek, linux-renesas-soc
Hello!
Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
(and the kernel BUG caused by them on deferred probe); those were 1st found
testing the R-Car PCIe driver. The patches are in the chronological order
(considering the date/time of the commits specified in the Fixes: tag), patches
#2..#8 depend on the patch #1 in order to build/work as it introduces the managed
device API that they all use...
[1/8] PCI: xgene: Fix I/O space page leak
[2/8] PCI: of: Fix I/O space page leak
[3/8] PCI: versatile: Fix I/O space page leak
[4/8] PCI: designware: Fix I/O space page leak
[5/8] PCI: aardvark: Fix I/O space page leak
[6/8] PCI: faraday: Fix I/O space page leak
[7/8] PCI: mediatek: Fix I/O space page leak
[8/8] PCI: v3-semi: Fix I/O space page leak
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-15 16:00 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:00 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Linus Walleij, Jingoo Han, Joao Pinto,
Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring, Tanmay Inamdar,
Ryder Lee, Matthias Brugger
Cc: linux-renesas-soc, linux-mediatek, linux-arm-kernel
Hello!
Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
(and the kernel BUG caused by them on deferred probe); those were 1st found
testing the R-Car PCIe driver. The patches are in the chronological order
(considering the date/time of the commits specified in the Fixes: tag), patches
#2..#8 depend on the patch #1 in order to build/work as it introduces the managed
device API that they all use...
[1/8] PCI: xgene: Fix I/O space page leak
[2/8] PCI: of: Fix I/O space page leak
[3/8] PCI: versatile: Fix I/O space page leak
[4/8] PCI: designware: Fix I/O space page leak
[5/8] PCI: aardvark: Fix I/O space page leak
[6/8] PCI: faraday: Fix I/O space page leak
[7/8] PCI: mediatek: Fix I/O space page leak
[8/8] PCI: v3-semi: Fix I/O space page leak
MBR, Sergei
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-15 16:00 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:00 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Linus Walleij, Jingoo Han, Joao Pinto,
Lorenzo Pieralisi, Thomas Petazzoni, Rob Herring, Tanmay Inamdar,
Ryder Lee, Matthias Brugger
Cc: linux-renesas-soc, linux-mediatek, linux-arm-kernel
Hello!
Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
(and the kernel BUG caused by them on deferred probe); those were 1st found
testing the R-Car PCIe driver. The patches are in the chronological order
(considering the date/time of the commits specified in the Fixes: tag), patches
#2..#8 depend on the patch #1 in order to build/work as it introduces the managed
device API that they all use...
[1/8] PCI: xgene: Fix I/O space page leak
[2/8] PCI: of: Fix I/O space page leak
[3/8] PCI: versatile: Fix I/O space page leak
[4/8] PCI: designware: Fix I/O space page leak
[5/8] PCI: aardvark: Fix I/O space page leak
[6/8] PCI: faraday: Fix I/O space page leak
[7/8] PCI: mediatek: Fix I/O space page leak
[8/8] PCI: v3-semi: Fix I/O space page leak
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-15 16:00 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:00 UTC (permalink / raw)
To: linux-arm-kernel
Hello!
Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
(and the kernel BUG caused by them on deferred probe); those were 1st found
testing the R-Car PCIe driver. The patches are in the chronological order
(considering the date/time of the commits specified in the Fixes: tag), patches
#2..#8 depend on the patch #1 in order to build/work as it introduces the managed
device API that they all use...
[1/8] PCI: xgene: Fix I/O space page leak
[2/8] PCI: of: Fix I/O space page leak
[3/8] PCI: versatile: Fix I/O space page leak
[4/8] PCI: designware: Fix I/O space page leak
[5/8] PCI: aardvark: Fix I/O space page leak
[6/8] PCI: faraday: Fix I/O space page leak
[7/8] PCI: mediatek: Fix I/O space page leak
[8/8] PCI: v3-semi: Fix I/O space page leak
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 1/8] PCI: xgene: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
@ 2018-07-15 16:03 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:03 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi; +Cc: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The most feasible solution seemed to introduce devm_pci_remap_iospace()
and call it instead of pci_remap_iospace(), so that the pages get unmapped
automagically on any probe failure.
Looking at the PCI drivers having the same issue, the XGene driver turned
out to be the earliest broken, so I'll have to start with fixing it...
Fixes: 5f6b6ccdbe1c ("PCI: xgene: Add APM X-Gene PCIe driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-xgene.c | 2 -
drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 2 +
3 files changed, 41 insertions(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-xgene.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-xgene.c
+++ pci/drivers/pci/controller/pci-xgene.c
@@ -423,7 +423,7 @@ static int xgene_pcie_map_ranges(struct
case IORESOURCE_IO:
xgene_pcie_setup_ob_reg(port, res, OMR3BARL, io_base,
res->start - window->offset);
- ret = pci_remap_iospace(res, io_base);
+ ret = devm_pci_remap_iospace(dev, res, io_base);
if (ret < 0)
return ret;
break;
Index: pci/drivers/pci/pci.c
===================================================================
--- pci.orig/drivers/pci/pci.c
+++ pci/drivers/pci/pci.c
@@ -3579,6 +3579,44 @@ void pci_unmap_iospace(struct resource *
}
EXPORT_SYMBOL(pci_unmap_iospace);
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+ struct resource **res = ptr;
+
+ pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace(). Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr)
+{
+ const struct resource **ptr;
+ int error;
+
+ ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ error = pci_remap_iospace(res, phys_addr);
+ if (error) {
+ devres_free(ptr);
+ } else {
+ *ptr = res;
+ devres_add(dev, ptr);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
/**
* devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
* @dev: Generic device to remap IO address for
Index: pci/include/linux/pci.h
===================================================================
--- pci.orig/include/linux/pci.h
+++ pci/include/linux/pci.h
@@ -1240,6 +1240,8 @@ int pci_register_io_range(struct fwnode_
unsigned long pci_address_to_pio(phys_addr_t addr);
phys_addr_t pci_pio_to_address(unsigned long pio);
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr);
void pci_unmap_iospace(struct resource *res);
void __iomem *devm_pci_remap_cfgspace(struct device *dev,
resource_size_t offset,
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 1/8] PCI: xgene: Fix I/O space page leak
@ 2018-07-15 16:03 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:03 UTC (permalink / raw)
To: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The most feasible solution seemed to introduce devm_pci_remap_iospace()
and call it instead of pci_remap_iospace(), so that the pages get unmapped
automagically on any probe failure.
Looking at the PCI drivers having the same issue, the XGene driver turned
out to be the earliest broken, so I'll have to start with fixing it...
Fixes: 5f6b6ccdbe1c ("PCI: xgene: Add APM X-Gene PCIe driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-xgene.c | 2 -
drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 2 +
3 files changed, 41 insertions(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-xgene.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-xgene.c
+++ pci/drivers/pci/controller/pci-xgene.c
@@ -423,7 +423,7 @@ static int xgene_pcie_map_ranges(struct
case IORESOURCE_IO:
xgene_pcie_setup_ob_reg(port, res, OMR3BARL, io_base,
res->start - window->offset);
- ret = pci_remap_iospace(res, io_base);
+ ret = devm_pci_remap_iospace(dev, res, io_base);
if (ret < 0)
return ret;
break;
Index: pci/drivers/pci/pci.c
===================================================================
--- pci.orig/drivers/pci/pci.c
+++ pci/drivers/pci/pci.c
@@ -3579,6 +3579,44 @@ void pci_unmap_iospace(struct resource *
}
EXPORT_SYMBOL(pci_unmap_iospace);
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+ struct resource **res = ptr;
+
+ pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace(). Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr)
+{
+ const struct resource **ptr;
+ int error;
+
+ ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ error = pci_remap_iospace(res, phys_addr);
+ if (error) {
+ devres_free(ptr);
+ } else {
+ *ptr = res;
+ devres_add(dev, ptr);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
/**
* devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
* @dev: Generic device to remap IO address for
Index: pci/include/linux/pci.h
===================================================================
--- pci.orig/include/linux/pci.h
+++ pci/include/linux/pci.h
@@ -1240,6 +1240,8 @@ int pci_register_io_range(struct fwnode_
unsigned long pci_address_to_pio(phys_addr_t addr);
phys_addr_t pci_pio_to_address(unsigned long pio);
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr);
void pci_unmap_iospace(struct resource *res);
void __iomem *devm_pci_remap_cfgspace(struct device *dev,
resource_size_t offset,
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 2/8] PCI: of: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (3 preceding siblings ...)
(?)
@ 2018-07-15 16:06 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:06 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi; +Cc: linux-renesas-soc
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The most feasible solution seemed to introduce devm_pci_remap_iospace() --
which was done in the XGene PCIe driver patch posted earlier...
Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/of.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/of.c
===================================================================
--- pci.orig/drivers/pci/of.c
+++ pci/drivers/pci/of.c
@@ -612,7 +612,7 @@ int pci_parse_request_of_pci_ranges(stru
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 3/8] PCI: versatile: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
@ 2018-07-15 16:08 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:08 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi, Rob Herring; +Cc: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that iff
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The Versatile PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: b7e78170efd4 ("PCI: versatile: Add DT-based ARM Versatile PB PCIe host driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-versatile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-versatile.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-versatile.c
+++ pci/drivers/pci/controller/pci-versatile.c
@@ -82,7 +82,7 @@ static int versatile_pci_parse_request_o
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 3/8] PCI: versatile: Fix I/O space page leak
@ 2018-07-15 16:08 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:08 UTC (permalink / raw)
To: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that iff
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The Versatile PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: b7e78170efd4 ("PCI: versatile: Add DT-based ARM Versatile PB PCIe host driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-versatile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-versatile.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-versatile.c
+++ pci/drivers/pci/controller/pci-versatile.c
@@ -82,7 +82,7 @@ static int versatile_pci_parse_request_o
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 4/8] PCI: designware: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (5 preceding siblings ...)
(?)
@ 2018-07-15 16:13 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:13 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Jingoo Han, Joao Pinto, Lorenzo Pieralisi
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The DesignWare PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: cbce7900598c ("PCI: designware: Make driver arch-agnostic")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Jingoo Han <jingoohan1@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: pci/drivers/pci/controller/dwc/pcie-designware-host.c
===================================================================
--- pci.orig/drivers/pci/controller/dwc/pcie-designware-host.c
+++ pci/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -363,7 +363,8 @@ int dw_pcie_host_init(struct pcie_port *
resource_list_for_each_entry_safe(win, tmp, &bridge->windows) {
switch (resource_type(win->res)) {
case IORESOURCE_IO:
- ret = pci_remap_iospace(win->res, pp->io_base);
+ ret = devm_pci_remap_iospace(dev, win->res,
+ pp->io_base);
if (ret) {
dev_warn(dev, "Error %d: failed to map resource %pR\n",
ret, win->res);
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 5/8] PCI: aardvark: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
@ 2018-07-15 16:23 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:23 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi, Thomas Petazzoni
Cc: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The Aardvark PCI driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: 8c39d710363c ("PCI: aardvark: Add Aardvark PCI host controller driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-aardvark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-aardvark.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-aardvark.c
+++ pci/drivers/pci/controller/pci-aardvark.c
@@ -849,7 +849,7 @@ static int advk_pcie_parse_request_of_pc
0, 0xF8000000, 0,
lower_32_bits(res->start),
OB_PCIE_IO);
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 5/8] PCI: aardvark: Fix I/O space page leak
@ 2018-07-15 16:23 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:23 UTC (permalink / raw)
To: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The Aardvark PCI driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: 8c39d710363c ("PCI: aardvark: Add Aardvark PCI host controller driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-aardvark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-aardvark.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-aardvark.c
+++ pci/drivers/pci/controller/pci-aardvark.c
@@ -849,7 +849,7 @@ static int advk_pcie_parse_request_of_pc
0, 0xF8000000, 0,
lower_32_bits(res->start),
OB_PCIE_IO);
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 6/8] PCI: faraday: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (7 preceding siblings ...)
(?)
@ 2018-07-15 16:28 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:28 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi
When testing the R-Car PCIe driver on the Condor board, I noticed that iff
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The Faraday PCI driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the
XGene PCIe driver patch posted earlier...
Fixes: d3c68e0a7e34 ("PCI: faraday: Add Faraday Technology FTPCI100 PCI Host Bridge driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-ftpci100.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-ftpci100.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-ftpci100.c
+++ pci/drivers/pci/controller/pci-ftpci100.c
@@ -503,7 +503,7 @@ static int faraday_pci_probe(struct plat
dev_err(dev, "illegal IO mem size\n");
return -EINVAL;
}
- ret = pci_remap_iospace(io, io_base);
+ ret = devm_pci_remap_iospace(dev, io, io_base);
if (ret) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
ret, io);
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 7/8] PCI: mediatek: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
(?)
@ 2018-07-15 16:31 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:31 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi, Ryder Lee, Matthias Brugger
Cc: linux-mediatek, linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The MediatTek PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: 637cfacae96f ("PCI: mediatek: Add MediaTek PCIe host controller support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pcie-mediatek.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pcie-mediatek.c
===================================================================
--- pci.orig/drivers/pci/controller/pcie-mediatek.c
+++ pci/drivers/pci/controller/pcie-mediatek.c
@@ -1109,7 +1109,7 @@ static int mtk_pcie_request_resources(st
if (err < 0)
return err;
- pci_remap_iospace(&pcie->pio, pcie->io.start);
+ devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start);
return 0;
}
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 7/8] PCI: mediatek: Fix I/O space page leak
@ 2018-07-15 16:31 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:31 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi, Ryder Lee, Matthias Brugger
Cc: linux-mediatek, linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The MediatTek PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: 637cfacae96f ("PCI: mediatek: Add MediaTek PCIe host controller support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pcie-mediatek.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pcie-mediatek.c
===================================================================
--- pci.orig/drivers/pci/controller/pcie-mediatek.c
+++ pci/drivers/pci/controller/pcie-mediatek.c
@@ -1109,7 +1109,7 @@ static int mtk_pcie_request_resources(st
if (err < 0)
return err;
- pci_remap_iospace(&pcie->pio, pcie->io.start);
+ devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start);
return 0;
}
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 7/8] PCI: mediatek: Fix I/O space page leak
@ 2018-07-15 16:31 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:31 UTC (permalink / raw)
To: linux-arm-kernel
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The MediatTek PCIe driver has the same issue. The most feasible solution
seemed to introduce devm_pci_remap_iospace() -- which was done in the XGene
PCIe driver patch posted earlier...
Fixes: 637cfacae96f ("PCI: mediatek: Add MediaTek PCIe host controller support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pcie-mediatek.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pcie-mediatek.c
===================================================================
--- pci.orig/drivers/pci/controller/pcie-mediatek.c
+++ pci/drivers/pci/controller/pcie-mediatek.c
@@ -1109,7 +1109,7 @@ static int mtk_pcie_request_resources(st
if (err < 0)
return err;
- pci_remap_iospace(&pcie->pio, pcie->io.start);
+ devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start);
return 0;
}
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 8/8] PCI: v3-semi: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (9 preceding siblings ...)
(?)
@ 2018-07-15 16:34 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-15 16:34 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci, Lorenzo Pieralisi, Linus Walleij
When testing the R-Car PCIe driver on the Condor board, I noticed that if
I left the PCIe PHY driver disabled, the kernel crashed with this BUG:
[ 1.225819] kernel BUG at lib/ioremap.c:72!
[ 1.230007] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 1.235496] Modules linked in:
[ 1.238561] CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
[ 1.245526] Hardware name: Renesas Condor board based on r8a77980 (DT)
[ 1.252075] Workqueue: events deferred_probe_work_func
[ 1.257220] pstate: 80000005 (Nzcv daif -PAN -UAO)
[ 1.262024] pc : ioremap_page_range+0x370/0x3c8
[ 1.266558] lr : ioremap_page_range+0x40/0x3c8
[ 1.271002] sp : ffff000008da39e0
[ 1.274317] x29: ffff000008da39e0 x28: 00e8000000000f07
[ 1.279636] x27: ffff7dfffee00000 x26: 0140000000000000
[ 1.284954] x25: ffff7dfffef00000 x24: 00000000000fe100
[ 1.290272] x23: ffff80007b906000 x22: ffff000008ab8000
[ 1.295590] x21: ffff000008bb1d58 x20: ffff7dfffef00000
[ 1.300909] x19: ffff800009c30fb8 x18: 0000000000000001
[ 1.306226] x17: 00000000000152d0 x16: 00000000014012d0
[ 1.311544] x15: 0000000000000000 x14: 0720072007200720
[ 1.316862] x13: 0720072007200720 x12: 0720072007200720
[ 1.322180] x11: 0720072007300730 x10: 00000000000000ae
[ 1.327498] x9 : 0000000000000000 x8 : ffff7dffff000000
[ 1.332816] x7 : 0000000000000000 x6 : 0000000000000100
[ 1.338134] x5 : 0000000000000000 x4 : 000000007b906000
[ 1.343452] x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
[ 1.348770] x1 : 0000000040000000 x0 : 00e80000fe100f07
[ 1.354090] Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
[ 1.361056] Call trace:
[ 1.363504] ioremap_page_range+0x370/0x3c8
[ 1.367695] pci_remap_iospace+0x7c/0xac
[ 1.371624] pci_parse_request_of_pci_ranges+0x13c/0x190
[ 1.376945] rcar_pcie_probe+0x4c/0xb04
[ 1.380786] platform_drv_probe+0x50/0xbc
[ 1.384799] driver_probe_device+0x21c/0x308
[ 1.389072] __device_attach_driver+0x98/0xc8
[ 1.393431] bus_for_each_drv+0x54/0x94
[ 1.397269] __device_attach+0xc4/0x12c
[ 1.401107] device_initial_probe+0x10/0x18
[ 1.405292] bus_probe_device+0x90/0x98
[ 1.409130] deferred_probe_work_func+0xb0/0x150
[ 1.413756] process_one_work+0x12c/0x29c
[ 1.417768] worker_thread+0x200/0x3fc
[ 1.421522] kthread+0x108/0x134
[ 1.424755] ret_from_fork+0x10/0x18
[ 1.428334] Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
The V3 Semiconductor PCI driver has the same issue. The most feasible
solution seemed to introduce devm_pci_remap_iospace() -- which was done
in the XGene PCIe driver patch posted earlier...
Fixes: 68a15eb7bd0c ("PCI: v3-semi: Add V3 Semiconductor PCI host driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/pci-v3-semi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pci/drivers/pci/controller/pci-v3-semi.c
===================================================================
--- pci.orig/drivers/pci/controller/pci-v3-semi.c
+++ pci/drivers/pci/controller/pci-v3-semi.c
@@ -537,7 +537,7 @@ static int v3_pci_setup_resource(struct
v3->io_bus_addr = io->start - win->offset;
dev_dbg(dev, "I/O window %pR, bus addr %pap\n",
io, &v3->io_bus_addr);
- ret = pci_remap_iospace(io, io_base);
+ ret = devm_pci_remap_iospace(dev, io, io_base);
if (ret) {
dev_warn(dev,
"error %d: failed to map resource %pR\n",
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
2018-07-15 16:00 ` Sergei Shtylyov
(?)
(?)
@ 2018-07-16 15:06 ` Lorenzo Pieralisi
-1 siblings, 0 replies; 31+ messages in thread
From: Lorenzo Pieralisi @ 2018-07-16 15:06 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Bjorn Helgaas, linux-pci, Linus Walleij, Jingoo Han, Joao Pinto,
Thomas Petazzoni, Rob Herring, Tanmay Inamdar, Ryder Lee,
Matthias Brugger, linux-arm-kernel, linux-mediatek,
linux-renesas-soc
On Sun, Jul 15, 2018 at 07:00:21PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
> (and the kernel BUG caused by them on deferred probe); those were 1st found
> testing the R-Car PCIe driver. The patches are in the chronological order
> (considering the date/time of the commits specified in the Fixes: tag), patches
> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
> device API that they all use...
>
> [1/8] PCI: xgene: Fix I/O space page leak
> [2/8] PCI: of: Fix I/O space page leak
> [3/8] PCI: versatile: Fix I/O space page leak
> [4/8] PCI: designware: Fix I/O space page leak
> [5/8] PCI: aardvark: Fix I/O space page leak
> [6/8] PCI: faraday: Fix I/O space page leak
> [7/8] PCI: mediatek: Fix I/O space page leak
> [8/8] PCI: v3-semi: Fix I/O space page leak
>
> MBR, Sergei
Hi Sergei,
I reshuffled the series, rewrote commit logs and move the devm_
API to commit 2 which is the one you tested AFAIK.
I pushed them out to my pci/controller-fixes branch which I hope
we can still aim for an -rc, please do have a look and let me know
what you think, I have not asked Bjorn to pull it yet.
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 15:06 ` Lorenzo Pieralisi
0 siblings, 0 replies; 31+ messages in thread
From: Lorenzo Pieralisi @ 2018-07-16 15:06 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Thomas Petazzoni, Rob Herring, Joao Pinto, linux-pci,
Linus Walleij, linux-renesas-soc, Matthias Brugger, Ryder Lee,
linux-mediatek, Tanmay Inamdar, Jingoo Han, Bjorn Helgaas,
linux-arm-kernel
On Sun, Jul 15, 2018 at 07:00:21PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
> (and the kernel BUG caused by them on deferred probe); those were 1st found
> testing the R-Car PCIe driver. The patches are in the chronological order
> (considering the date/time of the commits specified in the Fixes: tag), patches
> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
> device API that they all use...
>
> [1/8] PCI: xgene: Fix I/O space page leak
> [2/8] PCI: of: Fix I/O space page leak
> [3/8] PCI: versatile: Fix I/O space page leak
> [4/8] PCI: designware: Fix I/O space page leak
> [5/8] PCI: aardvark: Fix I/O space page leak
> [6/8] PCI: faraday: Fix I/O space page leak
> [7/8] PCI: mediatek: Fix I/O space page leak
> [8/8] PCI: v3-semi: Fix I/O space page leak
>
> MBR, Sergei
Hi Sergei,
I reshuffled the series, rewrote commit logs and move the devm_
API to commit 2 which is the one you tested AFAIK.
I pushed them out to my pci/controller-fixes branch which I hope
we can still aim for an -rc, please do have a look and let me know
what you think, I have not asked Bjorn to pull it yet.
Thanks,
Lorenzo
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 15:06 ` Lorenzo Pieralisi
0 siblings, 0 replies; 31+ messages in thread
From: Lorenzo Pieralisi @ 2018-07-16 15:06 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Thomas Petazzoni, Rob Herring, Joao Pinto, linux-pci,
Linus Walleij, linux-renesas-soc, Matthias Brugger, Ryder Lee,
linux-mediatek, Tanmay Inamdar, Jingoo Han, Bjorn Helgaas,
linux-arm-kernel
On Sun, Jul 15, 2018 at 07:00:21PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
> (and the kernel BUG caused by them on deferred probe); those were 1st found
> testing the R-Car PCIe driver. The patches are in the chronological order
> (considering the date/time of the commits specified in the Fixes: tag), patches
> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
> device API that they all use...
>
> [1/8] PCI: xgene: Fix I/O space page leak
> [2/8] PCI: of: Fix I/O space page leak
> [3/8] PCI: versatile: Fix I/O space page leak
> [4/8] PCI: designware: Fix I/O space page leak
> [5/8] PCI: aardvark: Fix I/O space page leak
> [6/8] PCI: faraday: Fix I/O space page leak
> [7/8] PCI: mediatek: Fix I/O space page leak
> [8/8] PCI: v3-semi: Fix I/O space page leak
>
> MBR, Sergei
Hi Sergei,
I reshuffled the series, rewrote commit logs and move the devm_
API to commit 2 which is the one you tested AFAIK.
I pushed them out to my pci/controller-fixes branch which I hope
we can still aim for an -rc, please do have a look and let me know
what you think, I have not asked Bjorn to pull it yet.
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 15:06 ` Lorenzo Pieralisi
0 siblings, 0 replies; 31+ messages in thread
From: Lorenzo Pieralisi @ 2018-07-16 15:06 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 15, 2018 at 07:00:21PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
> (and the kernel BUG caused by them on deferred probe); those were 1st found
> testing the R-Car PCIe driver. The patches are in the chronological order
> (considering the date/time of the commits specified in the Fixes: tag), patches
> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
> device API that they all use...
>
> [1/8] PCI: xgene: Fix I/O space page leak
> [2/8] PCI: of: Fix I/O space page leak
> [3/8] PCI: versatile: Fix I/O space page leak
> [4/8] PCI: designware: Fix I/O space page leak
> [5/8] PCI: aardvark: Fix I/O space page leak
> [6/8] PCI: faraday: Fix I/O space page leak
> [7/8] PCI: mediatek: Fix I/O space page leak
> [8/8] PCI: v3-semi: Fix I/O space page leak
>
> MBR, Sergei
Hi Sergei,
I reshuffled the series, rewrote commit logs and move the devm_
API to commit 2 which is the one you tested AFAIK.
I pushed them out to my pci/controller-fixes branch which I hope
we can still aim for an -rc, please do have a look and let me know
what you think, I have not asked Bjorn to pull it yet.
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
2018-07-16 15:06 ` Lorenzo Pieralisi
(?)
(?)
@ 2018-07-16 18:50 ` Sergei Shtylyov
-1 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-16 18:50 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Bjorn Helgaas, linux-pci, Linus Walleij, Jingoo Han, Joao Pinto,
Thomas Petazzoni, Rob Herring, Tanmay Inamdar, Ryder Lee,
Matthias Brugger, linux-arm-kernel, linux-mediatek,
linux-renesas-soc
On 07/16/2018 06:06 PM, Lorenzo Pieralisi wrote:
>> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
>> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
>> (and the kernel BUG caused by them on deferred probe); those were 1st found
>> testing the R-Car PCIe driver. The patches are in the chronological order
>> (considering the date/time of the commits specified in the Fixes: tag), patches
>> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
>> device API that they all use...
>>
>> [1/8] PCI: xgene: Fix I/O space page leak
>> [2/8] PCI: of: Fix I/O space page leak
>> [3/8] PCI: versatile: Fix I/O space page leak
>> [4/8] PCI: designware: Fix I/O space page leak
>> [5/8] PCI: aardvark: Fix I/O space page leak
>> [6/8] PCI: faraday: Fix I/O space page leak
>> [7/8] PCI: mediatek: Fix I/O space page leak
>> [8/8] PCI: v3-semi: Fix I/O space page leak
>>
>> MBR, Sergei
>
> Hi Sergei,
>
> I reshuffled the series, rewrote commit logs and move the devm_
> API to commit 2 which is the one you tested AFAIK.
Well, that means the XGene fix wouldn't propagate "deep enough", if that's your
choice, OK...
> I pushed them out to my pci/controller-fixes branch which I hope
> we can still aim for an -rc, please do have a look and let me know
> what you think, I have not asked Bjorn to pull it yet.
Your edits generally look fine, except you forgot the usual "X has the same issue"
phrase in the XGene's commit log.
> Thanks,
> Lorenzo
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 18:50 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-16 18:50 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Thomas Petazzoni, Rob Herring, Joao Pinto, linux-pci,
Linus Walleij, linux-renesas-soc, Matthias Brugger, Ryder Lee,
linux-mediatek, Tanmay Inamdar, Jingoo Han, Bjorn Helgaas,
linux-arm-kernel
On 07/16/2018 06:06 PM, Lorenzo Pieralisi wrote:
>> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
>> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
>> (and the kernel BUG caused by them on deferred probe); those were 1st found
>> testing the R-Car PCIe driver. The patches are in the chronological order
>> (considering the date/time of the commits specified in the Fixes: tag), patches
>> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
>> device API that they all use...
>>
>> [1/8] PCI: xgene: Fix I/O space page leak
>> [2/8] PCI: of: Fix I/O space page leak
>> [3/8] PCI: versatile: Fix I/O space page leak
>> [4/8] PCI: designware: Fix I/O space page leak
>> [5/8] PCI: aardvark: Fix I/O space page leak
>> [6/8] PCI: faraday: Fix I/O space page leak
>> [7/8] PCI: mediatek: Fix I/O space page leak
>> [8/8] PCI: v3-semi: Fix I/O space page leak
>>
>> MBR, Sergei
>
> Hi Sergei,
>
> I reshuffled the series, rewrote commit logs and move the devm_
> API to commit 2 which is the one you tested AFAIK.
Well, that means the XGene fix wouldn't propagate "deep enough", if that's your
choice, OK...
> I pushed them out to my pci/controller-fixes branch which I hope
> we can still aim for an -rc, please do have a look and let me know
> what you think, I have not asked Bjorn to pull it yet.
Your edits generally look fine, except you forgot the usual "X has the same issue"
phrase in the XGene's commit log.
> Thanks,
> Lorenzo
MBR, Sergei
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 18:50 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-16 18:50 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Thomas Petazzoni, Rob Herring, Joao Pinto, linux-pci,
Linus Walleij, linux-renesas-soc, Matthias Brugger, Ryder Lee,
linux-mediatek, Tanmay Inamdar, Jingoo Han, Bjorn Helgaas,
linux-arm-kernel
On 07/16/2018 06:06 PM, Lorenzo Pieralisi wrote:
>> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
>> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
>> (and the kernel BUG caused by them on deferred probe); those were 1st found
>> testing the R-Car PCIe driver. The patches are in the chronological order
>> (considering the date/time of the commits specified in the Fixes: tag), patches
>> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
>> device API that they all use...
>>
>> [1/8] PCI: xgene: Fix I/O space page leak
>> [2/8] PCI: of: Fix I/O space page leak
>> [3/8] PCI: versatile: Fix I/O space page leak
>> [4/8] PCI: designware: Fix I/O space page leak
>> [5/8] PCI: aardvark: Fix I/O space page leak
>> [6/8] PCI: faraday: Fix I/O space page leak
>> [7/8] PCI: mediatek: Fix I/O space page leak
>> [8/8] PCI: v3-semi: Fix I/O space page leak
>>
>> MBR, Sergei
>
> Hi Sergei,
>
> I reshuffled the series, rewrote commit logs and move the devm_
> API to commit 2 which is the one you tested AFAIK.
Well, that means the XGene fix wouldn't propagate "deep enough", if that's your
choice, OK...
> I pushed them out to my pci/controller-fixes branch which I hope
> we can still aim for an -rc, please do have a look and let me know
> what you think, I have not asked Bjorn to pull it yet.
Your edits generally look fine, except you forgot the usual "X has the same issue"
phrase in the XGene's commit log.
> Thanks,
> Lorenzo
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/8] Fix PCI I/O space page leaks
@ 2018-07-16 18:50 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-07-16 18:50 UTC (permalink / raw)
To: linux-arm-kernel
On 07/16/2018 06:06 PM, Lorenzo Pieralisi wrote:
>> Here's a set of 8 patches against the 'pci/controller-fixes' branch of Lorenzo
>> Pieralisi's 'pci.git' repo. They are the fixes for the PCI I/O space page leaks
>> (and the kernel BUG caused by them on deferred probe); those were 1st found
>> testing the R-Car PCIe driver. The patches are in the chronological order
>> (considering the date/time of the commits specified in the Fixes: tag), patches
>> #2..#8 depend on the patch #1 in order to build/work as it introduces the managed
>> device API that they all use...
>>
>> [1/8] PCI: xgene: Fix I/O space page leak
>> [2/8] PCI: of: Fix I/O space page leak
>> [3/8] PCI: versatile: Fix I/O space page leak
>> [4/8] PCI: designware: Fix I/O space page leak
>> [5/8] PCI: aardvark: Fix I/O space page leak
>> [6/8] PCI: faraday: Fix I/O space page leak
>> [7/8] PCI: mediatek: Fix I/O space page leak
>> [8/8] PCI: v3-semi: Fix I/O space page leak
>>
>> MBR, Sergei
>
> Hi Sergei,
>
> I reshuffled the series, rewrote commit logs and move the devm_
> API to commit 2 which is the one you tested AFAIK.
Well, that means the XGene fix wouldn't propagate "deep enough", if that's your
choice, OK...
> I pushed them out to my pci/controller-fixes branch which I hope
> we can still aim for an -rc, please do have a look and let me know
> what you think, I have not asked Bjorn to pull it yet.
Your edits generally look fine, except you forgot the usual "X has the same issue"
phrase in the XGene's commit log.
> Thanks,
> Lorenzo
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 4.14.y] PCI: OF: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (11 preceding siblings ...)
(?)
@ 2018-08-23 19:55 ` Sergei Shtylyov
2018-08-24 6:49 ` Greg Kroah-Hartman
-1 siblings, 1 reply; 31+ messages in thread
From: Sergei Shtylyov @ 2018-08-23 19:55 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable; +Cc: Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
driver was left disabled, the kernel crashed with this BUG:
kernel BUG at lib/ioremap.c:72!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
Hardware name: Renesas Condor board based on r8a77980 (DT)
Workqueue: events deferred_probe_work_func
pstate: 80000005 (Nzcv daif -PAN -UAO)
pc : ioremap_page_range+0x370/0x3c8
lr : ioremap_page_range+0x40/0x3c8
sp : ffff000008da39e0
x29: ffff000008da39e0 x28: 00e8000000000f07
x27: ffff7dfffee00000 x26: 0140000000000000
x25: ffff7dfffef00000 x24: 00000000000fe100
x23: ffff80007b906000 x22: ffff000008ab8000
x21: ffff000008bb1d58 x20: ffff7dfffef00000
x19: ffff800009c30fb8 x18: 0000000000000001
x17: 00000000000152d0 x16: 00000000014012d0
x15: 0000000000000000 x14: 0720072007200720
x13: 0720072007200720 x12: 0720072007200720
x11: 0720072007300730 x10: 00000000000000ae
x9 : 0000000000000000 x8 : ffff7dffff000000
x7 : 0000000000000000 x6 : 0000000000000100
x5 : 0000000000000000 x4 : 000000007b906000
x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
x1 : 0000000040000000 x0 : 00e80000fe100f07
Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
Call trace:
ioremap_page_range+0x370/0x3c8
pci_remap_iospace+0x7c/0xac
pci_parse_request_of_pci_ranges+0x13c/0x190
rcar_pcie_probe+0x4c/0xb04
platform_drv_probe+0x50/0xbc
driver_probe_device+0x21c/0x308
__device_attach_driver+0x98/0xc8
bus_for_each_drv+0x54/0x94
__device_attach+0xc4/0x12c
device_initial_probe+0x10/0x18
bus_probe_device+0x90/0x98
deferred_probe_work_func+0xb0/0x150
process_one_work+0x12c/0x29c
worker_thread+0x200/0x3fc
kthread+0x108/0x134
ret_from_fork+0x10/0x18
Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
Introduce the devm_pci_remap_iospace() managed API and replace the
pci_remap_iospace() call with it to fix the bug.
Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[lorenzo.pieralisi@arm.com: split commit/updated the commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pci/host/pci-host-common.c | 2 -
drivers/pci/host/pcie-rcar.c | 2 -
drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 2 +
4 files changed, 42 insertions(+), 2 deletions(-)
Index: linux-stable/drivers/pci/host/pci-host-common.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pci-host-common.c
+++ linux-stable/drivers/pci/host/pci-host-common.c
@@ -45,7 +45,7 @@ static int gen_pci_parse_request_of_pci_
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/host/pcie-rcar.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pcie-rcar.c
+++ linux-stable/drivers/pci/host/pcie-rcar.c
@@ -1105,7 +1105,7 @@ static int rcar_pcie_parse_request_of_pc
struct resource *res = win->res;
if (resource_type(res) == IORESOURCE_IO) {
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/pci.c
===================================================================
--- linux-stable.orig/drivers/pci/pci.c
+++ linux-stable/drivers/pci/pci.c
@@ -3446,6 +3446,44 @@ void pci_unmap_iospace(struct resource *
}
EXPORT_SYMBOL(pci_unmap_iospace);
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+ struct resource **res = ptr;
+
+ pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace(). Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr)
+{
+ const struct resource **ptr;
+ int error;
+
+ ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ error = pci_remap_iospace(res, phys_addr);
+ if (error) {
+ devres_free(ptr);
+ } else {
+ *ptr = res;
+ devres_add(dev, ptr);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
/**
* devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
* @dev: Generic device to remap IO address for
Index: linux-stable/include/linux/pci.h
===================================================================
--- linux-stable.orig/include/linux/pci.h
+++ linux-stable/include/linux/pci.h
@@ -1235,6 +1235,8 @@ int pci_register_io_range(phys_addr_t ad
unsigned long pci_address_to_pio(phys_addr_t addr);
phys_addr_t pci_pio_to_address(unsigned long pio);
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr);
void pci_unmap_iospace(struct resource *res);
void __iomem *devm_pci_remap_cfgspace(struct device *dev,
resource_size_t offset,
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 4.9.y] PCI: OF: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (12 preceding siblings ...)
(?)
@ 2018-08-23 20:04 ` Sergei Shtylyov
2018-08-23 20:10 ` Sergei Shtylyov
-1 siblings, 1 reply; 31+ messages in thread
From: Sergei Shtylyov @ 2018-08-23 20:04 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable; +Cc: Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
driver was left disabled, the kernel crashed with this BUG:
kernel BUG at lib/ioremap.c:72!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
Hardware name: Renesas Condor board based on r8a77980 (DT)
Workqueue: events deferred_probe_work_func
pstate: 80000005 (Nzcv daif -PAN -UAO)
pc : ioremap_page_range+0x370/0x3c8
lr : ioremap_page_range+0x40/0x3c8
sp : ffff000008da39e0
x29: ffff000008da39e0 x28: 00e8000000000f07
x27: ffff7dfffee00000 x26: 0140000000000000
x25: ffff7dfffef00000 x24: 00000000000fe100
x23: ffff80007b906000 x22: ffff000008ab8000
x21: ffff000008bb1d58 x20: ffff7dfffef00000
x19: ffff800009c30fb8 x18: 0000000000000001
x17: 00000000000152d0 x16: 00000000014012d0
x15: 0000000000000000 x14: 0720072007200720
x13: 0720072007200720 x12: 0720072007200720
x11: 0720072007300730 x10: 00000000000000ae
x9 : 0000000000000000 x8 : ffff7dffff000000
x7 : 0000000000000000 x6 : 0000000000000100
x5 : 0000000000000000 x4 : 000000007b906000
x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
x1 : 0000000040000000 x0 : 00e80000fe100f07
Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
Call trace:
ioremap_page_range+0x370/0x3c8
pci_remap_iospace+0x7c/0xac
pci_parse_request_of_pci_ranges+0x13c/0x190
rcar_pcie_probe+0x4c/0xb04
platform_drv_probe+0x50/0xbc
driver_probe_device+0x21c/0x308
__device_attach_driver+0x98/0xc8
bus_for_each_drv+0x54/0x94
__device_attach+0xc4/0x12c
device_initial_probe+0x10/0x18
bus_probe_device+0x90/0x98
deferred_probe_work_func+0xb0/0x150
process_one_work+0x12c/0x29c
worker_thread+0x200/0x3fc
kthread+0x108/0x134
ret_from_fork+0x10/0x18
Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
Introduce the devm_pci_remap_iospace() managed API and replace the
pci_remap_iospace() call with it to fix the bug.
Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[lorenzo.pieralisi@arm.com: split commit/updated the commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pci/host/pci-host-common.c | 2 -
drivers/pci/host/pcie-rcar.c | 2 -
drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 2 +
4 files changed, 42 insertions(+), 2 deletions(-)
Index: linux-stable/drivers/pci/host/pci-host-common.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pci-host-common.c
+++ linux-stable/drivers/pci/host/pci-host-common.c
@@ -45,7 +45,7 @@ static int gen_pci_parse_request_of_pci_
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/host/pcie-rcar.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pcie-rcar.c
+++ linux-stable/drivers/pci/host/pcie-rcar.c
@@ -1102,7 +1102,7 @@ static int rcar_pcie_parse_request_of_pc
struct resource *res = win->res;
if (resource_type(res) == IORESOURCE_IO) {
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/pci.c
===================================================================
--- linux-stable.orig/drivers/pci/pci.c
+++ linux-stable/drivers/pci/pci.c
@@ -3436,6 +3436,44 @@ char * __weak __init pcibios_setup(char
return str;
}
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+ struct resource **res = ptr;
+
+ pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace(). Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr)
+{
+ const struct resource **ptr;
+ int error;
+
+ ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ error = pci_remap_iospace(res, phys_addr);
+ if (error) {
+ devres_free(ptr);
+ } else {
+ *ptr = res;
+ devres_add(dev, ptr);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
/**
* pcibios_set_master - enable PCI bus-mastering for device dev
* @dev: the PCI device to enable
Index: linux-stable/include/linux/pci.h
===================================================================
--- linux-stable.orig/include/linux/pci.h
+++ linux-stable/include/linux/pci.h
@@ -1190,6 +1190,8 @@ int pci_register_io_range(phys_addr_t ad
unsigned long pci_address_to_pio(phys_addr_t addr);
phys_addr_t pci_pio_to_address(unsigned long pio);
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr);
void pci_unmap_iospace(struct resource *res);
static inline pci_bus_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 4.9.y] PCI: OF: Fix I/O space page leak
2018-08-23 20:04 ` [PATCH 4.9.y] " Sergei Shtylyov
@ 2018-08-23 20:10 ` Sergei Shtylyov
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Shtylyov @ 2018-08-23 20:10 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable; +Cc: Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
On 08/23/2018 11:04 PM, Sergei Shtylyov wrote:
> Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
>
> When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
> driver was left disabled, the kernel crashed with this BUG:
>
> kernel BUG at lib/ioremap.c:72!
> Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
> Hardware name: Renesas Condor board based on r8a77980 (DT)
> Workqueue: events deferred_probe_work_func
> pstate: 80000005 (Nzcv daif -PAN -UAO)
> pc : ioremap_page_range+0x370/0x3c8
> lr : ioremap_page_range+0x40/0x3c8
> sp : ffff000008da39e0
> x29: ffff000008da39e0 x28: 00e8000000000f07
> x27: ffff7dfffee00000 x26: 0140000000000000
> x25: ffff7dfffef00000 x24: 00000000000fe100
> x23: ffff80007b906000 x22: ffff000008ab8000
> x21: ffff000008bb1d58 x20: ffff7dfffef00000
> x19: ffff800009c30fb8 x18: 0000000000000001
> x17: 00000000000152d0 x16: 00000000014012d0
> x15: 0000000000000000 x14: 0720072007200720
> x13: 0720072007200720 x12: 0720072007200720
> x11: 0720072007300730 x10: 00000000000000ae
> x9 : 0000000000000000 x8 : ffff7dffff000000
> x7 : 0000000000000000 x6 : 0000000000000100
> x5 : 0000000000000000 x4 : 000000007b906000
> x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
> x1 : 0000000040000000 x0 : 00e80000fe100f07
> Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
> Call trace:
> ioremap_page_range+0x370/0x3c8
> pci_remap_iospace+0x7c/0xac
> pci_parse_request_of_pci_ranges+0x13c/0x190
> rcar_pcie_probe+0x4c/0xb04
> platform_drv_probe+0x50/0xbc
> driver_probe_device+0x21c/0x308
> __device_attach_driver+0x98/0xc8
> bus_for_each_drv+0x54/0x94
> __device_attach+0xc4/0x12c
> device_initial_probe+0x10/0x18
> bus_probe_device+0x90/0x98
> deferred_probe_work_func+0xb0/0x150
> process_one_work+0x12c/0x29c
> worker_thread+0x200/0x3fc
> kthread+0x108/0x134
> ret_from_fork+0x10/0x18
> Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
>
> It turned out that pci_remap_iospace() wasn't undone when the driver's
> probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
> the probe was retried, finally causing the BUG due to trying to remap
> already remapped pages.
>
> Introduce the devm_pci_remap_iospace() managed API and replace the
> pci_remap_iospace() call with it to fix the bug.
>
> Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> [lorenzo.pieralisi@arm.com: split commit/updated the commit log]
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> ---
> drivers/pci/host/pci-host-common.c | 2 -
> drivers/pci/host/pcie-rcar.c | 2 -
> drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
> include/linux/pci.h | 2 +
> 4 files changed, 42 insertions(+), 2 deletions(-)
[...]
> Index: linux-stable/drivers/pci/pci.c
> ===================================================================
> --- linux-stable.orig/drivers/pci/pci.c
> +++ linux-stable/drivers/pci/pci.c
> @@ -3436,6 +3436,44 @@ char * __weak __init pcibios_setup(char
> return str;
> }
>
> +static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
> +{
> + struct resource **res = ptr;
> +
> + pci_unmap_iospace(*res);
> +}
> +
> +/**
> + * devm_pci_remap_iospace - Managed pci_remap_iospace()
> + * @dev: Generic device to remap IO address for
> + * @res: Resource describing the I/O space
> + * @phys_addr: physical address of range to be mapped
> + *
> + * Managed pci_remap_iospace(). Map is automatically unmapped on driver
> + * detach.
> + */
> +int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
> + phys_addr_t phys_addr)
> +{
> + const struct resource **ptr;
> + int error;
> +
> + ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
> + if (!ptr)
> + return -ENOMEM;
> +
> + error = pci_remap_iospace(res, phys_addr);
> + if (error) {
> + devres_free(ptr);
> + } else {
> + *ptr = res;
> + devres_add(dev, ptr);
> + }
> +
> + return error;
> +}
> +EXPORT_SYMBOL(devm_pci_remap_iospace);
> +
Sorry, this hunk was misplaced. Too hasty, reposting...
> /**
> * pcibios_set_master - enable PCI bus-mastering for device dev
> * @dev: the PCI device to enable
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v2 4.9.y] PCI: OF: Fix I/O space page leak
2018-07-15 16:00 ` Sergei Shtylyov
` (13 preceding siblings ...)
(?)
@ 2018-08-23 20:11 ` Sergei Shtylyov
2018-08-24 6:49 ` Greg Kroah-Hartman
-1 siblings, 1 reply; 31+ messages in thread
From: Sergei Shtylyov @ 2018-08-23 20:11 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable; +Cc: Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
driver was left disabled, the kernel crashed with this BUG:
kernel BUG at lib/ioremap.c:72!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
Hardware name: Renesas Condor board based on r8a77980 (DT)
Workqueue: events deferred_probe_work_func
pstate: 80000005 (Nzcv daif -PAN -UAO)
pc : ioremap_page_range+0x370/0x3c8
lr : ioremap_page_range+0x40/0x3c8
sp : ffff000008da39e0
x29: ffff000008da39e0 x28: 00e8000000000f07
x27: ffff7dfffee00000 x26: 0140000000000000
x25: ffff7dfffef00000 x24: 00000000000fe100
x23: ffff80007b906000 x22: ffff000008ab8000
x21: ffff000008bb1d58 x20: ffff7dfffef00000
x19: ffff800009c30fb8 x18: 0000000000000001
x17: 00000000000152d0 x16: 00000000014012d0
x15: 0000000000000000 x14: 0720072007200720
x13: 0720072007200720 x12: 0720072007200720
x11: 0720072007300730 x10: 00000000000000ae
x9 : 0000000000000000 x8 : ffff7dffff000000
x7 : 0000000000000000 x6 : 0000000000000100
x5 : 0000000000000000 x4 : 000000007b906000
x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
x1 : 0000000040000000 x0 : 00e80000fe100f07
Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
Call trace:
ioremap_page_range+0x370/0x3c8
pci_remap_iospace+0x7c/0xac
pci_parse_request_of_pci_ranges+0x13c/0x190
rcar_pcie_probe+0x4c/0xb04
platform_drv_probe+0x50/0xbc
driver_probe_device+0x21c/0x308
__device_attach_driver+0x98/0xc8
bus_for_each_drv+0x54/0x94
__device_attach+0xc4/0x12c
device_initial_probe+0x10/0x18
bus_probe_device+0x90/0x98
deferred_probe_work_func+0xb0/0x150
process_one_work+0x12c/0x29c
worker_thread+0x200/0x3fc
kthread+0x108/0x134
ret_from_fork+0x10/0x18
Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
It turned out that pci_remap_iospace() wasn't undone when the driver's
probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
the probe was retried, finally causing the BUG due to trying to remap
already remapped pages.
Introduce the devm_pci_remap_iospace() managed API and replace the
pci_remap_iospace() call with it to fix the bug.
Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[lorenzo.pieralisi@arm.com: split commit/updated the commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pci/host/pci-host-common.c | 2 -
drivers/pci/host/pcie-rcar.c | 2 -
drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 2 +
4 files changed, 42 insertions(+), 2 deletions(-)
Index: linux-stable/drivers/pci/host/pci-host-common.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pci-host-common.c
+++ linux-stable/drivers/pci/host/pci-host-common.c
@@ -45,7 +45,7 @@ static int gen_pci_parse_request_of_pci_
switch (resource_type(res)) {
case IORESOURCE_IO:
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/host/pcie-rcar.c
===================================================================
--- linux-stable.orig/drivers/pci/host/pcie-rcar.c
+++ linux-stable/drivers/pci/host/pcie-rcar.c
@@ -1102,7 +1102,7 @@ static int rcar_pcie_parse_request_of_pc
struct resource *res = win->res;
if (resource_type(res) == IORESOURCE_IO) {
- err = pci_remap_iospace(res, iobase);
+ err = devm_pci_remap_iospace(dev, res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);
Index: linux-stable/drivers/pci/pci.c
===================================================================
--- linux-stable.orig/drivers/pci/pci.c
+++ linux-stable/drivers/pci/pci.c
@@ -3407,6 +3407,44 @@ void pci_unmap_iospace(struct resource *
#endif
}
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+ struct resource **res = ptr;
+
+ pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace(). Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr)
+{
+ const struct resource **ptr;
+ int error;
+
+ ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ error = pci_remap_iospace(res, phys_addr);
+ if (error) {
+ devres_free(ptr);
+ } else {
+ *ptr = res;
+ devres_add(dev, ptr);
+ }
+
+ return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
static void __pci_set_master(struct pci_dev *dev, bool enable)
{
u16 old_cmd, cmd;
Index: linux-stable/include/linux/pci.h
===================================================================
--- linux-stable.orig/include/linux/pci.h
+++ linux-stable/include/linux/pci.h
@@ -1190,6 +1190,8 @@ int pci_register_io_range(phys_addr_t ad
unsigned long pci_address_to_pio(phys_addr_t addr);
phys_addr_t pci_pio_to_address(unsigned long pio);
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+ phys_addr_t phys_addr);
void pci_unmap_iospace(struct resource *res);
static inline pci_bus_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v2 4.9.y] PCI: OF: Fix I/O space page leak
2018-08-23 20:11 ` [PATCH v2 " Sergei Shtylyov
@ 2018-08-24 6:49 ` Greg Kroah-Hartman
0 siblings, 0 replies; 31+ messages in thread
From: Greg Kroah-Hartman @ 2018-08-24 6:49 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: stable, Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
On Thu, Aug 23, 2018 at 11:11:54PM +0300, Sergei Shtylyov wrote:
> Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
>
> When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
> driver was left disabled, the kernel crashed with this BUG:
>
> kernel BUG at lib/ioremap.c:72!
> Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
> Hardware name: Renesas Condor board based on r8a77980 (DT)
> Workqueue: events deferred_probe_work_func
> pstate: 80000005 (Nzcv daif -PAN -UAO)
> pc : ioremap_page_range+0x370/0x3c8
> lr : ioremap_page_range+0x40/0x3c8
> sp : ffff000008da39e0
> x29: ffff000008da39e0 x28: 00e8000000000f07
> x27: ffff7dfffee00000 x26: 0140000000000000
> x25: ffff7dfffef00000 x24: 00000000000fe100
> x23: ffff80007b906000 x22: ffff000008ab8000
> x21: ffff000008bb1d58 x20: ffff7dfffef00000
> x19: ffff800009c30fb8 x18: 0000000000000001
> x17: 00000000000152d0 x16: 00000000014012d0
> x15: 0000000000000000 x14: 0720072007200720
> x13: 0720072007200720 x12: 0720072007200720
> x11: 0720072007300730 x10: 00000000000000ae
> x9 : 0000000000000000 x8 : ffff7dffff000000
> x7 : 0000000000000000 x6 : 0000000000000100
> x5 : 0000000000000000 x4 : 000000007b906000
> x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
> x1 : 0000000040000000 x0 : 00e80000fe100f07
> Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
> Call trace:
> ioremap_page_range+0x370/0x3c8
> pci_remap_iospace+0x7c/0xac
> pci_parse_request_of_pci_ranges+0x13c/0x190
> rcar_pcie_probe+0x4c/0xb04
> platform_drv_probe+0x50/0xbc
> driver_probe_device+0x21c/0x308
> __device_attach_driver+0x98/0xc8
> bus_for_each_drv+0x54/0x94
> __device_attach+0xc4/0x12c
> device_initial_probe+0x10/0x18
> bus_probe_device+0x90/0x98
> deferred_probe_work_func+0xb0/0x150
> process_one_work+0x12c/0x29c
> worker_thread+0x200/0x3fc
> kthread+0x108/0x134
> ret_from_fork+0x10/0x18
> Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
>
> It turned out that pci_remap_iospace() wasn't undone when the driver's
> probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
> the probe was retried, finally causing the BUG due to trying to remap
> already remapped pages.
>
> Introduce the devm_pci_remap_iospace() managed API and replace the
> pci_remap_iospace() call with it to fix the bug.
>
> Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> [lorenzo.pieralisi@arm.com: split commit/updated the commit log]
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> ---
> drivers/pci/host/pci-host-common.c | 2 -
> drivers/pci/host/pcie-rcar.c | 2 -
> drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
> include/linux/pci.h | 2 +
> 4 files changed, 42 insertions(+), 2 deletions(-)
Now applied, thanks for sticking with this.
greg k-h
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 4.14.y] PCI: OF: Fix I/O space page leak
2018-08-23 19:55 ` [PATCH 4.14.y] PCI: OF: Fix I/O space page leak Sergei Shtylyov
@ 2018-08-24 6:49 ` Greg Kroah-Hartman
0 siblings, 0 replies; 31+ messages in thread
From: Greg Kroah-Hartman @ 2018-08-24 6:49 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: stable, Bjorn Helgaas, Lorenzo Pieralisi, linux-kernel
On Thu, Aug 23, 2018 at 10:55:26PM +0300, Sergei Shtylyov wrote:
> Commit a5fb9fb023a1435f2b42bccd7f547560f3a21dc3 upstream.
>
> When testing the R-Car PCIe driver on the Condor board, if the PCIe PHY
> driver was left disabled, the kernel crashed with this BUG:
>
> kernel BUG at lib/ioremap.c:72!
> Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 39 Comm: kworker/0:1 Not tainted 4.17.0-dirty #1092
> Hardware name: Renesas Condor board based on r8a77980 (DT)
> Workqueue: events deferred_probe_work_func
> pstate: 80000005 (Nzcv daif -PAN -UAO)
> pc : ioremap_page_range+0x370/0x3c8
> lr : ioremap_page_range+0x40/0x3c8
> sp : ffff000008da39e0
> x29: ffff000008da39e0 x28: 00e8000000000f07
> x27: ffff7dfffee00000 x26: 0140000000000000
> x25: ffff7dfffef00000 x24: 00000000000fe100
> x23: ffff80007b906000 x22: ffff000008ab8000
> x21: ffff000008bb1d58 x20: ffff7dfffef00000
> x19: ffff800009c30fb8 x18: 0000000000000001
> x17: 00000000000152d0 x16: 00000000014012d0
> x15: 0000000000000000 x14: 0720072007200720
> x13: 0720072007200720 x12: 0720072007200720
> x11: 0720072007300730 x10: 00000000000000ae
> x9 : 0000000000000000 x8 : ffff7dffff000000
> x7 : 0000000000000000 x6 : 0000000000000100
> x5 : 0000000000000000 x4 : 000000007b906000
> x3 : ffff80007c61a880 x2 : ffff7dfffeefffff
> x1 : 0000000040000000 x0 : 00e80000fe100f07
> Process kworker/0:1 (pid: 39, stack limit = 0x (ptrval))
> Call trace:
> ioremap_page_range+0x370/0x3c8
> pci_remap_iospace+0x7c/0xac
> pci_parse_request_of_pci_ranges+0x13c/0x190
> rcar_pcie_probe+0x4c/0xb04
> platform_drv_probe+0x50/0xbc
> driver_probe_device+0x21c/0x308
> __device_attach_driver+0x98/0xc8
> bus_for_each_drv+0x54/0x94
> __device_attach+0xc4/0x12c
> device_initial_probe+0x10/0x18
> bus_probe_device+0x90/0x98
> deferred_probe_work_func+0xb0/0x150
> process_one_work+0x12c/0x29c
> worker_thread+0x200/0x3fc
> kthread+0x108/0x134
> ret_from_fork+0x10/0x18
> Code: f9004ba2 54000080 aa0003fb 17ffff48 (d4210000)
>
> It turned out that pci_remap_iospace() wasn't undone when the driver's
> probe failed, and since devm_phy_optional_get() returned -EPROBE_DEFER,
> the probe was retried, finally causing the BUG due to trying to remap
> already remapped pages.
>
> Introduce the devm_pci_remap_iospace() managed API and replace the
> pci_remap_iospace() call with it to fix the bug.
>
> Fixes: dbf9826d5797 ("PCI: generic: Convert to DT resource parsing API")
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> [lorenzo.pieralisi@arm.com: split commit/updated the commit log]
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> ---
> drivers/pci/host/pci-host-common.c | 2 -
> drivers/pci/host/pcie-rcar.c | 2 -
> drivers/pci/pci.c | 38 +++++++++++++++++++++++++++++++++++++
> include/linux/pci.h | 2 +
> 4 files changed, 42 insertions(+), 2 deletions(-)
Also now applied.
greg k-h
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2018-08-24 6:49 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-15 16:00 [PATCH 0/8] Fix PCI I/O space page leaks Sergei Shtylyov
2018-07-15 16:00 ` Sergei Shtylyov
2018-07-15 16:00 ` Sergei Shtylyov
2018-07-15 16:00 ` Sergei Shtylyov
2018-07-15 16:03 ` [PATCH 1/8] PCI: xgene: Fix I/O space page leak Sergei Shtylyov
2018-07-15 16:03 ` Sergei Shtylyov
2018-07-15 16:06 ` [PATCH 2/8] PCI: of: " Sergei Shtylyov
2018-07-15 16:08 ` [PATCH 3/8] PCI: versatile: " Sergei Shtylyov
2018-07-15 16:08 ` Sergei Shtylyov
2018-07-15 16:13 ` [PATCH 4/8] PCI: designware: " Sergei Shtylyov
2018-07-15 16:23 ` [PATCH 5/8] PCI: aardvark: " Sergei Shtylyov
2018-07-15 16:23 ` Sergei Shtylyov
2018-07-15 16:28 ` [PATCH 6/8] PCI: faraday: " Sergei Shtylyov
2018-07-15 16:31 ` [PATCH 7/8] PCI: mediatek: " Sergei Shtylyov
2018-07-15 16:31 ` Sergei Shtylyov
2018-07-15 16:31 ` Sergei Shtylyov
2018-07-15 16:34 ` [PATCH 8/8] PCI: v3-semi: " Sergei Shtylyov
2018-07-16 15:06 ` [PATCH 0/8] Fix PCI I/O space page leaks Lorenzo Pieralisi
2018-07-16 15:06 ` Lorenzo Pieralisi
2018-07-16 15:06 ` Lorenzo Pieralisi
2018-07-16 15:06 ` Lorenzo Pieralisi
2018-07-16 18:50 ` Sergei Shtylyov
2018-07-16 18:50 ` Sergei Shtylyov
2018-07-16 18:50 ` Sergei Shtylyov
2018-07-16 18:50 ` Sergei Shtylyov
2018-08-23 19:55 ` [PATCH 4.14.y] PCI: OF: Fix I/O space page leak Sergei Shtylyov
2018-08-24 6:49 ` Greg Kroah-Hartman
2018-08-23 20:04 ` [PATCH 4.9.y] " Sergei Shtylyov
2018-08-23 20:10 ` Sergei Shtylyov
2018-08-23 20:11 ` [PATCH v2 " Sergei Shtylyov
2018-08-24 6:49 ` Greg Kroah-Hartman
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.