in fec_enet_mdio_read, fec_enet_mdio_write, fec_enet_get_regs,
fec_enet_open and fec_drv_remove, pm_runtime_get_sync is called which
increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
Signed-off-by: Navid Emamdoost <[email protected]>
---
drivers/net/ethernet/freescale/fec_main.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index dc6f8763a5d4..a33012b89cc9 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1827,8 +1827,10 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
bool is_c45 = !!(regnum & MII_ADDR_C45);
ret = pm_runtime_get_sync(dev);
- if (ret < 0)
+ if (ret < 0) {
+ pm_runtime_put_autosuspend(dev);
return ret;
+ }
reinit_completion(&fep->mdio_done);
@@ -1893,8 +1895,10 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
bool is_c45 = !!(regnum & MII_ADDR_C45);
ret = pm_runtime_get_sync(dev);
- if (ret < 0)
+ if (ret < 0) {
+ pm_runtime_put_autosuspend(dev);
return ret;
+ }
else
ret = 0;
@@ -2258,7 +2262,7 @@ static void fec_enet_get_regs(struct net_device *ndev,
ret = pm_runtime_get_sync(dev);
if (ret < 0)
- return;
+ goto out;
regs->version = fec_enet_register_version;
@@ -2276,6 +2280,7 @@ static void fec_enet_get_regs(struct net_device *ndev,
}
pm_runtime_mark_last_busy(dev);
+out:
pm_runtime_put_autosuspend(dev);
}
@@ -2952,8 +2957,10 @@ fec_enet_open(struct net_device *ndev)
bool reset_again;
ret = pm_runtime_get_sync(&fep->pdev->dev);
- if (ret < 0)
+ if (ret < 0) {
+ pm_runtime_put_autosuspend(&fep->pdev->dev);
return ret;
+ }
pinctrl_pm_select_default_state(&fep->pdev->dev);
ret = fec_enet_clk_enable(ndev, true);
@@ -3741,8 +3748,10 @@ fec_drv_remove(struct platform_device *pdev)
int ret;
ret = pm_runtime_get_sync(&pdev->dev);
- if (ret < 0)
+ if (ret < 0) {
+ pm_runtime_put_noidle(&pdev->dev);
return ret;
+ }
cancel_work_sync(&fep->tx_timeout_work);
fec_ptp_stop(pdev);
--
2.17.1
> in fec_enet_mdio_read, …
I am curious under which circumstances you would like to improve
such commit messages.
* Will the tag “Fixes” become helpful?
* Which source code analysis tools did trigger to send
update suggestions according to 16 similar issues for today?
…
> +++ b/drivers/net/ethernet/freescale/fec_main.c
…
> @@ -1893,8 +1895,10 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
> bool is_c45 = !!(regnum & MII_ADDR_C45);
>
> ret = pm_runtime_get_sync(dev);
> - if (ret < 0)
> + if (ret < 0) {
> + pm_runtime_put_autosuspend(dev);
> return ret;
> + }
> else
> ret = 0;
I suggest to adjust also the source code from the else branch.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?id=96144c58abe7ff767e754b5b80995f7b8846d49b#n196
…
> @@ -2276,6 +2280,7 @@ static void fec_enet_get_regs(struct net_device *ndev,
> }
>
> pm_runtime_mark_last_busy(dev);
> +out:
> pm_runtime_put_autosuspend(dev);
> }
Perhaps use the label “put_runtime” instead?
Regards,
Markus
On Sun, Jun 14, 2020 at 10:25:38AM +0200, Markus Elfring wrote:
> > in fec_enet_mdio_read, …
>
> I am curious under which circumstances you would like to improve
> such commit messages.
>
> * Will the tag “Fixes” become helpful?
>
> * Which source code analysis tools did trigger to send
> update suggestions according to 16 similar issues for today?
>
Hi,
This is the semi-friendly patch-bot of Greg Kroah-Hartman.
Markus, you seem to have sent a nonsensical or otherwise pointless
review comment to a patch submission on a Linux kernel developer mailing
list. I strongly suggest that you not do this anymore. Please do not
bother developers who are actively working to produce patches and
features with comments that, in the end, are a waste of time.
Patch submitter, please ignore Markus's suggestion; you do not need to
follow it at all. The person/bot/AI that sent it is being ignored by
almost all Linux kernel maintainers for having a persistent pattern of
behavior of producing distracting and pointless commentary, and
inability to adapt to feedback. Please feel free to also ignore emails
from them.
thanks,
greg k-h's patch email bot
From: Navid Emamdoost <[email protected]>
Date: Sun, 14 Jun 2020 00:38:01 -0500
> in fec_enet_mdio_read, fec_enet_mdio_write, fec_enet_get_regs,
> fec_enet_open and fec_drv_remove, pm_runtime_get_sync is called which
> increments the counter even in case of failure, leading to incorrect
> ref count. In case of failure, decrement the ref count before returning.
>
> Signed-off-by: Navid Emamdoost <[email protected]>
This does not apply to the net tree.
From: David Miller <[email protected]> Sent: Tuesday, June 16, 2020 4:42 AM
> From: Navid Emamdoost <[email protected]>
> Date: Sun, 14 Jun 2020 00:38:01 -0500
>
> > in fec_enet_mdio_read, fec_enet_mdio_write, fec_enet_get_regs,
> > fec_enet_open and fec_drv_remove, pm_runtime_get_sync is called which
> > increments the counter even in case of failure, leading to incorrect
> > ref count. In case of failure, decrement the ref count before returning.
> >
> > Signed-off-by: Navid Emamdoost <[email protected]>
>
> This does not apply to the net tree.
Wolfram Sang wonder if such de-reference can be better handled by pm runtime core code.
https://lkml.org/lkml/2020/6/14/76