| Message ID | 20180328012200.15175-3-dsa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: Allow FIB notifiers to fail add and replace | expand |
On Tue, Mar 27, 2018 at 06:21:56PM -0700, David Ahern wrote: > Move call_fib_rule_notifiers up in fib_nl_newrule to the point right > before the rule is inserted into the list. At this point there are no > more failure paths within the core rule code, so if the notifier > does not fail then the rule will be inserted into the list. > > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com>
On Tue, Mar 27, 2018 at 06:21:56PM -0700, David Ahern wrote: > Move call_fib_rule_notifiers up in fib_nl_newrule to the point right > before the rule is inserted into the list. At this point there are no > more failure paths within the core rule code, so if the notifier > does not fail then the rule will be inserted into the list. > > Signed-off-by: David Ahern <dsa@cumulusnetworks.com> BTW, this means we can now return an error from mlxsw instead of only emitting an extack warning when an unsupported FIB rule is configured. Will add that.
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 9d87ce868402..33958f84c173 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -631,6 +631,11 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, if (err < 0) goto errout_free; + err = call_fib_rule_notifiers(net, FIB_EVENT_RULE_ADD, rule, ops, + extack); + if (err < 0) + goto errout_free; + list_for_each_entry(r, &ops->rules_list, list) { if (r->pref > rule->pref) break; @@ -667,7 +672,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, if (rule->tun_id) ip_tunnel_need_metadata(); - call_fib_rule_notifiers(net, FIB_EVENT_RULE_ADD, rule, ops, extack); notify_rule_change(RTM_NEWRULE, rule, ops, nlh, NETLINK_CB(skb).portid); flush_route_cache(ops); rules_ops_put(ops);
Move call_fib_rule_notifiers up in fib_nl_newrule to the point right before the rule is inserted into the list. At this point there are no more failure paths within the core rule code, so if the notifier does not fail then the rule will be inserted into the list. Signed-off-by: David Ahern <dsa@cumulusnetworks.com> --- net/core/fib_rules.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)