diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-05-23 17:08:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-24 23:01:15 -0400 |
| commit | 30d444d30049490398178ca4337ab49156571886 (patch) | |
| tree | 84377a2175d3b8f5a5aa8b4af7f9813dcfb88eba /net | |
| parent | net/ipv4: Udate fib_table_lookup tracepoint (diff) | |
| download | linux-dev-30d444d30049490398178ca4337ab49156571886.tar.xz linux-dev-30d444d30049490398178ca4337ab49156571886.zip | |
net/ipv6: Udate fib6_table_lookup tracepoint
Commit bb0ad1987e96 ("ipv6: fib6_rules: support for match on sport, dport
and ip proto") added support for protocol and ports to FIB rules.
Update the FIB lookup tracepoint to dump the parameters.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net-traces.c | 4 | ||||
| -rw-r--r-- | net/ipv6/route.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/core/net-traces.c b/net/core/net-traces.c index 380934580fa1..419af6dfe29f 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -35,10 +35,6 @@ #include <trace/events/tcp.h> #include <trace/events/fib.h> #include <trace/events/qdisc.h> -#if IS_ENABLED(CONFIG_IPV6) -#include <trace/events/fib6.h> -EXPORT_TRACEPOINT_SYMBOL_GPL(fib6_table_lookup); -#endif #if IS_ENABLED(CONFIG_BRIDGE) #include <trace/events/bridge.h> EXPORT_TRACEPOINT_SYMBOL_GPL(br_fdb_add); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0a35ded448a6..22c4de2317d0 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -64,14 +64,19 @@ #include <net/ip_tunnels.h> #include <net/l3mdev.h> #include <net/ip.h> -#include <trace/events/fib6.h> - #include <linux/uaccess.h> #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> #endif +static int ip6_rt_type_to_error(u8 fib6_type); + +#define CREATE_TRACE_POINTS +#include <trace/events/fib6.h> +EXPORT_TRACEPOINT_SYMBOL_GPL(fib6_table_lookup); +#undef CREATE_TRACE_POINTS + enum rt6_nud_state { RT6_NUD_FAIL_HARD = -3, RT6_NUD_FAIL_PROBE = -2, |