mlxsw: spectrum: Add error paths to __mlxsw_sp_port_vlans_add

The operation of adding VLANs on a port via switchdev ops can fail and
we need to be prepared for it. If we do not rollback hardware operations
following a failure, hardware and software will remain in an
inconsistent state.

Solve that by adding suitable error paths to __mlxsw_sp_port_vlans_add.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index fe881655a86418f6745b4afd30995e88423a68d3..f21e23983a1a0ea15323d0cf871524e8e9613d48 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -369,8 +369,8 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
 {
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
        struct net_device *dev = mlxsw_sp_port->dev;
+       u16 vid, last_visited_vid, old_pvid;
        enum mlxsw_reg_svfa_mt mt;
-       u16 vid, vid_e;
        int err;
 
        /* In case this is invoked with BRIDGE_FLAGS_SELF and port is
@@ -398,15 +398,18 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
                        if (err) {
                                netdev_err(dev, "Failed to create FID=VID=%d mapping\n",
                                           vid);
-                               return err;
+                               goto err_port_vid_to_fid_set;
                        }
                }
+       }
 
-               /* Set FID mapping according to port's mode */
+       /* Set FID mapping according to port's mode */
+       for (vid = vid_begin; vid <= vid_end; vid++) {
                err = mlxsw_sp_port_fid_map(mlxsw_sp_port, vid);
                if (err) {
                        netdev_err(dev, "Failed to map FID=%d", vid);
-                       return err;
+                       last_visited_vid = --vid;
+                       goto err_port_fid_map;
                }
        }
 
@@ -414,7 +417,7 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
                                        true, false);
        if (err) {
                netdev_err(dev, "Failed to configure flooding\n");
-               return err;
+               goto err_port_flood_set;
        }
 
        err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,
@@ -422,26 +425,54 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
        if (err) {
                netdev_err(dev, "Unable to add VIDs %d-%d\n", vid_begin,
                           vid_end);
-               return err;
+               goto err_port_vlans_set;
        }
 
-       vid = vid_begin;
-       if (flag_pvid && mlxsw_sp_port->pvid != vid) {
-               err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid);
+       old_pvid = mlxsw_sp_port->pvid;
+       if (flag_pvid && old_pvid != vid_begin) {
+               err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, vid_begin);
                if (err) {
-                       netdev_err(mlxsw_sp_port->dev, "Unable to add PVID %d\n",
-                                  vid);
-                       return err;
+                       netdev_err(dev, "Unable to add PVID %d\n", vid_begin);
+                       goto err_port_pvid_set;
                }
-               mlxsw_sp_port->pvid = vid;
+               mlxsw_sp_port->pvid = vid_begin;
        }
 
        /* Changing activity bits only if HW operation succeded */
        for (vid = vid_begin; vid <= vid_end; vid++)
                set_bit(vid, mlxsw_sp_port->active_vlans);
 
-       return mlxsw_sp_port_stp_state_set(mlxsw_sp_port,
-                                          mlxsw_sp_port->stp_state);
+       /* STP state change must be done after we set active VLANs */
+       err = mlxsw_sp_port_stp_state_set(mlxsw_sp_port,
+                                         mlxsw_sp_port->stp_state);
+       if (err) {
+               netdev_err(dev, "Failed to set STP state\n");
+               goto err_port_stp_state_set;
+       }
+
+       return 0;
+
+err_port_vid_to_fid_set:
+       mlxsw_sp_fid_destroy(mlxsw_sp, vid);
+       return err;
+
+err_port_stp_state_set:
+       for (vid = vid_begin; vid <= vid_end; vid++)
+               clear_bit(vid, mlxsw_sp_port->active_vlans);
+       if (old_pvid != mlxsw_sp_port->pvid)
+               mlxsw_sp_port_pvid_set(mlxsw_sp_port, old_pvid);
+err_port_pvid_set:
+       __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end, false,
+                                 false);
+err_port_vlans_set:
+       __mlxsw_sp_port_flood_set(mlxsw_sp_port, vid_begin, vid_end, false,
+                                 false);
+err_port_flood_set:
+       last_visited_vid = vid_end;
+err_port_fid_map:
+       for (vid = last_visited_vid; vid >= vid_begin; vid--)
+               mlxsw_sp_port_fid_unmap(mlxsw_sp_port, vid);
+       return err;
 }
 
 static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,