mlxsw: spectrum_router: Replay MACVLANs when RIF is made

If IP address is added to a MACVLAN netdevice, the effect is of configuring
VRRP on the RIF for the netdevice linked to the MACVLAN. Because the
MACVLAN offload is tied to existence of a RIF at the linked netdevice,
adding a MACVLAN is currently not allowed until a RIF is present.

If this requirement stays, it will never be possible to attach a first port
into a topology that involves a MACVLAN. Thus topologies would need to be
built in a certain order, which is impractical.

Additionally, IP address removal, which leads to disappearance of the RIF
that the MACVLAN depends on, cannot be vetoed. Thus even as things stand
now it is possible to get to a state where a MACVLAN netdevice exists
without a RIF, despite having mlxsw lowers. And once the MACVLAN is
un-offloaded due to RIF getting destroyed, recreating the RIF does not
bring it back.

In this patch, accept that MACVLAN can be created out of order and support
that use case.

One option would seem to be to simply recognize MACVLAN netdevices as
"interesting", and let the existing replay mechanisms take care of the
offload. However, that does not address the necessity to reoffload MACVLAN
once a RIF is created.

Thus add a new replay hook, symmetrical to mlxsw_sp_rif_macvlan_flush(),
called mlxsw_sp_rif_macvlan_replay(), which instead of unwinding the
existing offloads, applies the configuration as if the netdevice were
created just now.

Additionally, remove all vetoes and warning messages that checked for
presence of a RIF at the linked device.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 8087da0..4346cc7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4786,11 +4786,6 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
                        NL_SET_ERR_MSG_MOD(extack, "Can not put a VLAN on a LAG port");
                        return -EINVAL;
                }
-               if (netif_is_macvlan(upper_dev) &&
-                   !mlxsw_sp_rif_exists(mlxsw_sp, lower_dev)) {
-                       NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");
-                       return -EOPNOTSUPP;
-               }
                if (netif_is_ovs_master(upper_dev) && vlan_uses_dev(dev)) {
                        NL_SET_ERR_MSG_MOD(extack, "Master device is an OVS master and this device has a VLAN");
                        return -EINVAL;
@@ -4979,11 +4974,6 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev,
                        NL_SET_ERR_MSG_MOD(extack, "Enslaving a port to a device that already has an upper device is not supported");
                        return -EINVAL;
                }
-               if (netif_is_macvlan(upper_dev) &&
-                   !mlxsw_sp_rif_exists(mlxsw_sp, vlan_dev)) {
-                       NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");
-                       return -EOPNOTSUPP;
-               }
                break;
        case NETDEV_CHANGEUPPER:
                upper_dev = info->upper_dev;
@@ -5052,13 +5042,6 @@ static int mlxsw_sp_netdevice_bridge_vlan_event(struct mlxsw_sp *mlxsw_sp,
                        NL_SET_ERR_MSG_MOD(extack, "Unknown upper device type");
                        return -EOPNOTSUPP;
                }
-               if (!info->linking)
-                       break;
-               if (netif_is_macvlan(upper_dev) &&
-                   !mlxsw_sp_rif_exists(mlxsw_sp, vlan_dev)) {
-                       NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");
-                       return -EOPNOTSUPP;
-               }
                break;
        case NETDEV_CHANGEUPPER:
                upper_dev = info->upper_dev;
@@ -5135,11 +5118,6 @@ static int mlxsw_sp_netdevice_bridge_event(struct mlxsw_sp *mlxsw_sp,
                        NL_SET_ERR_MSG_MOD(extack, "VLAN uppers are only supported with 802.1q VLAN protocol");
                        return -EOPNOTSUPP;
                }
-               if (netif_is_macvlan(upper_dev) &&
-                   !mlxsw_sp_rif_exists(mlxsw_sp, br_dev)) {
-                       NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");
-                       return -EOPNOTSUPP;
-               }
                break;
        case NETDEV_CHANGEUPPER:
                upper_dev = info->upper_dev;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index fe1855c..2322429 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -9121,10 +9121,8 @@ static int mlxsw_sp_rif_macvlan_add(struct mlxsw_sp *mlxsw_sp,
        int err;
 
        rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, vlan->lowerdev);
-       if (!rif) {
-               NL_SET_ERR_MSG_MOD(extack, "macvlan is only supported on top of router interfaces");
-               return -EOPNOTSUPP;
-       }
+       if (!rif)
+               return 0;
 
        err = mlxsw_sp_rif_fdb_op(mlxsw_sp, macvlan_dev->dev_addr,
                                  mlxsw_sp_fid_index(rif->fid), true);
@@ -9857,6 +9855,40 @@ out:
        return notifier_from_errno(err);
 }
 
+struct mlxsw_sp_macvlan_replay {
+       struct mlxsw_sp *mlxsw_sp;
+       struct netlink_ext_ack *extack;
+};
+
+static int mlxsw_sp_macvlan_replay_upper(struct net_device *dev,
+                                        struct netdev_nested_priv *priv)
+{
+       const struct mlxsw_sp_macvlan_replay *rms = priv->data;
+       struct netlink_ext_ack *extack = rms->extack;
+       struct mlxsw_sp *mlxsw_sp = rms->mlxsw_sp;
+
+       if (!netif_is_macvlan(dev))
+               return 0;
+
+       return mlxsw_sp_rif_macvlan_add(mlxsw_sp, dev, extack);
+}
+
+static int mlxsw_sp_macvlan_replay(struct mlxsw_sp_rif *rif,
+                                  struct netlink_ext_ack *extack)
+{
+       struct mlxsw_sp_macvlan_replay rms = {
+               .mlxsw_sp = rif->mlxsw_sp,
+               .extack = extack,
+       };
+       struct netdev_nested_priv priv = {
+               .data = &rms,
+       };
+
+       return netdev_walk_all_upper_dev_rcu(mlxsw_sp_rif_dev(rif),
+                                            mlxsw_sp_macvlan_replay_upper,
+                                            &priv);
+}
+
 static int __mlxsw_sp_rif_macvlan_flush(struct net_device *dev,
                                        struct netdev_nested_priv *priv)
 {
@@ -9879,7 +9911,6 @@ static int mlxsw_sp_rif_macvlan_flush(struct mlxsw_sp_rif *rif)
        if (!netif_is_macvlan_port(dev))
                return 0;
 
-       netdev_warn(dev, "Router interface is deleted. Upper macvlans will not work\n");
        return netdev_walk_all_upper_dev_rcu(dev,
                                             __mlxsw_sp_rif_macvlan_flush, &priv);
 }
@@ -9937,6 +9968,10 @@ static int mlxsw_sp_rif_subport_configure(struct mlxsw_sp_rif *rif,
        if (err)
                goto err_rif_subport_op;
 
+       err = mlxsw_sp_macvlan_replay(rif, extack);
+       if (err)
+               goto err_macvlan_replay;
+
        err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                                  mlxsw_sp_fid_index(rif->fid), true);
        if (err)
@@ -9952,6 +9987,8 @@ err_fid_rif_set:
        mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                            mlxsw_sp_fid_index(rif->fid), false);
 err_rif_fdb_op:
+       mlxsw_sp_rif_macvlan_flush(rif);
+err_macvlan_replay:
        mlxsw_sp_rif_subport_op(rif, false);
 err_rif_subport_op:
        mlxsw_sp_rif_mac_profile_put(rif->mlxsw_sp, mac_profile);
@@ -10038,6 +10075,10 @@ static int mlxsw_sp_rif_fid_configure(struct mlxsw_sp_rif *rif,
        if (err)
                goto err_fid_bc_flood_set;
 
+       err = mlxsw_sp_macvlan_replay(rif, extack);
+       if (err)
+               goto err_macvlan_replay;
+
        err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                                  mlxsw_sp_fid_index(rif->fid), true);
        if (err)
@@ -10053,6 +10094,8 @@ err_fid_rif_set:
        mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                            mlxsw_sp_fid_index(rif->fid), false);
 err_rif_fdb_op:
+       mlxsw_sp_rif_macvlan_flush(rif);
+err_macvlan_replay:
        mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,
                               mlxsw_sp_router_port(mlxsw_sp), false);
 err_fid_bc_flood_set:
@@ -10200,6 +10243,10 @@ static int mlxsw_sp_rif_vlan_configure(struct mlxsw_sp_rif *rif, u16 efid,
        if (err)
                goto err_fid_bc_flood_set;
 
+       err = mlxsw_sp_macvlan_replay(rif, extack);
+       if (err)
+               goto err_macvlan_replay;
+
        err = mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                                  mlxsw_sp_fid_index(rif->fid), true);
        if (err)
@@ -10215,6 +10262,8 @@ err_fid_rif_set:
        mlxsw_sp_rif_fdb_op(rif->mlxsw_sp, dev->dev_addr,
                            mlxsw_sp_fid_index(rif->fid), false);
 err_rif_fdb_op:
+       mlxsw_sp_rif_macvlan_flush(rif);
+err_macvlan_replay:
        mlxsw_sp_fid_flood_set(rif->fid, MLXSW_SP_FLOOD_TYPE_BC,
                               mlxsw_sp_router_port(mlxsw_sp), false);
 err_fid_bc_flood_set: