fib_rules: Added NLM_F_EXCL support to fib_nl_newrule
Subsystems (3)
PATCH v2 1/1 fib_rules: Added NLM_F_EXCL support to fib_nl_newrule
When adding rule with NLM_F_EXCL flag then check if the same rule exist. If yes then exit with -EEXIST.
This is already implemented in iproute2:
if (cmd == RTM_NEWRULE) {
req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
req.r.rtm_type = RTN_UNICAST;
}Tested ipv4 and ipv6 with net-next linux on qemu x86
expected behavior after patch:
localhost ~ # ip rule
0: from all lookup local
32766: from all lookup main
32767: from all lookup default
localhost ~ # ip rule add from 10.46.177.97 lookup 104 pref 1005 localhost ~ # ip rule add from 10.46.177.97 lookup 104 pref 1005 RTNETLINK answers: File exists
localhost ~ # ip rule
0: from all lookup local
1005: from 10.46.177.97 lookup 104
32766: from all lookup main
32767: from all lookup default
There was already topic regarding this but I don't see any changes merged and problem still occurs.
https://lkml.kernel.org/r/1135778809.5944.7.camel+%28%29+localhost+%21+localdomain
---
Changes in v2: section moved to new place where new rule is already built
net/core/fib_rules.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
net/core/fib_rules.c +34 -0
@@ -371,6 +371,40 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh) }else if (rule->action ==FR_ACT_GOTO ) goto errout_free; +if (nlh->nlmsg_flags &NLM_F_EXCL ) { +list_for_each_entry (r, &ops->rules_list, list) { +if (r->action != rule->action) +continue ; + +if (r->table != rule->table) +continue ; + +if (r->pref != rule->pref) +continue ; + +if (memcmp (r->iifname, rule->iifname,IFNAMSIZ )) +continue ; + +if (memcmp (r->oifname, rule->oifname,IFNAMSIZ )) +continue ; + +if (r->mark != rule->mark) +continue ; + +if (r->mark_mask != rule->mark_mask) +continue ; + +if (r->tun_id != rule->tun_id) +continue ; + +if (!ops->compare (r, frh, tb)) +continue ; + + err = -EEXIST ; + goto errout_free; + } + } + err = ops->configure (rule, skb, frh, tb);if (err <0 ) goto errout_free;
Signature · 1 line
2.6.4
Quoted 41 lines · Mateusz Bajorski
When adding rule with
NLM_F_EXCLflag then check if the same rule exist. If yes then exit with-EEXIST.This is already implemented in iproute2:
if (cmd == RTM_NEWRULE) { req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL; req.r.rtm_type = RTN_UNICAST; }Tested ipv4 and ipv6 with net-next linux on qemu x86
expected behavior after patch:
localhost ~ # ip rule
0: from all lookup local
32766: from all lookup main
32767: from all lookup default
localhost ~ # ip rule add from 10.46.177.97 lookup 104 pref 1005 localhost ~ # ip rule add from 10.46.177.97 lookup 104 pref 1005 RTNETLINK answers: File exists
localhost ~ # ip rule
0: from all lookup local
1005: from 10.46.177.97 lookup 104
32766: from all lookup main
32767: from all lookup defaultThere was already topic regarding this but I don't see any changes merged and problem still occurs.
https://lkml.kernel.org/r/1135778809.5944.7.camel+%28%29+localhost+%21+localdomainSigned-off-by Mateusz Bajorski <[email protected]>---
Changes in v2: section moved to new place where new rule is already builtnet/core/fib_rules.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)net/core/fib_rules.c +0
-0
net/core/fib_rules.c static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh) · line 375
Quoted 5 lines
net/core/fib_rules.c +2
-0@@ -371,6 +371,40 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh) }else if (rule->action ==FR_ACT_GOTO ) goto errout_free; +if (nlh->nlmsg_flags &NLM_F_EXCL ) { +list_for_each_entry (r, &ops->rules_list, list) {
missing a namespace (fr_net) compare. Everything else is relative to it.
I suggest making the rule compare a helper function.
Also, this is going to be one of those pain points as new rule attributes are added - new attributes are not added to the compare. Perhaps a note above the fib_rule definition in net/fib_rules.h to add new attributes to the fib_rule compare function?
Quoted 36 lines
net/core/fib_rules.c +32
-0+if (r->action != rule->action) +continue ; + +if (r->table != rule->table) +continue ; + +if (r->pref != rule->pref) +continue ; + +if (memcmp (r->iifname, rule->iifname,IFNAMSIZ )) +continue ; + +if (memcmp (r->oifname, rule->oifname,IFNAMSIZ )) +continue ; + +if (r->mark != rule->mark) +continue ; + +if (r->mark_mask != rule->mark_mask) +continue ; + +if (r->tun_id != rule->tun_id) +continue ; + +if (!ops->compare (r, frh, tb)) +continue ; + + err = -EEXIST ; + goto errout_free; + } + } + err = ops->configure (rule, skb, frh, tb);if (err <0 ) goto errout_free;
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Mon, 30 May 2016 20:21:29 -0600
Quoted 4 lines
missing a namespace (
fr_net) compare. Everything else is relative to it.I suggest making the rule compare a helper function.
I also explicitly asked the submitted to use a helper function.