FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-14 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipv4: Update fib_table_lookup tracepoint to take common nexthop

Browse Source 
Update fib_table_lookup tracepoint to take a fib_nh_common struct and
dump the v6 gateway address if the nexthop uses it.

Over the years saddr has not proven useful and the output of the
tracepoint produces very long lines. Since saddr is not part of
fib_nh_common, drop it. If it needs to be added later, fib_nh which
contains saddr can be obtained from a fib_nh_common via container_of.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-04-02 14:11:54 -07:00 committed by David S. Miller
parent 4950c2ba49
commit 0af7e7c128
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/trace/events/fib.h
View File

@ -13,9 +13,9 @@
TRACE_EVENT(fib_table_lookup, TRACE_EVENT(fib_table_lookup,
TP_PROTO(u32 tb_id, const struct flowi4 *flp, TP_PROTO(u32 tb_id, const struct flowi4 *flp,
const struct fib_nh *nh, int err), const struct fib_nh_common *nhc, int err),
TP_ARGS(tb_id, flp, nh, err), TP_ARGS(tb_id, flp, nhc, err),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( u32, tb_id ) __field( u32, tb_id )
@ -28,14 +28,17 @@ TRACE_EVENT(fib_table_lookup,
__field( __u8, flags ) __field( __u8, flags )
__array( __u8, src, 4 ) __array( __u8, src, 4 )
__array( __u8, dst, 4 ) __array( __u8, dst, 4 )
__array( __u8, gw, 4 ) __array( __u8, gw4, 4 )
__array( __u8, saddr, 4 ) __array( __u8, gw6, 16 )
__field( u16, sport ) __field( u16, sport )
__field( u16, dport ) __field( u16, dport )
__dynamic_array(char, name, IFNAMSIZ ) __dynamic_array(char, name, IFNAMSIZ )
), ),
TP_fast_assign( TP_fast_assign(
struct in6_addr in6_zero = {};
struct net_device *dev;
struct in6_addr *in6;
__be32 *p32; __be32 *p32;
__entry->tb_id = tb_id; __entry->tb_id = tb_id;
@ -62,33 +65,37 @@ TRACE_EVENT(fib_table_lookup,
__entry->dport = 0; __entry->dport = 0;
} }
if (nh) { dev = nhc ? nhc->nhc_dev : NULL;
struct net_device *dev; __assign_str(name, dev ? dev->name : "-");
p32 = (__be32 *) __entry->saddr; if (nhc) {
*p32 = nh->nh_saddr; if (nhc->nhc_family == AF_INET) {
p32 = (__be32 *) __entry->gw4;
*p32 = nhc->nhc_gw.ipv4;
p32 = (__be32 *) __entry->gw; in6 = (struct in6_addr *)__entry->gw6;
*p32 = nh->fib_nh_gw4; *in6 = in6_zero;
} else if (nhc->nhc_family == AF_INET6) {
p32 = (__be32 *) __entry->gw4;
*p32 = 0;
dev = nh->fib_nh_dev; in6 = (struct in6_addr *)__entry->gw6;
__assign_str(name, dev ? dev->name : "-"); *in6 = nhc->nhc_gw.ipv6;
}
} else { } else {
p32 = (__be32 *) __entry->saddr; p32 = (__be32 *) __entry->gw4;
*p32 = 0; *p32 = 0;
p32 = (__be32 *) __entry->gw; in6 = (struct in6_addr *)__entry->gw6;
*p32 = 0; *in6 = in6_zero;
__assign_str(name, "-");
} }
), ),
TP_printk("table %u oif %d iif %d proto %u %pI4/%u -> %pI4/%u tos %d scope %d flags %x ==> dev %s gw %pI4 src %pI4 err %d", TP_printk("table %u oif %d iif %d proto %u %pI4/%u -> %pI4/%u tos %d scope %d flags %x ==> dev %s gw %pI4/%pI6c err %d",
__entry->tb_id, __entry->oif, __entry->iif, __entry->proto, __entry->tb_id, __entry->oif, __entry->iif, __entry->proto,
__entry->src, __entry->sport, __entry->dst, __entry->dport, __entry->src, __entry->sport, __entry->dst, __entry->dport,
__entry->tos, __entry->scope, __entry->flags, __entry->tos, __entry->scope, __entry->flags,
__get_str(name), __entry->gw, __entry->saddr, __entry->err) __get_str(name), __entry->gw4, __entry->gw6, __entry->err)
); );
#endif /* _TRACE_FIB_H */ #endif /* _TRACE_FIB_H */

2
net/ipv4/fib_trie.c
View File

@ -1498,7 +1498,7 @@ found:
#ifdef CONFIG_IP_FIB_TRIE_STATS #ifdef CONFIG_IP_FIB_TRIE_STATS
this_cpu_inc(stats->semantic_match_passed); this_cpu_inc(stats->semantic_match_passed);
#endif #endif
trace_fib_table_lookup(tb->tb_id, flp, nh, err); trace_fib_table_lookup(tb->tb_id, flp, &nh->nh_common, err);
return err; return err;
} }