iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/ipv6: Update fib6 tracepoint to take fib6_info

Browse Source 
Similar to IPv4, IPv6 should use the FIB lookup result in the
tracepoint.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
David Ahern 2018-05-09 20:34:24 -07:00 committed by Daniel Borkmann
parent 138118ec96
commit d4bea421f7
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/trace/events/fib6.h
View File

@ -12,10 +12,10 @@
TRACE_EVENT(fib6_table_lookup, TRACE_EVENT(fib6_table_lookup,
TP_PROTO(const struct net *net, const struct rt6_info *rt, TP_PROTO(const struct net *net, const struct fib6_info *f6i,
struct fib6_table *table, const struct flowi6 *flp), struct fib6_table *table, const struct flowi6 *flp),
TP_ARGS(net, rt, table, flp), TP_ARGS(net, f6i, table, flp),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( u32, tb_id ) __field( u32, tb_id )
@ -48,20 +48,20 @@ TRACE_EVENT(fib6_table_lookup,
in6 = (struct in6_addr *)__entry->dst; in6 = (struct in6_addr *)__entry->dst;
*in6 = flp->daddr; *in6 = flp->daddr;
if (rt->rt6i_idev) { if (f6i->fib6_nh.nh_dev) {
__assign_str(name, rt->rt6i_idev->dev->name); __assign_str(name, f6i->fib6_nh.nh_dev);
} else { } else {
__assign_str(name, ""); __assign_str(name, "");
} }
if (rt == net->ipv6.ip6_null_entry) { if (f6i == net->ipv6.fib6_null_entry) {
struct in6_addr in6_zero = {}; struct in6_addr in6_zero = {};
in6 = (struct in6_addr *)__entry->gw; in6 = (struct in6_addr *)__entry->gw;
*in6 = in6_zero; *in6 = in6_zero;
} else if (rt) { } else if (f6i) {
in6 = (struct in6_addr *)__entry->gw; in6 = (struct in6_addr *)__entry->gw;
*in6 = rt->rt6i_gateway; *in6 = f6i->fib6_nh.nh_gw;
} }
), ),

14
net/ipv6/route.c
View File

@ -1078,6 +1078,8 @@ restart:
goto restart; goto restart;
} }
trace_fib6_table_lookup(net, f6i, table, fl6);
/* Search through exception table */ /* Search through exception table */
rt = rt6_find_cached_rt(f6i, &fl6->daddr, &fl6->saddr); rt = rt6_find_cached_rt(f6i, &fl6->daddr, &fl6->saddr);
if (rt) { if (rt) {
@ -1096,8 +1098,6 @@ restart:
rcu_read_unlock(); rcu_read_unlock();
trace_fib6_table_lookup(net, rt, table, fl6);
return rt; return rt;
} }
@ -1827,6 +1827,8 @@ redo_rt6_select:
} }
} }
trace_fib6_table_lookup(net, f6i, table, fl6);
return f6i; return f6i;
} }
@ -1853,7 +1855,6 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
rt = net->ipv6.ip6_null_entry; rt = net->ipv6.ip6_null_entry;
rcu_read_unlock(); rcu_read_unlock();
dst_hold(&rt->dst); dst_hold(&rt->dst);
trace_fib6_table_lookup(net, rt, table, fl6);
return rt; return rt;
} }
@ -1864,7 +1865,6 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
dst_use_noref(&rt->dst, jiffies); dst_use_noref(&rt->dst, jiffies);
rcu_read_unlock(); rcu_read_unlock();
trace_fib6_table_lookup(net, rt, table, fl6);
return rt; return rt;
} else if (unlikely((fl6->flowi6_flags & FLOWI_FLAG_KNOWN_NH) && } else if (unlikely((fl6->flowi6_flags & FLOWI_FLAG_KNOWN_NH) &&
!(f6i->fib6_flags & RTF_GATEWAY))) { !(f6i->fib6_flags & RTF_GATEWAY))) {
@ -1890,9 +1890,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
dst_hold(&uncached_rt->dst); dst_hold(&uncached_rt->dst);
} }
trace_fib6_table_lookup(net, uncached_rt, table, fl6);
return uncached_rt; return uncached_rt;
} else { } else {
/* Get a percpu copy */ /* Get a percpu copy */
@ -1906,7 +1904,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
local_bh_enable(); local_bh_enable();
rcu_read_unlock(); rcu_read_unlock();
trace_fib6_table_lookup(net, pcpu_rt, table, fl6);
return pcpu_rt; return pcpu_rt;
} }
} }
@ -2491,7 +2489,7 @@ out:
rcu_read_unlock(); rcu_read_unlock();
trace_fib6_table_lookup(net, ret, table, fl6); trace_fib6_table_lookup(net, rt, table, fl6);
return ret; return ret;
}; };