ipv6: Use result arg in fib_lookup_arg consistently
Subsystems (3)
David Ahern
maintainerPATCH 1/1 ipv6: Use result arg in fib_lookup_arg consistently
From: David Ahern <[email protected]>
arg.result is sometimes used as fib6_result and sometimes used to hold the rt6_info. Add rt6_info to fib6_result and make the use of arg.result consistent through ipv6 rules.
The rt6 entry is filled in for lookups returning a dst_entry, but not for direct fib_lookups that just want a fib6_info.
--- include/net/ip6_fib.h | 1 + net/ipv6/fib6_rules.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)
include/net/ip6_fib.h +1 -0
@@ -195,6 +195,7 @@ struct fib6_result {struct fib6_info *f6i;u32 fib6_flags;u8 fib6_type; +struct rt6_info *rt6; };#define for_each_fib6_node_rt_rcu (fn) \
net/ipv6/fib6_rules.c +11 -4
@@ -94,9 +94,11 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6, int flags, pol_lookup_t lookup) {if (net->ipv6.fib6_has_custom_rules) { +struct fib6_result res = {};struct fib_lookup_arg arg = { .lookup_ptr = lookup, .lookup_data = skb, + .result = &res, .flags =FIB_LOOKUP_NOREF , };
@@ -106,8 +108,8 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,fib_rules_lookup (net->ipv6.fib6_rules_ops,flowi6_to_flowi (fl6), flags, &arg); -if (arg.result) -return arg.result; +if (res.rt6) +return &res.rt6->dst; }else {struct rt6_info *rt;
@@ -189,6 +191,7 @@ static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,static int __fib6_rule_action (struct fib_rule *rule,struct flowi *flp,int flags,struct fib_lookup_arg *arg) { +struct fib6_result *res = arg->result;struct flowi6 *flp6 = &flp->u.ip6;struct rt6_info *rt =NULL ;struct fib6_table *table;
@@ -243,7 +246,7 @@ static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp, discard_pkt:dst_hold (&rt->dst); out: - arg->result = rt; + res->rt6 = rt;return err; }
@@ -258,9 +261,13 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,static bool fib6_rule_suppress (struct fib_rule *rule,struct fib_lookup_arg *arg) { -struct rt6_info *rt = (struct rt6_info *) arg->result; +struct fib6_result *res = arg->result; +struct rt6_info *rt = res->rt6;struct net_device *dev =NULL ; +if (!rt) +return false; +if (rt->rt6i_idev) dev = rt->rt6i_idev->dev;
Signature · 1 line
2.11.0
From: David Ahern <[email protected]>
Date: Tue, 23 Apr 2019 18:05:33 -0700
Quoted 11 lines
From: David Ahern <[email protected]>
arg.result is sometimes used as
fib6_resultand sometimes used to hold thert6_info. Addrt6_infotofib6_resultand make the use of arg.result consistent through ipv6 rules.The rt6 entry is filled in for lookups returning a
dst_entry, but not for directfib_lookupsthat just want afib6_info.Fixes effda4dd97e8 ("ipv6: Pass fib6_result to fib lookups")Signed-off-by David Ahern <[email protected]>
Applied.