Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fib_rules: __rcu annotates ctarget

Adds __rcu annotation to (struct fib_rule)->ctarget

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric Dumazet and committed by
David S. Miller
7a2b03c5 b33eab08

+7 -6
+1 -1
include/net/fib_rules.h
··· 20 20 u32 table; 21 21 u8 action; 22 22 u32 target; 23 - struct fib_rule * ctarget; 23 + struct fib_rule __rcu *ctarget; 24 24 char iifname[IFNAMSIZ]; 25 25 char oifname[IFNAMSIZ]; 26 26 struct rcu_head rcu;
+6 -5
net/core/fib_rules.c
··· 351 351 352 352 list_for_each_entry(r, &ops->rules_list, list) { 353 353 if (r->pref == rule->target) { 354 - rule->ctarget = r; 354 + RCU_INIT_POINTER(rule->ctarget, r); 355 355 break; 356 356 } 357 357 } 358 358 359 - if (rule->ctarget == NULL) 359 + if (rcu_dereference_protected(rule->ctarget, 1) == NULL) 360 360 unresolved = 1; 361 361 } else if (rule->action == FR_ACT_GOTO) 362 362 goto errout_free; ··· 386 386 list_for_each_entry(r, &ops->rules_list, list) { 387 387 if (r->action == FR_ACT_GOTO && 388 388 r->target == rule->pref) { 389 - BUG_ON(r->ctarget != NULL); 389 + BUG_ON(rtnl_dereference(r->ctarget) != NULL); 390 390 rcu_assign_pointer(r->ctarget, rule); 391 391 if (--ops->unresolved_rules == 0) 392 392 break; ··· 487 487 */ 488 488 if (ops->nr_goto_rules > 0) { 489 489 list_for_each_entry(tmp, &ops->rules_list, list) { 490 - if (tmp->ctarget == rule) { 490 + if (rtnl_dereference(tmp->ctarget) == rule) { 491 491 rcu_assign_pointer(tmp->ctarget, NULL); 492 492 ops->unresolved_rules++; 493 493 } ··· 545 545 frh->action = rule->action; 546 546 frh->flags = rule->flags; 547 547 548 - if (rule->action == FR_ACT_GOTO && rule->ctarget == NULL) 548 + if (rule->action == FR_ACT_GOTO && 549 + rcu_dereference_raw(rule->ctarget) == NULL) 549 550 frh->flags |= FIB_RULE_UNRESOLVED; 550 551 551 552 if (rule->iifname[0]) {