Commit 70ef7d87 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: transfer rtnl_lock() requirement from ethtool_set_ethtool_phy_ops() to caller

phy_init() and phy_exit() will have to do more stuff under rtnl_lock()
in a future change. Since rtnl_unlock() -> netdev_run_todo() does a lot
of stuff under the hood, it's a pity to lock and unlock the rtnetlink
mutex twice in a row.

Change the calling convention such that the only caller of
ethtool_set_ethtool_phy_ops(), phy_device.c, provides a context where
the rtnl_mutex is already acquired.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20230801142824.1772134-11-vladimir.oltean@nxp.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 54e1ed69
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/phy_led_triggers.h> #include <linux/phy_led_triggers.h>
#include <linux/pse-pd/pse.h> #include <linux/pse-pd/pse.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/rtnetlink.h>
#include <linux/sfp.h> #include <linux/sfp.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -3451,7 +3452,9 @@ static int __init phy_init(void) ...@@ -3451,7 +3452,9 @@ static int __init phy_init(void)
{ {
int rc; int rc;
rtnl_lock();
ethtool_set_ethtool_phy_ops(&phy_ethtool_phy_ops); ethtool_set_ethtool_phy_ops(&phy_ethtool_phy_ops);
rtnl_unlock();
rc = mdio_bus_init(); rc = mdio_bus_init();
if (rc) if (rc)
...@@ -3474,7 +3477,9 @@ static int __init phy_init(void) ...@@ -3474,7 +3477,9 @@ static int __init phy_init(void)
err_mdio_bus: err_mdio_bus:
mdio_bus_exit(); mdio_bus_exit();
err_ethtool_phy_ops: err_ethtool_phy_ops:
rtnl_lock();
ethtool_set_ethtool_phy_ops(NULL); ethtool_set_ethtool_phy_ops(NULL);
rtnl_unlock();
return rc; return rc;
} }
...@@ -3484,7 +3489,9 @@ static void __exit phy_exit(void) ...@@ -3484,7 +3489,9 @@ static void __exit phy_exit(void)
phy_driver_unregister(&genphy_c45_driver); phy_driver_unregister(&genphy_c45_driver);
phy_driver_unregister(&genphy_driver); phy_driver_unregister(&genphy_driver);
mdio_bus_exit(); mdio_bus_exit();
rtnl_lock();
ethtool_set_ethtool_phy_ops(NULL); ethtool_set_ethtool_phy_ops(NULL);
rtnl_unlock();
} }
subsys_initcall(phy_init); subsys_initcall(phy_init);
......
...@@ -665,9 +665,8 @@ const struct ethtool_phy_ops *ethtool_phy_ops; ...@@ -665,9 +665,8 @@ const struct ethtool_phy_ops *ethtool_phy_ops;
void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops) void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops)
{ {
rtnl_lock(); ASSERT_RTNL();
ethtool_phy_ops = ops; ethtool_phy_ops = ops;
rtnl_unlock();
} }
EXPORT_SYMBOL_GPL(ethtool_set_ethtool_phy_ops); EXPORT_SYMBOL_GPL(ethtool_set_ethtool_phy_ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment