| Message ID | 20200616043529.gs2vcdryka7t4hjo@SvensMacBookAir.sven.lan |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/1,v2] mvpp2: remove module bugfix | expand |
From: Sven Auhagen <sven.auhagen@voleatech.de> Date: Tue, 16 Jun 2020 06:35:29 +0200 > The remove function does not destroy all > BM Pools when per cpu pool is active. > > When reloading the mvpp2 as a module the BM Pools > are still active in hardware and due to the bug > have twice the size now old + new. > > This eventually leads to a kernel crash. > > v2: > * add Fixes tag > > Fixes: 7d04b0b13b11 ("mvpp2: percpu buffers") > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 2b5dad2ec650..9d08312c1c47 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5984,7 +5984,7 @@ static int mvpp2_remove(struct platform_device *pdev) struct mvpp2 *priv = platform_get_drvdata(pdev); struct fwnode_handle *fwnode = pdev->dev.fwnode; struct fwnode_handle *port_fwnode; - int i = 0; + int i = 0, poolnum = MVPP2_BM_POOLS_NUM; mvpp2_dbgfs_cleanup(priv); @@ -5998,7 +5998,10 @@ static int mvpp2_remove(struct platform_device *pdev) destroy_workqueue(priv->stats_queue); - for (i = 0; i < MVPP2_BM_POOLS_NUM; i++) { + if (priv->percpu_pools) + poolnum = mvpp2_get_nrxqs(priv) * 2; + + for (i = 0; i < poolnum; i++) { struct mvpp2_bm_pool *bm_pool = &priv->bm_pools[i]; mvpp2_bm_pool_destroy(&pdev->dev, priv, bm_pool);
The remove function does not destroy all BM Pools when per cpu pool is active. When reloading the mvpp2 as a module the BM Pools are still active in hardware and due to the bug have twice the size now old + new. This eventually leads to a kernel crash. v2: * add Fixes tag Fixes: 7d04b0b13b11 ("mvpp2: percpu buffers") Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)