net: ethernet: ti: am65-cpsw: Fix PM runtime leakage in am65_cpsw_nuss_ndo_slave_open()
Subsystems (2)
PATCH 1/1 net: ethernet: ti: am65-cpsw: Fix PM runtime leakage in am65_cpsw_nuss_ndo_slave_open()
Ensure pm_runtime_put() is issued in error path.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +9 -4
@@ -573,20 +573,21 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) reg =cpsw_sl_reg_read (port->slave.mac_sl,CPSW_SL_SOFT_RESET );if (reg) {dev_err (common->dev,"soft RESET didn't complete\n" ); -return -ETIMEDOUT ; + ret = -ETIMEDOUT ; + goto runtime_put; }/* Notify the stack of the actual queue counts. */ ret =netif_set_real_num_tx_queues (ndev, common->tx_ch_num);if (ret) {dev_err (common->dev,"cannot set real number of tx queues\n" ); -return ret; + goto runtime_put; } ret =netif_set_real_num_rx_queues (ndev,AM65_CPSW_MAX_RX_QUEUES );if (ret) {dev_err (common->dev,"cannot set real number of rx queues\n" ); -return ret; + goto runtime_put; }for (i =0 ; i < common->tx_ch_num; i++)
@@ -594,7 +595,7 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) ret =am65_cpsw_nuss_common_open (common);if (ret) -return ret; + goto runtime_put; common->usage_count++;
@@ -622,6 +623,10 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) error_cleanup:am65_cpsw_nuss_ndo_slave_stop (ndev);return ret; + +runtime_put: +pm_runtime_put (common->dev); +return ret; }static void am65_cpsw_nuss_rx_cleanup (void *data,dma_addr_t desc_dma)
Signature · 1 line
2.34.1
Quoted 4 lines · Roger Quadros
Ensure
pm_runtime_put()is issued in error path.Reported-by Jakub Kicinski <[email protected]>Signed-off-by Roger Quadros <[email protected]>
[...]
Quoted 3 lines
(quoted diff) +0
-0@@ -622,6 +623,10 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev)
error_cleanup:am65_cpsw_nuss_ndo_slave_stop(ndev);
BTW, while looking at the ndo_slave_stop() call, it seems to abort if am65_cpsw_nuss_common_stop() fails, but looking deeper at that and it seems am65_cpsw_nuss_common_stop() can never fail, so you might want to fix that.
Quoted 11 lines
return ret;drivers/net/ethernet/ti/am65-cpsw-nuss.c +4
-0+ +runtime_put: +pm_runtime_put (common->dev); +return ret;}
static void
am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma)Signature · 1 line
2.34.1
Quoted 10 lines · Saeed Mahameed
Quoted 4 lines · Roger Quadros
Ensure
pm_runtime_put()is issued in error path.Reported-by Jakub Kicinski <[email protected]>Signed-off-by Roger Quadros <[email protected]>Reviewed-by Saeed Mahameed <[email protected]>
Quoted 7 lines
[...]
Quoted 3 lines
(quoted diff) +0
-0@@ -622,6 +623,10 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev)
error_cleanup:
am65_cpsw_nuss_ndo_slave_stop(ndev);BTW, while looking at the
ndo_slave_stop()call, it seems to abort ifam65_cpsw_nuss_common_stop()fails, but looking deeper at that and it seemsam65_cpsw_nuss_common_stop()can never fail, so you might want to fix that.
You mean we should change it to return void and get rid of error checks on that function. Right?
Quoted 8 lines
Quoted 8 lines
return ret;
drivers/net/ethernet/ti/am65-cpsw-nuss.c +4
-0+ +runtime_put: + pm_runtime_put(common->dev); + return ret;}
Quoted 4 lines
Quoted 4 lines
static void
am65_cpsw_nuss_rx_cleanup(void *data, dma_addr_t desc_dma)--
2.34.1
cheers,
-roger
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 7 lines · On Thu, 8 Dec 2022 12:55:34 +0200 you wrote:
Ensure
pm_runtime_put()is issued in error path.Reported-by Jakub Kicinski <[email protected]>Signed-off-by Roger Quadros <[email protected]>--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Here is the summary with links:
- [net-next] net: ethernet: ti: am65-cpsw: Fix PM runtime leakage in am65_cpsw_nuss_ndo_slave_open()
https://git.kernel.org/netdev/net-next/c/5821504f5073
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html