mlxsw: spectrum: Support IPIP underlay VRF migration

When a bound device of a tunnel netdevice changes VRF, the loopback RIF
that backs the tunnel needs to be updated and existing encapsulating
routes need to be refreshed.

Note that several tunnels can share the same bound device, in which case
all the impacted tunnels need to be updated.

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 55bb3669bbccab7c42ebd67e5394ebcd91ba88af..63e50877796b1a6c835788892ef04881aaf0fe6e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4545,6 +4545,9 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
        if (mlxsw_sp_netdev_is_ipip_ol(mlxsw_sp, dev))
                err = mlxsw_sp_netdevice_ipip_ol_event(mlxsw_sp, dev,
                                                       event, ptr);
+       else if (mlxsw_sp_netdev_is_ipip_ul(mlxsw_sp, dev))
+               err = mlxsw_sp_netdevice_ipip_ul_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 07cba529b8a94364f791047b3bed711075432742..47dd7e06fd29f839f5fcc3e6f09275ead87e66e8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -398,10 +398,17 @@ int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
                                 struct netdev_notifier_changeupper_info *info);
 bool mlxsw_sp_netdev_is_ipip_ol(const struct mlxsw_sp *mlxsw_sp,
                                const struct net_device *dev);
+bool mlxsw_sp_netdev_is_ipip_ul(const struct mlxsw_sp *mlxsw_sp,
+                               const struct net_device *dev);
 int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,
                                     struct net_device *l3_dev,
                                     unsigned long event,
                                     struct netdev_notifier_info *info);
+int
+mlxsw_sp_netdevice_ipip_ul_event(struct mlxsw_sp *mlxsw_sp,
+                                struct net_device *l3_dev,
+                                unsigned long event,
+                                struct netdev_notifier_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 832bfa12551262fd482ceb1d480f4d810bb331d0..aa7b820e84082b28d24f4d2fe7001dbb6d4ce585 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -1257,6 +1257,33 @@ mlxsw_sp_ipip_entry_find_by_ol_dev(struct mlxsw_sp *mlxsw_sp,
        return NULL;
 }
 
+static struct mlxsw_sp_ipip_entry *
+mlxsw_sp_ipip_entry_find_by_ul_dev(const struct mlxsw_sp *mlxsw_sp,
+                                  const struct net_device *ul_dev,
+                                  struct mlxsw_sp_ipip_entry *start)
+{
+       struct mlxsw_sp_ipip_entry *ipip_entry;
+
+       ipip_entry = list_prepare_entry(start, &mlxsw_sp->router->ipip_list,
+                                       ipip_list_node);
+       list_for_each_entry_continue(ipip_entry, &mlxsw_sp->router->ipip_list,
+                                    ipip_list_node) {
+               struct net_device *ipip_ul_dev =
+                       __mlxsw_sp_ipip_netdev_ul_dev_get(ipip_entry->ol_dev);
+
+               if (ipip_ul_dev == ul_dev)
+                       return ipip_entry;
+       }
+
+       return NULL;
+}
+
+bool mlxsw_sp_netdev_is_ipip_ul(const struct mlxsw_sp *mlxsw_sp,
+                               const struct net_device *dev)
+{
+       return mlxsw_sp_ipip_entry_find_by_ul_dev(mlxsw_sp, dev, NULL);
+}
+
 static bool mlxsw_sp_netdevice_ipip_can_offload(struct mlxsw_sp *mlxsw_sp,
                                                const struct net_device *ol_dev,
                                                enum mlxsw_sp_ipip_type ipipt)
@@ -1434,6 +1461,16 @@ static int mlxsw_sp_netdevice_ipip_ol_vrf_event(struct mlxsw_sp *mlxsw_sp,
                                                   true, false, false, extack);
 }
 
+static int
+mlxsw_sp_netdevice_ipip_ul_vrf_event(struct mlxsw_sp *mlxsw_sp,
+                                    struct mlxsw_sp_ipip_entry *ipip_entry,
+                                    struct net_device *ul_dev,
+                                    struct netlink_ext_ack *extack)
+{
+       return __mlxsw_sp_ipip_entry_update_tunnel(mlxsw_sp, ipip_entry,
+                                                  true, true, false, extack);
+}
+
 void mlxsw_sp_ipip_entry_demote_tunnel(struct mlxsw_sp *mlxsw_sp,
                                       struct mlxsw_sp_ipip_entry *ipip_entry)
 {
@@ -1472,6 +1509,21 @@ mlxsw_sp_ipip_demote_tunnel_by_saddr(struct mlxsw_sp *mlxsw_sp,
        return false;
 }
 
+static void mlxsw_sp_ipip_demote_tunnel_by_ul_netdev(struct mlxsw_sp *mlxsw_sp,
+                                                    struct net_device *ul_dev)
+{
+       struct mlxsw_sp_ipip_entry *ipip_entry, *tmp;
+
+       list_for_each_entry_safe(ipip_entry, tmp, &mlxsw_sp->router->ipip_list,
+                                ipip_list_node) {
+               struct net_device *ipip_ul_dev =
+                       __mlxsw_sp_ipip_netdev_ul_dev_get(ipip_entry->ol_dev);
+
+               if (ipip_ul_dev == ul_dev)
+                       mlxsw_sp_ipip_entry_demote_tunnel(mlxsw_sp, ipip_entry);
+       }
+}
+
 int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,
                                     struct net_device *ol_dev,
                                     unsigned long event,
@@ -1504,6 +1556,54 @@ int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,
        return 0;
 }
 
+static int
+__mlxsw_sp_netdevice_ipip_ul_event(struct mlxsw_sp *mlxsw_sp,
+                                  struct mlxsw_sp_ipip_entry *ipip_entry,
+                                  struct net_device *ul_dev,
+                                  unsigned long event,
+                                  struct netdev_notifier_info *info)
+{
+       struct netdev_notifier_changeupper_info *chup;
+       struct netlink_ext_ack *extack;
+
+       switch (event) {
+       case NETDEV_CHANGEUPPER:
+               chup = container_of(info, typeof(*chup), info);
+               extack = info->extack;
+               if (netif_is_l3_master(chup->upper_dev))
+                       return mlxsw_sp_netdevice_ipip_ul_vrf_event(mlxsw_sp,
+                                                                   ipip_entry,
+                                                                   ul_dev,
+                                                                   extack);
+               break;
+       }
+       return 0;
+}
+
+int
+mlxsw_sp_netdevice_ipip_ul_event(struct mlxsw_sp *mlxsw_sp,
+                                struct net_device *ul_dev,
+                                unsigned long event,
+                                struct netdev_notifier_info *info)
+{
+       struct mlxsw_sp_ipip_entry *ipip_entry = NULL;
+       int err;
+
+       while ((ipip_entry = mlxsw_sp_ipip_entry_find_by_ul_dev(mlxsw_sp,
+                                                               ul_dev,
+                                                               ipip_entry))) {
+               err = __mlxsw_sp_netdevice_ipip_ul_event(mlxsw_sp, ipip_entry,
+                                                        ul_dev, event, info);
+               if (err) {
+                       mlxsw_sp_ipip_demote_tunnel_by_ul_netdev(mlxsw_sp,
+                                                                ul_dev);
+                       return err;
+               }
+       }
+
+       return 0;
+}
+
 struct mlxsw_sp_neigh_key {
        struct neighbour *n;
 };