Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30d444d3 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net/ipv6: Udate fib6_table_lookup tracepoint 



Commit bb0ad198 ("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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f323973

include/trace/events/fib6.h

+22 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ TRACE_EVENT(fib6_table_lookup, 


	TP_STRUCT__entry(

		__field(	u32,	tb_id		)



		__field(	int,	err		)

		__field(	int,	oif		)

		__field(	int,	iif		)

		__field(	__u8,	tos		)
@@ -27,7 +27,10 @@ TRACE_EVENT(fib6_table_lookup, 
		__field(	__u8,	flags		)

		__array(	__u8,	src,	16	)

		__array(	__u8,	dst,	16	)



		__field(        u16,	sport		)

		__field(        u16,	dport		)

		__field(        u8,	proto		)

		__field(        u8,	rt_type		)

		__dynamic_array(	char,	name,	IFNAMSIZ )

		__array(		__u8,	gw,	16	 )

	),
@@ -36,6 +39,7 @@ TRACE_EVENT(fib6_table_lookup, 
		struct in6_addr *in6;



		__entry->tb_id = table->tb6_id;

		__entry->err = ip6_rt_type_to_error(f6i->fib6_type);

		__entry->oif = flp->flowi6_oif;

		__entry->iif = flp->flowi6_iif;

		__entry->tos = ip6_tclass(flp->flowlabel);
@@ -48,10 +52,20 @@ TRACE_EVENT(fib6_table_lookup, 
		in6 = (struct in6_addr *)__entry->dst;

		*in6 = flp->daddr;



		__entry->proto = flp->flowi6_proto;

		if (__entry->proto == IPPROTO_TCP ||

		    __entry->proto == IPPROTO_UDP) {

			__entry->sport = ntohs(flp->fl6_sport);

			__entry->dport = ntohs(flp->fl6_dport);

		} else {

			__entry->sport = 0;

			__entry->dport = 0;

		}



		if (f6i->fib6_nh.nh_dev) {

			__assign_str(name, f6i->fib6_nh.nh_dev);

		} else {

			__assign_str(name, "");

			__assign_str(name, "-");

		}

		if (f6i == net->ipv6.fib6_null_entry) {

			struct in6_addr in6_zero = {};
@@ -65,10 +79,11 @@ TRACE_EVENT(fib6_table_lookup, 
		}

	),



	TP_printk("table %3u oif %d iif %d src %pI6c dst %pI6c tos %d scope %d flags %x ==> dev %s gw %pI6c",

		  __entry->tb_id, __entry->oif, __entry->iif,

		  __entry->src, __entry->dst, __entry->tos, __entry->scope,

		  __entry->flags, __get_str(name), __entry->gw)

	TP_printk("table %3u oif %d iif %d proto %u %pI6c/%u -> %pI6c/%u tos %d scope %d flags %x ==> dev %s gw %pI6c err %d",

		  __entry->tb_id, __entry->oif, __entry->iif, __entry->proto,

		  __entry->src, __entry->sport, __entry->dst, __entry->dport,

		  __entry->tos, __entry->scope, __entry->flags,

		  __get_str(name), __entry->gw, __entry->err)

);



#endif /* _TRACE_FIB6_H */

net/core/net-traces.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

net/ipv6/route.c

+7 −2
Original line number Diff line number Diff line
@@ -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,