9 files changed, 234 insertions, 109 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index e1e11c726c16..e6519f2906a4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4521,9 +4521,16 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
         return notifier_from_errno(err);
 }
 
+static struct notifier_block mlxsw_sp_inetaddr_valid_nb __read_mostly = {
+        .notifier_call = mlxsw_sp_inetaddr_valid_event,
+};
+
 static struct notifier_block mlxsw_sp_inetaddr_nb __read_mostly = {
         .notifier_call = mlxsw_sp_inetaddr_event,
-        .priority = 10, /* Must be called before FIB notifier block */
+};
+
+static struct notifier_block mlxsw_sp_inet6addr_valid_nb __read_mostly = {
+        .notifier_call = mlxsw_sp_inet6addr_valid_event,
 };
 
 static struct notifier_block mlxsw_sp_inet6addr_nb __read_mostly = {
@@ -4548,7 +4555,9 @@ static int __init mlxsw_sp_module_init(void)
 {
         int err;
 
+        register_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);
         register_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);
+        register_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);
         register_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);
         register_netevent_notifier(&mlxsw_sp_router_netevent_nb);
 
@@ -4567,7 +4576,9 @@ err_pci_driver_register:
 err_core_driver_register:
         unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);
         unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);
+        unregister_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);
         unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);
+        unregister_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);
         return err;
 }
 
@@ -4577,7 +4588,9 @@ static void __exit mlxsw_sp_module_exit(void)
         mlxsw_core_driver_unregister(&mlxsw_sp_driver);
         unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);
         unregister_inet6addr_notifier(&mlxsw_sp_inet6addr_nb);
+        unregister_inet6addr_validator_notifier(&mlxsw_sp_inet6addr_valid_nb);
         unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);
+        unregister_inetaddr_validator_notifier(&mlxsw_sp_inetaddr_valid_nb);
 }
 
 module_init(mlxsw_sp_module_init);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 28feb745a38a..2a2472a09d8c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -391,8 +391,12 @@ int mlxsw_sp_router_netevent_event(struct notifier_block *unused,
 int mlxsw_sp_netdevice_router_port_event(struct net_device *dev);
 int mlxsw_sp_inetaddr_event(struct notifier_block *unused,
                             unsigned long event, void *ptr);
+int mlxsw_sp_inetaddr_valid_event(struct notifier_block *unused,
+                                  unsigned long event, void *ptr);
 int mlxsw_sp_inet6addr_event(struct notifier_block *unused,
                              unsigned long event, void *ptr);
+int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused,
+                                   unsigned long event, void *ptr);
 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(const struct mlxsw_sp *mlxsw_sp,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 3330120f2f8e..2420f69797a9 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -731,14 +731,17 @@ static struct mlxsw_sp_fib *mlxsw_sp_vr_fib(const struct mlxsw_sp_vr *vr,
 }
 
 static struct mlxsw_sp_vr *mlxsw_sp_vr_create(struct mlxsw_sp *mlxsw_sp,
-                                              u32 tb_id)
+                                              u32 tb_id,
+                                              struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp_vr *vr;
         int err;
 
         vr = mlxsw_sp_vr_find_unused(mlxsw_sp);
-        if (!vr)
+        if (!vr) {
+                NL_SET_ERR_MSG(extack, "spectrum: Exceeded number of supported virtual routers");
                 return ERR_PTR(-EBUSY);
+        }
         vr->fib4 = mlxsw_sp_fib_create(vr, MLXSW_SP_L3_PROTO_IPV4);
         if (IS_ERR(vr->fib4))
                 return ERR_CAST(vr->fib4);
@@ -775,14 +778,15 @@ static void mlxsw_sp_vr_destroy(struct mlxsw_sp_vr *vr)
         vr->fib4 = NULL;
 }
 
-static struct mlxsw_sp_vr *mlxsw_sp_vr_get(struct mlxsw_sp *mlxsw_sp, u32 tb_id)
+static struct mlxsw_sp_vr *mlxsw_sp_vr_get(struct mlxsw_sp *mlxsw_sp, u32 tb_id,
+                                           struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp_vr *vr;
 
         tb_id = mlxsw_sp_fix_tb_id(tb_id);
         vr = mlxsw_sp_vr_find(mlxsw_sp, tb_id);
         if (!vr)
-                vr = mlxsw_sp_vr_create(mlxsw_sp, tb_id);
+                vr = mlxsw_sp_vr_create(mlxsw_sp, tb_id, extack);
         return vr;
 }
 
@@ -948,7 +952,8 @@ static u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev)
 
 static struct mlxsw_sp_rif *
 mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,
-                    const struct mlxsw_sp_rif_params *params);
+                    const struct mlxsw_sp_rif_params *params,
+                    struct netlink_ext_ack *extack);
 
 static struct mlxsw_sp_rif_ipip_lb *
 mlxsw_sp_ipip_ol_ipip_lb_create(struct mlxsw_sp *mlxsw_sp,
@@ -966,7 +971,7 @@ mlxsw_sp_ipip_ol_ipip_lb_create(struct mlxsw_sp *mlxsw_sp,
                 .lb_config = ipip_ops->ol_loopback_config(mlxsw_sp, ol_dev),
         };
 
-        rif = mlxsw_sp_rif_create(mlxsw_sp, &lb_params.common);
+        rif = mlxsw_sp_rif_create(mlxsw_sp, &lb_params.common, NULL);
         if (IS_ERR(rif))
                 return ERR_CAST(rif);
         return container_of(rif, struct mlxsw_sp_rif_ipip_lb, common);
@@ -3836,7 +3841,7 @@ mlxsw_sp_fib_node_get(struct mlxsw_sp *mlxsw_sp, u32 tb_id, const void *addr,
         struct mlxsw_sp_vr *vr;
         int err;
 
-        vr = mlxsw_sp_vr_get(mlxsw_sp, tb_id);
+        vr = mlxsw_sp_vr_get(mlxsw_sp, tb_id, NULL);
         if (IS_ERR(vr))
                 return ERR_CAST(vr);
         fib = mlxsw_sp_vr_fib(vr, proto);
@@ -4875,7 +4880,7 @@ static int mlxsw_sp_router_fibmr_add(struct mlxsw_sp *mlxsw_sp,
         if (mlxsw_sp->router->aborted)
                 return 0;
 
-        vr = mlxsw_sp_vr_get(mlxsw_sp, men_info->tb_id);
+        vr = mlxsw_sp_vr_get(mlxsw_sp, men_info->tb_id, NULL);
         if (IS_ERR(vr))
                 return PTR_ERR(vr);
 
@@ -4908,7 +4913,7 @@ mlxsw_sp_router_fibmr_vif_add(struct mlxsw_sp *mlxsw_sp,
         if (mlxsw_sp->router->aborted)
                 return 0;
 
-        vr = mlxsw_sp_vr_get(mlxsw_sp, ven_info->tb_id);
+        vr = mlxsw_sp_vr_get(mlxsw_sp, ven_info->tb_id, NULL);
         if (IS_ERR(vr))
                 return PTR_ERR(vr);
 
@@ -5471,7 +5476,8 @@ const struct net_device *mlxsw_sp_rif_dev(const struct mlxsw_sp_rif *rif)
 
 static struct mlxsw_sp_rif *
 mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,
-                    const struct mlxsw_sp_rif_params *params)
+                    const struct mlxsw_sp_rif_params *params,
+                    struct netlink_ext_ack *extack)
 {
         u32 tb_id = l3mdev_fib_table(params->dev);
         const struct mlxsw_sp_rif_ops *ops;
@@ -5485,14 +5491,16 @@ mlxsw_sp_rif_create(struct mlxsw_sp *mlxsw_sp,
         type = mlxsw_sp_dev_rif_type(mlxsw_sp, params->dev);
         ops = mlxsw_sp->router->rif_ops_arr[type];
 
-        vr = mlxsw_sp_vr_get(mlxsw_sp, tb_id ? : RT_TABLE_MAIN);
+        vr = mlxsw_sp_vr_get(mlxsw_sp, tb_id ? : RT_TABLE_MAIN, extack);
         if (IS_ERR(vr))
                 return ERR_CAST(vr);
         vr->rif_count++;
 
         err = mlxsw_sp_rif_index_alloc(mlxsw_sp, &rif_index);
-        if (err)
+        if (err) {
+                NL_SET_ERR_MSG(extack, "spectrum: Exceeded number of supported router interfaces");
                 goto err_rif_index_alloc;
+        }
 
         rif = mlxsw_sp_rif_alloc(ops->rif_size, rif_index, vr->id, params->dev);
         if (!rif) {
@@ -5579,7 +5587,8 @@ mlxsw_sp_rif_subport_params_init(struct mlxsw_sp_rif_params *params,
 
 static int
 mlxsw_sp_port_vlan_router_join(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan,
-                               struct net_device *l3_dev)
+                               struct net_device *l3_dev,
+                               struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp_port_vlan->mlxsw_sp_port;
         struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
@@ -5595,7 +5604,7 @@ mlxsw_sp_port_vlan_router_join(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan,
                 };
 
                 mlxsw_sp_rif_subport_params_init(&params, mlxsw_sp_port_vlan);
-                rif = mlxsw_sp_rif_create(mlxsw_sp, &params);
+                rif = mlxsw_sp_rif_create(mlxsw_sp, &params, extack);
                 if (IS_ERR(rif))
                         return PTR_ERR(rif);
         }
@@ -5650,7 +5659,8 @@ mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan)
 
 static int mlxsw_sp_inetaddr_port_vlan_event(struct net_device *l3_dev,
                                              struct net_device *port_dev,
-                                             unsigned long event, u16 vid)
+                                             unsigned long event, u16 vid,
+                                             struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(port_dev);
         struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;
@@ -5662,7 +5672,7 @@ static int mlxsw_sp_inetaddr_port_vlan_event(struct net_device *l3_dev,
         switch (event) {
         case NETDEV_UP:
                 return mlxsw_sp_port_vlan_router_join(mlxsw_sp_port_vlan,
-                                                      l3_dev);
+                                                      l3_dev, extack);
         case NETDEV_DOWN:
                 mlxsw_sp_port_vlan_router_leave(mlxsw_sp_port_vlan);
                 break;
@@ -5672,19 +5682,22 @@ static int mlxsw_sp_inetaddr_port_vlan_event(struct net_device *l3_dev,
 }
 
 static int mlxsw_sp_inetaddr_port_event(struct net_device *port_dev,
-                                        unsigned long event)
+                                        unsigned long event,
+                                        struct netlink_ext_ack *extack)
 {
         if (netif_is_bridge_port(port_dev) ||
             netif_is_lag_port(port_dev) ||
             netif_is_ovs_port(port_dev))
                 return 0;
 
-        return mlxsw_sp_inetaddr_port_vlan_event(port_dev, port_dev, event, 1);
+        return mlxsw_sp_inetaddr_port_vlan_event(port_dev, port_dev, event, 1,
+                                                 extack);
 }
 
 static int __mlxsw_sp_inetaddr_lag_event(struct net_device *l3_dev,
                                          struct net_device *lag_dev,
-                                         unsigned long event, u16 vid)
+                                         unsigned long event, u16 vid,
+                                         struct netlink_ext_ack *extack)
 {
         struct net_device *port_dev;
         struct list_head *iter;
@@ -5694,7 +5707,8 @@ static int __mlxsw_sp_inetaddr_lag_event(struct net_device *l3_dev,
                 if (mlxsw_sp_port_dev_check(port_dev)) {
                         err = mlxsw_sp_inetaddr_port_vlan_event(l3_dev,
                                                                 port_dev,
-                                                                event, vid);
+                                                                event, vid,
+                                                                extack);
                         if (err)
                                 return err;
                 }
@@ -5704,16 +5718,19 @@ static int __mlxsw_sp_inetaddr_lag_event(struct net_device *l3_dev,
 }
 
 static int mlxsw_sp_inetaddr_lag_event(struct net_device *lag_dev,
-                                       unsigned long event)
+                                       unsigned long event,
+                                       struct netlink_ext_ack *extack)
 {
         if (netif_is_bridge_port(lag_dev))
                 return 0;
 
-        return __mlxsw_sp_inetaddr_lag_event(lag_dev, lag_dev, event, 1);
+        return __mlxsw_sp_inetaddr_lag_event(lag_dev, lag_dev, event, 1,
+                                             extack);
 }
 
 static int mlxsw_sp_inetaddr_bridge_event(struct net_device *l3_dev,
-                                          unsigned long event)
+                                          unsigned long event,
+                                          struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(l3_dev);
         struct mlxsw_sp_rif_params params = {
@@ -5723,7 +5740,7 @@ static int mlxsw_sp_inetaddr_bridge_event(struct net_device *l3_dev,
 
         switch (event) {
         case NETDEV_UP:
-                rif = mlxsw_sp_rif_create(mlxsw_sp, &params);
+                rif = mlxsw_sp_rif_create(mlxsw_sp, &params, extack);
                 if (IS_ERR(rif))
                         return PTR_ERR(rif);
                 break;
@@ -5737,7 +5754,8 @@ static int mlxsw_sp_inetaddr_bridge_event(struct net_device *l3_dev,
 }
 
 static int mlxsw_sp_inetaddr_vlan_event(struct net_device *vlan_dev,
-                                        unsigned long event)
+                                        unsigned long event,
+                                        struct netlink_ext_ack *extack)
 {
         struct net_device *real_dev = vlan_dev_real_dev(vlan_dev);
         u16 vid = vlan_dev_vlan_id(vlan_dev);
@@ -5747,27 +5765,28 @@ static int mlxsw_sp_inetaddr_vlan_event(struct net_device *vlan_dev,
 
         if (mlxsw_sp_port_dev_check(real_dev))
                 return mlxsw_sp_inetaddr_port_vlan_event(vlan_dev, real_dev,
-                                                         event, vid);
+                                                         event, vid, extack);
         else if (netif_is_lag_master(real_dev))
                 return __mlxsw_sp_inetaddr_lag_event(vlan_dev, real_dev, event,
-                                                     vid);
+                                                     vid, extack);
         else if (netif_is_bridge_master(real_dev) && br_vlan_enabled(real_dev))
-                return mlxsw_sp_inetaddr_bridge_event(vlan_dev, event);
+                return mlxsw_sp_inetaddr_bridge_event(vlan_dev, event, extack);
 
         return 0;
 }
 
 static int __mlxsw_sp_inetaddr_event(struct net_device *dev,
-                                     unsigned long event)
+                                     unsigned long event,
+                                     struct netlink_ext_ack *extack)
 {
         if (mlxsw_sp_port_dev_check(dev))
-                return mlxsw_sp_inetaddr_port_event(dev, event);
+                return mlxsw_sp_inetaddr_port_event(dev, event, extack);
         else if (netif_is_lag_master(dev))
-                return mlxsw_sp_inetaddr_lag_event(dev, event);
+                return mlxsw_sp_inetaddr_lag_event(dev, event, extack);
         else if (netif_is_bridge_master(dev))
-                return mlxsw_sp_inetaddr_bridge_event(dev, event);
+                return mlxsw_sp_inetaddr_bridge_event(dev, event, extack);
         else if (is_vlan_dev(dev))
-                return mlxsw_sp_inetaddr_vlan_event(dev, event);
+                return mlxsw_sp_inetaddr_vlan_event(dev, event, extack);
         else
                 return 0;
 }
@@ -5781,6 +5800,32 @@ int mlxsw_sp_inetaddr_event(struct notifier_block *unused,
         struct mlxsw_sp_rif *rif;
         int err = 0;
 
+        /* NETDEV_UP event is handled by mlxsw_sp_inetaddr_valid_event */
+        if (event == NETDEV_UP)
+                goto out;
+
+        mlxsw_sp = mlxsw_sp_lower_get(dev);
+        if (!mlxsw_sp)
+                goto out;
+
+        rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);
+        if (!mlxsw_sp_rif_should_config(rif, dev, event))
+                goto out;
+
+        err = __mlxsw_sp_inetaddr_event(dev, event, NULL);
+out:
+        return notifier_from_errno(err);
+}
+
+int mlxsw_sp_inetaddr_valid_event(struct notifier_block *unused,
+                                  unsigned long event, void *ptr)
+{
+        struct in_validator_info *ivi = (struct in_validator_info *) ptr;
+        struct net_device *dev = ivi->ivi_dev->dev;
+        struct mlxsw_sp *mlxsw_sp;
+        struct mlxsw_sp_rif *rif;
+        int err = 0;
+
         mlxsw_sp = mlxsw_sp_lower_get(dev);
         if (!mlxsw_sp)
                 goto out;
@@ -5789,7 +5834,7 @@ int mlxsw_sp_inetaddr_event(struct notifier_block *unused,
         if (!mlxsw_sp_rif_should_config(rif, dev, event))
                 goto out;
 
-        err = __mlxsw_sp_inetaddr_event(dev, event);
+        err = __mlxsw_sp_inetaddr_event(dev, event, ivi->extack);
 out:
         return notifier_from_errno(err);
 }
@@ -5818,7 +5863,7 @@ static void mlxsw_sp_inet6addr_event_work(struct work_struct *work)
         if (!mlxsw_sp_rif_should_config(rif, dev, event))
                 goto out;
 
-        __mlxsw_sp_inetaddr_event(dev, event);
+        __mlxsw_sp_inetaddr_event(dev, event, NULL);
 out:
         rtnl_unlock();
         dev_put(dev);
@@ -5833,6 +5878,10 @@ int mlxsw_sp_inet6addr_event(struct notifier_block *unused,
         struct mlxsw_sp_inet6addr_event_work *inet6addr_work;
         struct net_device *dev = if6->idev->dev;
 
+        /* NETDEV_UP event is handled by mlxsw_sp_inet6addr_valid_event */
+        if (event == NETDEV_UP)
+                return NOTIFY_DONE;
+
         if (!mlxsw_sp_port_dev_lower_find_rcu(dev))
                 return NOTIFY_DONE;
 
@@ -5849,6 +5898,28 @@ int mlxsw_sp_inet6addr_event(struct notifier_block *unused,
         return NOTIFY_DONE;
 }
 
+int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused,
+                                   unsigned long event, void *ptr)
+{
+        struct in6_validator_info *i6vi = (struct in6_validator_info *) ptr;
+        struct net_device *dev = i6vi->i6vi_dev->dev;
+        struct mlxsw_sp *mlxsw_sp;
+        struct mlxsw_sp_rif *rif;
+        int err = 0;
+
+        mlxsw_sp = mlxsw_sp_lower_get(dev);
+        if (!mlxsw_sp)
+                goto out;
+
+        rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);
+        if (!mlxsw_sp_rif_should_config(rif, dev, event))
+                goto out;
+
+        err = __mlxsw_sp_inetaddr_event(dev, event, i6vi->extack);
+out:
+        return notifier_from_errno(err);
+}
+
 static int mlxsw_sp_rif_edit(struct mlxsw_sp *mlxsw_sp, u16 rif_index,
                              const char *mac, int mtu)
 {
@@ -5921,7 +5992,8 @@ err_rif_edit:
 }
 
 static int mlxsw_sp_port_vrf_join(struct mlxsw_sp *mlxsw_sp,
-                                  struct net_device *l3_dev)
+                                  struct net_device *l3_dev,
+                                  struct netlink_ext_ack *extack)
 {
         struct mlxsw_sp_rif *rif;
 
@@ -5930,9 +6002,9 @@ static int mlxsw_sp_port_vrf_join(struct mlxsw_sp *mlxsw_sp,
          */
         rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev);
         if (rif)
-                __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN);
+                __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN, extack);
 
-        return __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_UP);
+        return __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_UP, extack);
 }
 
 static void mlxsw_sp_port_vrf_leave(struct mlxsw_sp *mlxsw_sp,
@@ -5943,7 +6015,7 @@ static void mlxsw_sp_port_vrf_leave(struct mlxsw_sp *mlxsw_sp,
         rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, l3_dev);
         if (!rif)
                 return;
-        __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN);
+        __mlxsw_sp_inetaddr_event(l3_dev, NETDEV_DOWN, NULL);
 }
 
 int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
@@ -5959,10 +6031,14 @@ int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
         case NETDEV_PRECHANGEUPPER:
                 return 0;
         case NETDEV_CHANGEUPPER:
-                if (info->linking)
-                        err = mlxsw_sp_port_vrf_join(mlxsw_sp, l3_dev);
-                else
+                if (info->linking) {
+                        struct netlink_ext_ack *extack;
+
+                        extack = netdev_notifier_info_to_extack(&info->info);
+                        err = mlxsw_sp_port_vrf_join(mlxsw_sp, l3_dev, extack);
+                } else {
                         mlxsw_sp_port_vrf_leave(mlxsw_sp, l3_dev);
+                }
                 break;
         }
 
@@ -6269,7 +6345,7 @@ mlxsw_sp_rif_ipip_lb_configure(struct mlxsw_sp_rif *rif)
         struct mlxsw_sp_vr *ul_vr;
         int err;
 
-        ul_vr = mlxsw_sp_vr_get(mlxsw_sp, ul_tb_id);
+        ul_vr = mlxsw_sp_vr_get(mlxsw_sp, ul_tb_id, NULL);
         if (IS_ERR(ul_vr))
                 return PTR_ERR(ul_vr);
 
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 3cf67db513e2..f0ab55df57f1 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -808,10 +808,6 @@ static int ipvlan_addr6_event(struct notifier_block *unused,
         struct net_device *dev = (struct net_device *)if6->idev->dev;
         struct ipvl_dev *ipvlan = netdev_priv(dev);
 
-        /* FIXME IPv6 autoconf calls us from bh without RTNL */
-        if (in_softirq())
-                return NOTIFY_DONE;
-
         if (!netif_is_ipvlan(dev))
                 return NOTIFY_DONE;
 
@@ -851,8 +847,11 @@ static int ipvlan_addr6_validator_event(struct notifier_block *unused,
 
         switch (event) {
         case NETDEV_UP:
-                if (ipvlan_addr_busy(ipvlan->port, &i6vi->i6vi_addr, true))
+                if (ipvlan_addr_busy(ipvlan->port, &i6vi->i6vi_addr, true)) {
+                        NL_SET_ERR_MSG(i6vi->extack,
+                                       "Address already assigned to an ipvlan device");
                         return notifier_from_errno(-EADDRINUSE);
+                }
                 break;
         }
 
@@ -921,8 +920,11 @@ static int ipvlan_addr4_validator_event(struct notifier_block *unused,
 
         switch (event) {
         case NETDEV_UP:
-                if (ipvlan_addr_busy(ipvlan->port, &ivi->ivi_addr, false))
+                if (ipvlan_addr_busy(ipvlan->port, &ivi->ivi_addr, false)) {
+                        NL_SET_ERR_MSG(ivi->extack,
+                                       "Address already assigned to an ipvlan device");
                         return notifier_from_errno(-EADDRINUSE);
+                }
                 break;
         }
 
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 751d051f0bc7..681dff30940b 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -154,6 +154,7 @@ struct in_ifaddr {
 struct in_validator_info {
         __be32                  ivi_addr;
         struct in_device        *ivi_dev;
+        struct netlink_ext_ack  *extack;
 };
 
 int register_inetaddr_notifier(struct notifier_block *nb);
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 87981cd63180..b8b16437c6d5 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -55,6 +55,7 @@ struct prefix_info {
 struct in6_validator_info {
         struct in6_addr         i6vi_addr;
         struct inet6_dev        *i6vi_dev;
+        struct netlink_ext_ack  *extack;
 };
 
 #define IN6_ADDR_HSIZE_SHIFT    4
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index e1e2ec0525e6..a4573bccd6da 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -444,7 +444,7 @@ static void check_lifetime(struct work_struct *work);
 static DECLARE_DELAYED_WORK(check_lifetime_work, check_lifetime);
 
 static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
-                             u32 portid)
+                             u32 portid, struct netlink_ext_ack *extack)
 {
         struct in_device *in_dev = ifa->ifa_dev;
         struct in_ifaddr *ifa1, **ifap, **last_primary;
@@ -489,6 +489,7 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
          */
         ivi.ivi_addr = ifa->ifa_address;
         ivi.ivi_dev = ifa->ifa_dev;
+        ivi.extack = extack;
         ret = blocking_notifier_call_chain(&inetaddr_validator_chain,
                                            NETDEV_UP, &ivi);
         ret = notifier_to_errno(ret);
@@ -521,7 +522,7 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
 
 static int inet_insert_ifa(struct in_ifaddr *ifa)
 {
-        return __inet_insert_ifa(ifa, NULL, 0);
+        return __inet_insert_ifa(ifa, NULL, 0, NULL);
 }
 
 static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
@@ -902,7 +903,8 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
                                 return ret;
                         }
                 }
-                return __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid);
+                return __inet_insert_ifa(ifa, nlh, NETLINK_CB(skb).portid,
+                                         extack);
         } else {
                 inet_free_ifa(ifa);
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4603aa488f4f..93f9c0a61911 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -957,18 +957,42 @@ static u32 inet6_addr_hash(const struct in6_addr *addr)
         return hash_32(ipv6_addr_hash(addr), IN6_ADDR_HSIZE_SHIFT);
 }
 
+static int ipv6_add_addr_hash(struct net_device *dev, struct inet6_ifaddr *ifa)
+{
+        unsigned int hash;
+        int err = 0;
+
+        spin_lock(&addrconf_hash_lock);
+
+        /* Ignore adding duplicate addresses on an interface */
+        if (ipv6_chk_same_addr(dev_net(dev), &ifa->addr, dev)) {
+                ADBG("ipv6_add_addr: already assigned\n");
+                err = -EEXIST;
+                goto out;
+        }
+
+        /* Add to big hash table */
+        hash = inet6_addr_hash(&ifa->addr);
+        hlist_add_head_rcu(&ifa->addr_lst, &inet6_addr_lst[hash]);
+
+out:
+        spin_unlock(&addrconf_hash_lock);
+
+        return err;
+}
+
 /* On success it returns ifp with increased reference count */
 
 static struct inet6_ifaddr *
 ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
               const struct in6_addr *peer_addr, int pfxlen,
-              int scope, u32 flags, u32 valid_lft, u32 prefered_lft)
+              int scope, u32 flags, u32 valid_lft, u32 prefered_lft,
+              bool can_block, struct netlink_ext_ack *extack)
 {
+        gfp_t gfp_flags = can_block ? GFP_KERNEL : GFP_ATOMIC;
         struct net *net = dev_net(idev->dev);
         struct inet6_ifaddr *ifa = NULL;
-        struct rt6_info *rt;
-        struct in6_validator_info i6vi;
-        unsigned int hash;
+        struct rt6_info *rt = NULL;
         int err = 0;
         int addr_type = ipv6_addr_type(addr);
 
@@ -978,42 +1002,33 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
              addr_type & IPV6_ADDR_LOOPBACK))
                 return ERR_PTR(-EADDRNOTAVAIL);
 
-        rcu_read_lock_bh();
-
-        in6_dev_hold(idev);
-
         if (idev->dead) {
                 err = -ENODEV;                  /*XXX*/
-                goto out2;
+                goto out;
         }
 
         if (idev->cnf.disable_ipv6) {
                 err = -EACCES;
-                goto out2;
-        }
-
-        i6vi.i6vi_addr = *addr;
-        i6vi.i6vi_dev = idev;
-        rcu_read_unlock_bh();
-
-        err = inet6addr_validator_notifier_call_chain(NETDEV_UP, &i6vi);
-
-        rcu_read_lock_bh();
-        err = notifier_to_errno(err);
-        if (err)
-                goto out2;
-
-        spin_lock(&addrconf_hash_lock);
-
-        /* Ignore adding duplicate addresses on an interface */
-        if (ipv6_chk_same_addr(dev_net(idev->dev), addr, idev->dev)) {
-                ADBG("ipv6_add_addr: already assigned\n");
-                err = -EEXIST;
                 goto out;
         }
 
-        ifa = kzalloc(sizeof(struct inet6_ifaddr), GFP_ATOMIC);
+        /* validator notifier needs to be blocking;
+         * do not call in atomic context
+         */
+        if (can_block) {
+                struct in6_validator_info i6vi = {
+                        .i6vi_addr = *addr,
+                        .i6vi_dev = idev,
+                        .extack = extack,
+                };
+
+                err = inet6addr_validator_notifier_call_chain(NETDEV_UP, &i6vi);
+                err = notifier_to_errno(err);
+                if (err < 0)
+                        goto out;
+        }
 
+        ifa = kzalloc(sizeof(*ifa), gfp_flags);
         if (!ifa) {
                 ADBG("ipv6_add_addr: malloc failed\n");
                 err = -ENOBUFS;
@@ -1023,6 +1038,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
         rt = addrconf_dst_alloc(idev, addr, false);
         if (IS_ERR(rt)) {
                 err = PTR_ERR(rt);
+                rt = NULL;
                 goto out;
         }
 
@@ -1053,16 +1069,21 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
         ifa->rt = rt;
 
         ifa->idev = idev;
+        in6_dev_hold(idev);
+
         /* For caller */
         refcount_set(&ifa->refcnt, 1);
 
-        /* Add to big hash table */
-        hash = inet6_addr_hash(addr);
+        rcu_read_lock_bh();
 
-        hlist_add_head_rcu(&ifa->addr_lst, &inet6_addr_lst[hash]);
-        spin_unlock(&addrconf_hash_lock);
+        err = ipv6_add_addr_hash(idev->dev, ifa);
+        if (err < 0) {
+                rcu_read_unlock_bh();
+                goto out;
+        }
 
         write_lock(&idev->lock);
+
         /* Add to inet6_dev unicast addr list. */
         ipv6_link_dev_addr(idev, ifa);
 
@@ -1073,21 +1094,23 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
 
         in6_ifa_hold(ifa);
         write_unlock(&idev->lock);
-out2:
+
         rcu_read_unlock_bh();
 
-        if (likely(err == 0))
-                inet6addr_notifier_call_chain(NETDEV_UP, ifa);
-        else {
-                kfree(ifa);
-                in6_dev_put(idev);
+        inet6addr_notifier_call_chain(NETDEV_UP, ifa);
+out:
+        if (unlikely(err < 0)) {
+                if (rt)
+                        ip6_rt_put(rt);
+                if (ifa) {
+                        if (ifa->idev)
+                                in6_dev_put(ifa->idev);
+                        kfree(ifa);
+                }
                 ifa = ERR_PTR(err);
         }
 
         return ifa;
-out:
-        spin_unlock(&addrconf_hash_lock);
-        goto out2;
 }
 
 enum cleanup_prefix_rt_t {
@@ -1334,7 +1357,7 @@ retry:
 
         ift = ipv6_add_addr(idev, &addr, NULL, tmp_plen,
                             ipv6_addr_scope(&addr), addr_flags,
-                            tmp_valid_lft, tmp_prefered_lft);
+                            tmp_valid_lft, tmp_prefered_lft, true, NULL);
         if (IS_ERR(ift)) {
                 in6_ifa_put(ifp);
                 in6_dev_put(idev);
@@ -2018,7 +2041,7 @@ void addrconf_dad_failure(struct inet6_ifaddr *ifp)
 
                 ifp2 = ipv6_add_addr(idev, &new_addr, NULL, pfxlen,
                                      scope, flags, valid_lft,
-                                     preferred_lft);
+                                     preferred_lft, false, NULL);
                 if (IS_ERR(ifp2))
                         goto lock_errdad;
 
@@ -2476,7 +2499,7 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev,
                                             pinfo->prefix_len,
                                             addr_type&IPV6_ADDR_SCOPE_MASK,
                                             addr_flags, valid_lft,
-                                            prefered_lft);
+                                            prefered_lft, false, NULL);
 
                 if (IS_ERR_OR_NULL(ifp))
                         return -1;
@@ -2786,7 +2809,8 @@ static int inet6_addr_add(struct net *net, int ifindex,
                           const struct in6_addr *pfx,
                           const struct in6_addr *peer_pfx,
                           unsigned int plen, __u32 ifa_flags,
-                          __u32 prefered_lft, __u32 valid_lft)
+                          __u32 prefered_lft, __u32 valid_lft,
+                          struct netlink_ext_ack *extack)
 {
         struct inet6_ifaddr *ifp;
         struct inet6_dev *idev;
@@ -2845,7 +2869,7 @@ static int inet6_addr_add(struct net *net, int ifindex,
         }
 
         ifp = ipv6_add_addr(idev, pfx, peer_pfx, plen, scope, ifa_flags,
-                            valid_lft, prefered_lft);
+                            valid_lft, prefered_lft, true, extack);
 
         if (!IS_ERR(ifp)) {
                 if (!(ifa_flags & IFA_F_NOPREFIXROUTE)) {
@@ -2930,7 +2954,7 @@ int addrconf_add_ifaddr(struct net *net, void __user *arg)
         rtnl_lock();
         err = inet6_addr_add(net, ireq.ifr6_ifindex, &ireq.ifr6_addr, NULL,
                              ireq.ifr6_prefixlen, IFA_F_PERMANENT,
-                             INFINITY_LIFE_TIME, INFINITY_LIFE_TIME);
+                             INFINITY_LIFE_TIME, INFINITY_LIFE_TIME, NULL);
         rtnl_unlock();
         return err;
 }
@@ -2960,7 +2984,8 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
 
         ifp = ipv6_add_addr(idev, addr, NULL, plen,
                             scope, IFA_F_PERMANENT,
-                            INFINITY_LIFE_TIME, INFINITY_LIFE_TIME);
+                            INFINITY_LIFE_TIME, INFINITY_LIFE_TIME,
+                            true, NULL);
         if (!IS_ERR(ifp)) {
                 spin_lock_bh(&ifp->lock);
                 ifp->flags &= ~IFA_F_TENTATIVE;
@@ -3060,7 +3085,7 @@ void addrconf_add_linklocal(struct inet6_dev *idev,
 #endif
 
         ifp = ipv6_add_addr(idev, addr, NULL, 64, IFA_LINK, addr_flags,
-                            INFINITY_LIFE_TIME, INFINITY_LIFE_TIME);
+                            INFINITY_LIFE_TIME, INFINITY_LIFE_TIME, true, NULL);
         if (!IS_ERR(ifp)) {
                 addrconf_prefix_route(&ifp->addr, ifp->prefix_len, idev->dev, 0, 0);
                 addrconf_dad_start(ifp);
@@ -4563,7 +4588,7 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
                  */
                 return inet6_addr_add(net, ifm->ifa_index, pfx, peer_pfx,
                                       ifm->ifa_prefixlen, ifa_flags,
-                                      preferred_lft, valid_lft);
+                                      preferred_lft, valid_lft, extack);
         }
 
         if (nlh->nlmsg_flags & NLM_F_EXCL ||
diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index 9e3488d50b15..32b564dfd02a 100644
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -88,7 +88,7 @@ int __ipv6_addr_type(const struct in6_addr *addr)
 EXPORT_SYMBOL(__ipv6_addr_type);
 
 static ATOMIC_NOTIFIER_HEAD(inet6addr_chain);
-static ATOMIC_NOTIFIER_HEAD(inet6addr_validator_chain);
+static BLOCKING_NOTIFIER_HEAD(inet6addr_validator_chain);
 
 int register_inet6addr_notifier(struct notifier_block *nb)
 {
@@ -110,19 +110,20 @@ EXPORT_SYMBOL(inet6addr_notifier_call_chain);
 
 int register_inet6addr_validator_notifier(struct notifier_block *nb)
 {
-        return atomic_notifier_chain_register(&inet6addr_validator_chain, nb);
+        return blocking_notifier_chain_register(&inet6addr_validator_chain, nb);
 }
 EXPORT_SYMBOL(register_inet6addr_validator_notifier);
 
 int unregister_inet6addr_validator_notifier(struct notifier_block *nb)
 {
-        return atomic_notifier_chain_unregister(&inet6addr_validator_chain, nb);
+        return blocking_notifier_chain_unregister(&inet6addr_validator_chain,
+                                                  nb);
 }
 EXPORT_SYMBOL(unregister_inet6addr_validator_notifier);
 
 int inet6addr_validator_notifier_call_chain(unsigned long val, void *v)
 {
-        return atomic_notifier_call_chain(&inet6addr_validator_chain, val, v);
+        return blocking_notifier_call_chain(&inet6addr_validator_chain, val, v);
 }
 EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);