mlxsw: spectrum: Support IPIP overlay VRF migration

IPIP entries are created as soon as an offloadable device is created.
That means that when such a device is later moved to a different VRF,
the loopback device that backs the tunnel is wrong.

Thus when an offloadable encapsulating netdevice moves from one VRF to
another, make sure that the loopback is updated as necessary.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-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.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index c3ae650fbe5e976eb06c558e44330aaab6d1083a..e1e11c726c16a1b7a3855a47dadd4911e984929f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4506,7 +4506,7 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
 
        mlxsw_sp = container_of(nb, struct mlxsw_sp, netdevice_nb);
        if (mlxsw_sp_netdev_is_ipip(mlxsw_sp, dev))
-               err = mlxsw_sp_netdevice_ipip_event(mlxsw_sp, dev, event);
+               err = mlxsw_sp_netdevice_ipip_event(mlxsw_sp, dev, event, ptr);
        else if (event == NETDEV_CHANGEADDR || event == NETDEV_CHANGEMTU)
                err = mlxsw_sp_netdevice_router_port_event(dev);
        else if (mlxsw_sp_is_vrf_event(event, ptr))

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index a4f21afd7f00e4e2f988db3c98bcb0468107d435..28feb745a38a55544022468d9c5eb91ab703c48a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -400,7 +400,8 @@ bool mlxsw_sp_netdev_is_ipip(const struct mlxsw_sp *mlxsw_sp,
 int
 mlxsw_sp_netdevice_ipip_event(struct mlxsw_sp *mlxsw_sp,
                              struct net_device *l3_dev,
-                             unsigned long event);
+                             unsigned long event,
+                             struct netdev_notifier_changeupper_info *info);
 void
 mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);
 void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index db834220a2fe2cffeaa2673cfb45347f0f7e79e3..082cf00eaadb8b41ffed0c659da6283b8102584c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -1384,9 +1384,49 @@ static void mlxsw_sp_netdevice_ipip_down_event(struct mlxsw_sp *mlxsw_sp,
                mlxsw_sp_ipip_entry_demote_decap(mlxsw_sp, ipip_entry);
 }
 
+static int mlxsw_sp_netdevice_ipip_vrf_event(struct mlxsw_sp *mlxsw_sp,
+                                            struct net_device *ol_dev)
+{
+       struct mlxsw_sp_fib_entry *decap_fib_entry;
+       struct mlxsw_sp_ipip_entry *ipip_entry;
+       struct mlxsw_sp_rif_ipip_lb *lb_rif;
+
+       ipip_entry = mlxsw_sp_ipip_entry_find_by_ol_dev(mlxsw_sp, ol_dev);
+       if (!ipip_entry)
+               return 0;
+
+       /* When a tunneling device is moved to a different VRF, we need to
+        * update the backing loopback. Since RIFs can't be edited, we need to
+        * destroy and recreate it. That might create a window of opportunity
+        * where RALUE and RATR registers end up referencing a RIF that's
+        * already gone. RATRs are handled by the RIF destroy, and to take care
+        * of RALUE, demote the decap route back.
+        */
+       if (ipip_entry->decap_fib_entry)
+               mlxsw_sp_ipip_entry_demote_decap(mlxsw_sp, ipip_entry);
+
+       lb_rif = mlxsw_sp_ipip_ol_ipip_lb_create(mlxsw_sp, ipip_entry->ipipt,
+                                                ol_dev);
+       if (IS_ERR(lb_rif))
+               return PTR_ERR(lb_rif);
+       mlxsw_sp_rif_destroy(&ipip_entry->ol_lb->common);
+       ipip_entry->ol_lb = lb_rif;
+
+       if (ol_dev->flags & IFF_UP) {
+               decap_fib_entry = mlxsw_sp_ipip_entry_find_decap(mlxsw_sp,
+                                                                ipip_entry);
+               if (decap_fib_entry)
+                       mlxsw_sp_ipip_entry_promote_decap(mlxsw_sp, ipip_entry,
+                                                         decap_fib_entry);
+       }
+
+       return 0;
+}
+
 int mlxsw_sp_netdevice_ipip_event(struct mlxsw_sp *mlxsw_sp,
                                  struct net_device *ol_dev,
-                                 unsigned long event)
+                                 unsigned long event,
+                                 struct netdev_notifier_changeupper_info *info)
 {
        switch (event) {
        case NETDEV_REGISTER:
@@ -1399,6 +1439,11 @@ int mlxsw_sp_netdevice_ipip_event(struct mlxsw_sp *mlxsw_sp,
        case NETDEV_DOWN:
                mlxsw_sp_netdevice_ipip_down_event(mlxsw_sp, ol_dev);
                return 0;
+       case NETDEV_CHANGEUPPER:
+               if (netif_is_l3_master(info->upper_dev))
+                       return mlxsw_sp_netdevice_ipip_vrf_event(mlxsw_sp,
+                                                                ol_dev);
+               return 0;
        }
        return 0;
 }