UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nexthop: Emit a notification when a nexthop group is modified 

When a single nexthop is replaced, the configuration of all the groups
using the nexthop is effectively modified. In this case, emit a
notification in the nexthop notification chain for each modified group
so that listeners would not need to keep track of which nexthops are
member in which groups.

The notification can only be emitted after the new configuration (i.e.,
'struct nh_info') is pointed at by the old shell (i.e., 'struct
nexthop'). Before that the configuration of the nexthop groups is still
the same as before the replacement.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ido Schimmel 2020-11-04 15:30:32 +02:00 committed by Jakub Kicinski
parent 8c09c9f9d8
commit f17bc33d74
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/ipv4/nexthop.c
View File

@ -1099,7 +1099,9 @@ static int replace_nexthop_single(struct net *net, struct nexthop *old,
struct nexthop *new, struct nexthop *new,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
u8 old_protocol, old_nh_flags;
struct nh_info *oldi, *newi; struct nh_info *oldi, *newi;
struct nh_grp_entry *nhge;
int err; int err;
if (new->is_group) { if (new->is_group) {
@ -1122,18 +1124,29 @@ static int replace_nexthop_single(struct net *net, struct nexthop *old,
newi->nh_parent = old; newi->nh_parent = old;
oldi->nh_parent = new; oldi->nh_parent = new;
old_protocol = old->protocol;
old_nh_flags = old->nh_flags;
old->protocol = new->protocol; old->protocol = new->protocol;
old->nh_flags = new->nh_flags; old->nh_flags = new->nh_flags;
rcu_assign_pointer(old->nh_info, newi); rcu_assign_pointer(old->nh_info, newi);
rcu_assign_pointer(new->nh_info, oldi); rcu_assign_pointer(new->nh_info, oldi);
/* Send a replace notification for all the groups using the nexthop. */
list_for_each_entry(nhge, &old->grp_list, nh_list) {
struct nexthop *nhp = nhge->nh_parent;
err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, nhp,
extack);
if (err)
goto err_notify;
}
/* When replacing an IPv4 nexthop with an IPv6 nexthop, potentially /* When replacing an IPv4 nexthop with an IPv6 nexthop, potentially
* update IPv4 indication in all the groups using the nexthop. * update IPv4 indication in all the groups using the nexthop.
*/ */
if (oldi->family == AF_INET && newi->family == AF_INET6) { if (oldi->family == AF_INET && newi->family == AF_INET6) {
struct nh_grp_entry *nhge;
list_for_each_entry(nhge, &old->grp_list, nh_list) { list_for_each_entry(nhge, &old->grp_list, nh_list) {
struct nexthop *nhp = nhge->nh_parent; struct nexthop *nhp = nhge->nh_parent;
struct nh_group *nhg; struct nh_group *nhg;
@ -1144,6 +1157,21 @@ static int replace_nexthop_single(struct net *net, struct nexthop *old,
} }
return 0; return 0;
err_notify:
rcu_assign_pointer(new->nh_info, newi);
rcu_assign_pointer(old->nh_info, oldi);
old->nh_flags = old_nh_flags;
old->protocol = old_protocol;
oldi->nh_parent = old;
newi->nh_parent = new;
list_for_each_entry_continue_reverse(nhge, &old->grp_list, nh_list) {
struct nexthop *nhp = nhge->nh_parent;
call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, nhp, extack);
}
call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, old, extack);
return err;
} }
static void __nexthop_replace_notify(struct net *net, struct nexthop *nh, static void __nexthop_replace_notify(struct net *net, struct nexthop *nh,