net: dsa: don't leave dangling pointers in dp->pl when failing

There is a desire to simplify the dsa_port registration path with
devlink, and this involves reworking a bit how user ports which fail to
connect to their PHY (because it's missing) get reinitialized as UNUSED
devlink ports.

The desire is for the change to look something like this; basically
dsa_port_setup() has failed, we just change dp->type and call
dsa_port_setup() again.

-/* Destroy the current devlink port, and create a new one which has the UNUSED
- * flavour.
- */
-static int dsa_port_reinit_as_unused(struct dsa_port *dp)
+static int dsa_port_setup_as_unused(struct dsa_port *dp)
 {
-	dsa_port_devlink_teardown(dp);
 	dp->type = DSA_PORT_TYPE_UNUSED;
-	return dsa_port_devlink_setup(dp);
+	return dsa_port_setup(dp);
 }

For an UNUSED port, dsa_port_setup() mostly only calls dsa_port_devlink_setup()
anyway, so we could get away with calling just that. But if we call the
full blown dsa_port_setup(dp) (which will be needed to properly set
dp->setup = true), the callee will have the tendency to go through this
code block too, and call dsa_port_disable(dp):

	switch (dp->type) {
	case DSA_PORT_TYPE_UNUSED:
		dsa_port_disable(dp);
		break;

That is not very good, because dsa_port_disable() has this hidden inside
of it:

	if (dp->pl)
		phylink_stop(dp->pl);

Fact is, we are not prepared to handle a call to dsa_port_disable() with
a struct dsa_port that came from a previous (and failed) call to
dsa_port_setup(). We do not clean up dp->pl, and this will make the
second call to dsa_port_setup() call phylink_stop() on a dangling dp->pl
pointer.

Solve this by creating an API for phylink destruction which is symmetric
to the phylink creation, and never leave dp->pl set to anything except
NULL or a valid phylink structure.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 129e4a649c7e86044d3947fb78771fb2965b1304..6e65c7ffd6f32f778b490d4fc94a7269104fb390 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -294,6 +294,7 @@ int dsa_port_mrp_add_ring_role(const struct dsa_port *dp,
 int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,
                               const struct switchdev_obj_ring_role_mrp *mrp);
 int dsa_port_phylink_create(struct dsa_port *dp);
+void dsa_port_phylink_destroy(struct dsa_port *dp);
 int dsa_shared_port_link_register_of(struct dsa_port *dp);
 void dsa_shared_port_link_unregister_of(struct dsa_port *dp);
 int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index e6289a1db0a0880fad494931494e9721ee3677eb..e4a0513816bb62034dec0924bca4171fceb3ae0a 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1661,6 +1661,7 @@ int dsa_port_phylink_create(struct dsa_port *dp)
 {
        struct dsa_switch *ds = dp->ds;
        phy_interface_t mode;
+       struct phylink *pl;
        int err;
 
        err = of_get_phy_mode(dp->dn, &mode);
@@ -1677,16 +1678,24 @@ int dsa_port_phylink_create(struct dsa_port *dp)
        if (ds->ops->phylink_get_caps)
                ds->ops->phylink_get_caps(ds, dp->index, &dp->pl_config);
 
-       dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn),
-                               mode, &dsa_port_phylink_mac_ops);
-       if (IS_ERR(dp->pl)) {
+       pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn),
+                           mode, &dsa_port_phylink_mac_ops);
+       if (IS_ERR(pl)) {
                pr_err("error creating PHYLINK: %ld\n", PTR_ERR(dp->pl));
-               return PTR_ERR(dp->pl);
+               return PTR_ERR(pl);
        }
 
+       dp->pl = pl;
+
        return 0;
 }
 
+void dsa_port_phylink_destroy(struct dsa_port *dp)
+{
+       phylink_destroy(dp->pl);
+       dp->pl = NULL;
+}
+
 static int dsa_shared_port_setup_phy_of(struct dsa_port *dp, bool enable)
 {
        struct dsa_switch *ds = dp->ds;
@@ -1781,7 +1790,7 @@ static int dsa_shared_port_phylink_register(struct dsa_port *dp)
        return 0;
 
 err_phy_connect:
-       phylink_destroy(dp->pl);
+       dsa_port_phylink_destroy(dp);
        return err;
 }
 
@@ -1983,8 +1992,7 @@ void dsa_shared_port_link_unregister_of(struct dsa_port *dp)
                rtnl_lock();
                phylink_disconnect_phy(dp->pl);
                rtnl_unlock();
-               phylink_destroy(dp->pl);
-               dp->pl = NULL;
+               dsa_port_phylink_destroy(dp);
                return;
        }
 

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index aa47ddc19fdfad6bd37b867b4cbd2216dc20fcc4..1a59918d3b3051e5656742b990f3621cd6ce0428 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2304,7 +2304,7 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)
        if (ret) {
                netdev_err(slave_dev, "failed to connect to PHY: %pe\n",
                           ERR_PTR(ret));
-               phylink_destroy(dp->pl);
+               dsa_port_phylink_destroy(dp);
        }
 
        return ret;
@@ -2476,7 +2476,7 @@ out_phy:
        rtnl_lock();
        phylink_disconnect_phy(p->dp->pl);
        rtnl_unlock();
-       phylink_destroy(p->dp->pl);
+       dsa_port_phylink_destroy(p->dp);
 out_gcells:
        gro_cells_destroy(&p->gcells);
 out_free:
@@ -2499,7 +2499,7 @@ void dsa_slave_destroy(struct net_device *slave_dev)
        phylink_disconnect_phy(dp->pl);
        rtnl_unlock();
 
-       phylink_destroy(dp->pl);
+       dsa_port_phylink_destroy(dp);
        gro_cells_destroy(&p->gcells);
        free_percpu(slave_dev->tstats);
        free_netdev(slave_dev);