Commit 7a2b03c5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

fib_rules: __rcu annotates ctarget

Adds __rcu annotation to (struct fib_rule)->ctarget
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b33eab08
...@@ -20,7 +20,7 @@ struct fib_rule { ...@@ -20,7 +20,7 @@ struct fib_rule {
u32 table; u32 table;
u8 action; u8 action;
u32 target; u32 target;
struct fib_rule * ctarget; struct fib_rule __rcu *ctarget;
char iifname[IFNAMSIZ]; char iifname[IFNAMSIZ];
char oifname[IFNAMSIZ]; char oifname[IFNAMSIZ];
struct rcu_head rcu; struct rcu_head rcu;
......
...@@ -351,12 +351,12 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) ...@@ -351,12 +351,12 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
list_for_each_entry(r, &ops->rules_list, list) { list_for_each_entry(r, &ops->rules_list, list) {
if (r->pref == rule->target) { if (r->pref == rule->target) {
rule->ctarget = r; RCU_INIT_POINTER(rule->ctarget, r);
break; break;
} }
} }
if (rule->ctarget == NULL) if (rcu_dereference_protected(rule->ctarget, 1) == NULL)
unresolved = 1; unresolved = 1;
} else if (rule->action == FR_ACT_GOTO) } else if (rule->action == FR_ACT_GOTO)
goto errout_free; goto errout_free;
...@@ -386,7 +386,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) ...@@ -386,7 +386,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
list_for_each_entry(r, &ops->rules_list, list) { list_for_each_entry(r, &ops->rules_list, list) {
if (r->action == FR_ACT_GOTO && if (r->action == FR_ACT_GOTO &&
r->target == rule->pref) { r->target == rule->pref) {
BUG_ON(r->ctarget != NULL); BUG_ON(rtnl_dereference(r->ctarget) != NULL);
rcu_assign_pointer(r->ctarget, rule); rcu_assign_pointer(r->ctarget, rule);
if (--ops->unresolved_rules == 0) if (--ops->unresolved_rules == 0)
break; break;
...@@ -487,7 +487,7 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) ...@@ -487,7 +487,7 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
*/ */
if (ops->nr_goto_rules > 0) { if (ops->nr_goto_rules > 0) {
list_for_each_entry(tmp, &ops->rules_list, list) { list_for_each_entry(tmp, &ops->rules_list, list) {
if (tmp->ctarget == rule) { if (rtnl_dereference(tmp->ctarget) == rule) {
rcu_assign_pointer(tmp->ctarget, NULL); rcu_assign_pointer(tmp->ctarget, NULL);
ops->unresolved_rules++; ops->unresolved_rules++;
} }
...@@ -545,7 +545,8 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule, ...@@ -545,7 +545,8 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
frh->action = rule->action; frh->action = rule->action;
frh->flags = rule->flags; frh->flags = rule->flags;
if (rule->action == FR_ACT_GOTO && rule->ctarget == NULL) if (rule->action == FR_ACT_GOTO &&
rcu_dereference_raw(rule->ctarget) == NULL)
frh->flags |= FIB_RULE_UNRESOLVED; frh->flags |= FIB_RULE_UNRESOLVED;
if (rule->iifname[0]) { if (rule->iifname[0]) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment