net: moxart_ether: use devm in probe
Subsystems (2)
PATCH 1/1 net: moxart_ether: use devm in probe
alloc_etherdev and kmalloc_array are called first and destroyed last. Safe to use devm to remove frees.
--- drivers/net/ethernet/moxa/moxart_ether.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/net/ethernet/moxa/moxart_ether.c +6 -13
@@ -81,9 +81,6 @@ static void moxart_mac_free_memory(struct net_device *ndev)dma_free_coherent (&priv->pdev->dev,RX_REG_DESC_SIZE *RX_DESC_NUM , priv->rx_desc_base, priv->rx_base); - -kfree (priv->tx_buf_base); -kfree (priv->rx_buf_base); }static void moxart_mac_reset (struct net_device *ndev)
@@ -461,15 +458,14 @@ static int moxart_mac_probe(struct platform_device *pdev)unsigned int irq;int ret; - ndev =alloc_etherdev (sizeof (struct moxart_mac_priv_t )); + ndev =devm_alloc_etherdev (p_dev,sizeof (struct moxart_mac_priv_t ));if (!ndev)return -ENOMEM ; irq =irq_of_parse_and_map (node,0 );if (irq <=0 ) {netdev_err (ndev,"irq_of_parse_and_map failed\n" ); - ret = -EINVAL ; - goto irq_map_fail; +return -EINVAL ; } priv =netdev_priv (ndev);
@@ -511,15 +507,15 @@ static int moxart_mac_probe(struct platform_device *pdev) goto init_fail; } - priv->tx_buf_base =kmalloc_array (priv->tx_buf_size,TX_DESC_NUM , -GFP_KERNEL ); + priv->tx_buf_base =devm_kmalloc_array (p_dev, priv->tx_buf_size, +TX_DESC_NUM ,GFP_KERNEL );if (!priv->tx_buf_base) { ret = -ENOMEM ; goto init_fail; } - priv->rx_buf_base =kmalloc_array (priv->rx_buf_size,RX_DESC_NUM , -GFP_KERNEL ); + priv->rx_buf_base =devm_kmalloc_array (p_dev, priv->rx_buf_size, +RX_DESC_NUM ,GFP_KERNEL );if (!priv->rx_buf_base) { ret = -ENOMEM ; goto init_fail;
@@ -553,8 +549,6 @@ static int moxart_mac_probe(struct platform_device *pdev) init_fail:netdev_err (ndev,"init failed\n" );moxart_mac_free_memory (ndev); -irq_map_fail: -free_netdev (ndev);return ret; }
@@ -565,7 +559,6 @@ static void moxart_remove(struct platform_device *pdev)unregister_netdev (ndev);devm_free_irq (&pdev->dev, ndev->irq, ndev);moxart_mac_free_memory (ndev); -free_netdev (ndev); }static const struct of_device_id moxart_mac_match[] = {
Signature · 1 line
2.45.2
Le 08/08/2024 à 06:03, Rosen Penev a écrit :
Quoted 5 lines
alloc_etherdevandkmalloc_arrayare called first and destroyed last. Safe to use devm to remove frees.Signed-off-by Rosen Penev <[email protected]>---
Hi,
using dmam_alloc_coherent() would go even one step further I think. It would remove moxart_mac_free_memory() completely.
Then IIUC, using devm_register_netdev() would keep things ordered and moxart_remove() could also be removed completely.
(by inspection only)
CJ
Quoted 72 lines
drivers/net/ethernet/moxa/moxart_ether.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)drivers/net/ethernet/moxa/moxart_ether.c +6
-13@@ -81,9 +81,6 @@ static void moxart_mac_free_memory(struct net_device *ndev)dma_free_coherent (&priv->pdev->dev,RX_REG_DESC_SIZE *RX_DESC_NUM , priv->rx_desc_base, priv->rx_base); - -kfree (priv->tx_buf_base); -kfree (priv->rx_buf_base); }static void moxart_mac_reset (struct net_device *ndev)@@ -461,15 +458,14 @@ static int moxart_mac_probe(struct platform_device *pdev)unsigned int irq;int ret; - ndev =alloc_etherdev (sizeof (struct moxart_mac_priv_t )); + ndev =devm_alloc_etherdev (p_dev,sizeof (struct moxart_mac_priv_t ));if (!ndev)return -ENOMEM ; irq =irq_of_parse_and_map (node,0 );if (irq <=0 ) {netdev_err (ndev,"irq_of_parse_and_map failed\n" ); - ret = -EINVAL ; - goto irq_map_fail; +return -EINVAL ; } priv =netdev_priv (ndev);@@ -511,15 +507,15 @@ static int moxart_mac_probe(struct platform_device *pdev) goto init_fail; } - priv->tx_buf_base =kmalloc_array (priv->tx_buf_size,TX_DESC_NUM , -GFP_KERNEL ); + priv->tx_buf_base =devm_kmalloc_array (p_dev, priv->tx_buf_size, +TX_DESC_NUM ,GFP_KERNEL );if (!priv->tx_buf_base) { ret = -ENOMEM ; goto init_fail; } - priv->rx_buf_base =kmalloc_array (priv->rx_buf_size,RX_DESC_NUM , -GFP_KERNEL ); + priv->rx_buf_base =devm_kmalloc_array (p_dev, priv->rx_buf_size, +RX_DESC_NUM ,GFP_KERNEL );if (!priv->rx_buf_base) { ret = -ENOMEM ; goto init_fail;@@ -553,8 +549,6 @@ static int moxart_mac_probe(struct platform_device *pdev) init_fail:netdev_err (ndev,"init failed\n" );moxart_mac_free_memory (ndev); -irq_map_fail: -free_netdev (ndev);return ret; }@@ -565,7 +559,6 @@ static void moxart_remove(struct platform_device *pdev)unregister_netdev (ndev);devm_free_irq (&pdev->dev, ndev->irq, ndev);moxart_mac_free_memory (ndev); -free_netdev (ndev); }static const struct of_device_id moxart_mac_match[] = {
Quoted 10 lines · Christophe JAILLET
Quoted 5 lines · Rosen Penev
alloc_etherdevandkmalloc_arrayare called first and destroyed last. Safe to use devm to remove frees.Signed-off-by Rosen Penev <[email protected]>---
Hi,
Quoted 7 lines
using
dmam_alloc_coherent()would go even one step further I think. It would removemoxart_mac_free_memory()completely.Then IIUC, using
devm_register_netdev()would keep things ordered andmoxart_remove()could also be removed completely.(by inspection only)
Right and that's the issue. I don't have hardware to test this on. Limiting this to alloc_etherdev and kmalloc_array is safe as they are the last to go.
Quoted 77 lines
CJ
Quoted 72 lines
drivers/net/ethernet/moxa/moxart_ether.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)drivers/net/ethernet/moxa/moxart_ether.c +6
-13@@ -81,9 +81,6 @@ static void moxart_mac_free_memory(struct net_device *ndev)dma_free_coherent (&priv->pdev->dev,RX_REG_DESC_SIZE *RX_DESC_NUM , priv->rx_desc_base, priv->rx_base); - -kfree (priv->tx_buf_base); -kfree (priv->rx_buf_base); }static void moxart_mac_reset (struct net_device *ndev)@@ -461,15 +458,14 @@ static int moxart_mac_probe(struct platform_device *pdev)unsigned int irq;int ret; - ndev =alloc_etherdev (sizeof (struct moxart_mac_priv_t )); + ndev =devm_alloc_etherdev (p_dev,sizeof (struct moxart_mac_priv_t ));if (!ndev)return -ENOMEM ; irq =irq_of_parse_and_map (node,0 );if (irq <=0 ) {netdev_err (ndev,"irq_of_parse_and_map failed\n" ); - ret = -EINVAL ; - goto irq_map_fail; +return -EINVAL ; } priv =netdev_priv (ndev);@@ -511,15 +507,15 @@ static int moxart_mac_probe(struct platform_device *pdev) goto init_fail; } - priv->tx_buf_base =kmalloc_array (priv->tx_buf_size,TX_DESC_NUM , -GFP_KERNEL ); + priv->tx_buf_base =devm_kmalloc_array (p_dev, priv->tx_buf_size, +TX_DESC_NUM ,GFP_KERNEL );if (!priv->tx_buf_base) { ret = -ENOMEM ; goto init_fail; } - priv->rx_buf_base =kmalloc_array (priv->rx_buf_size,RX_DESC_NUM , -GFP_KERNEL ); + priv->rx_buf_base =devm_kmalloc_array (p_dev, priv->rx_buf_size, +RX_DESC_NUM ,GFP_KERNEL );if (!priv->rx_buf_base) { ret = -ENOMEM ; goto init_fail;@@ -553,8 +549,6 @@ static int moxart_mac_probe(struct platform_device *pdev) init_fail:netdev_err (ndev,"init failed\n" );moxart_mac_free_memory (ndev); -irq_map_fail: -free_netdev (ndev);return ret; }@@ -565,7 +559,6 @@ static void moxart_remove(struct platform_device *pdev)unregister_netdev (ndev);devm_free_irq (&pdev->dev, ndev->irq, ndev);moxart_mac_free_memory (ndev); -free_netdev (ndev); }static const struct of_device_id moxart_mac_match[] = {
Jakub Kicinski
maintainerQuoted 2 lines · On Wed, 7 Aug 2024 21:03:54 -0700 Rosen Penev wrote:
alloc_etherdevandkmalloc_arrayare called first and destroyed last. Safe to use devm to remove frees.
But why? Refactoring old drivers is often more risk than reward. How did you test this change?
Signature · 1 line
pw-bot: cr