From: Ido Schimmel <ido...@mellanox.com>
Both listeners - mlxsw and netdevsim - of IPv6 FIB notifications are now
ready to handle IPv6 multipath notifications.
Therefore, stop ignoring such notifications in both drivers and stop
sending notification for each added / deleted nexthop.
Signed-off-by: Ido Schimmel <ido...@mellanox.com>
Acked-by: Jiri Pirko <j...@mellanox.com>
---
.../ethernet/mellanox/mlxsw/spectrum_router.c | 2 --
drivers/net/netdevsim/fib.c | 7 -----
net/ipv6/ip6_fib.c | 28 +++++++++++--------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 2f5fa1fac825..1ad3bb88f85f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -6228,8 +6228,6 @@ static int mlxsw_sp_router_fib_event(struct
notifier_block *nb,
NL_SET_ERR_MSG_MOD(info->extack, "IPv6 route
with nexthop objects is not supported");
return notifier_from_errno(-EINVAL);
}
- if (fen6_info->multipath_rt)
- return NOTIFY_DONE;
}
break;
}
diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c
index 6e5498ef3855..2acef70f93db 100644
--- a/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@ -197,13 +197,6 @@ static int nsim_fib_event_nb(struct notifier_block *nb,
unsigned long event,
case FIB_EVENT_ENTRY_ADD: /* fall through */
case FIB_EVENT_ENTRY_DEL:
- if (info->family == AF_INET6) {
- struct fib6_entry_notifier_info *fen6_info = ptr;
-
- if (fen6_info->multipath_rt)
- return NOTIFY_DONE;
- }
-
err = nsim_fib_event(data, info,
event == FIB_EVENT_ENTRY_ADD);
break;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index df08ba8fe6fc..e08f2a502d09 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1140,11 +1140,13 @@ static int fib6_add_rt2node(struct fib6_node *fn,
struct fib6_info *rt,
add:
nlflags |= NLM_F_CREATE;
- err = call_fib6_entry_notifiers(info->nl_net,
- FIB_EVENT_ENTRY_ADD,
- rt, extack);
- if (err)
- return err;
+ if (!info->skip_notify_kernel) {
+ err = call_fib6_entry_notifiers(info->nl_net,
+ FIB_EVENT_ENTRY_ADD,
+ rt, extack);
+ if (err)
+ return err;
+ }
rcu_assign_pointer(rt->fib6_next, iter);
fib6_info_hold(rt);
@@ -1169,11 +1171,13 @@ static int fib6_add_rt2node(struct fib6_node *fn,
struct fib6_info *rt,
return -ENOENT;
}
- err = call_fib6_entry_notifiers(info->nl_net,
- FIB_EVENT_ENTRY_REPLACE,
- rt, extack);
- if (err)
- return err;
+ if (!info->skip_notify_kernel) {
+ err = call_fib6_entry_notifiers(info->nl_net,
+ FIB_EVENT_ENTRY_REPLACE,
+ rt, extack);
+ if (err)
+ return err;
+ }
fib6_info_hold(rt);
rcu_assign_pointer(rt->fib6_node, fn);
@@ -1856,9 +1860,11 @@ static void fib6_del_route(struct fib6_table *table,
struct fib6_node *fn,
fib6_purge_rt(rt, fn, net);
- call_fib6_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, rt, NULL);
+ if (!info->skip_notify_kernel)
+ call_fib6_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, rt, NULL);
if (!info->skip_notify)
inet6_rt_notify(RTM_DELROUTE, rt, info, 0);
+
fib6_info_release(rt);
}
--
2.20.1
