Commit b533fb9c authored by Jason Xing's avatar Jason Xing Committed by Paolo Abeni
Browse files

rstreason: make it work in trace world 



At last, we should let it work by introducing this reset reason in
trace world.

One of the possible expected outputs is:
... tcp_send_reset: skbaddr=xxx skaddr=xxx src=xxx dest=xxx
state=TCP_ESTABLISHED reason=NOT_SPECIFIED

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 215d4024

include/trace/events/tcp.h

+22 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <net/ipv6.h>

#include <net/tcp.h>

#include <linux/sock_diag.h>

#include <net/rstreason.h>



/*

 * tcp event with arguments sk and skb
@@ -74,20 +75,32 @@ DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, 
	TP_ARGS(sk, skb)

);



#undef FN

#define FN(reason)	TRACE_DEFINE_ENUM(SK_RST_REASON_##reason);

DEFINE_RST_REASON(FN, FN)



#undef FN

#undef FNe

#define FN(reason)	{ SK_RST_REASON_##reason, #reason },

#define FNe(reason)	{ SK_RST_REASON_##reason, #reason }



/*

 * skb of trace_tcp_send_reset is the skb that caused RST. In case of

 * active reset, skb should be NULL

 */

TRACE_EVENT(tcp_send_reset,



	TP_PROTO(const struct sock *sk, const struct sk_buff *skb),

	TP_PROTO(const struct sock *sk,

		 const struct sk_buff *skb,

		 const enum sk_rst_reason reason),



	TP_ARGS(sk, skb),

	TP_ARGS(sk, skb, reason),



	TP_STRUCT__entry(

		__field(const void *, skbaddr)

		__field(const void *, skaddr)

		__field(int, state)

		__field(enum sk_rst_reason, reason)

		__array(__u8, saddr, sizeof(struct sockaddr_in6))

		__array(__u8, daddr, sizeof(struct sockaddr_in6))

	),
@@ -113,14 +126,19 @@ TRACE_EVENT(tcp_send_reset, 
			 */

			TP_STORE_ADDR_PORTS_SKB(skb, th, entry->daddr, entry->saddr);

		}

		__entry->reason = reason;

	),



	TP_printk("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s",

	TP_printk("skbaddr=%p skaddr=%p src=%pISpc dest=%pISpc state=%s reason=%s",

		  __entry->skbaddr, __entry->skaddr,

		  __entry->saddr, __entry->daddr,

		  __entry->state ? show_tcp_state_name(__entry->state) : "UNKNOWN")

		  __entry->state ? show_tcp_state_name(__entry->state) : "UNKNOWN",

		  __print_symbolic(__entry->reason, DEFINE_RST_REASON(FN, FNe)))

);



#undef FN

#undef FNe



/*

 * tcp event with arguments sk

 *

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb, 
	if (sk)

		arg.bound_dev_if = sk->sk_bound_dev_if;



	trace_tcp_send_reset(sk, skb);

	trace_tcp_send_reset(sk, skb, reason);



	BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) !=

		     offsetof(struct inet_timewait_sock, tw_bound_dev_if));

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -3641,7 +3641,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority, 
	/* skb of trace_tcp_send_reset() keeps the skb that caused RST,

	 * skb here is different to the troublesome skb, so use NULL

	 */

	trace_tcp_send_reset(sk, NULL);

	trace_tcp_send_reset(sk, NULL, SK_RST_REASON_NOT_SPECIFIED);

}



/* Send a crossed SYN-ACK during socket establishment.

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb, 
			label = ip6_flowlabel(ipv6h);

	}



	trace_tcp_send_reset(sk, skb);

	trace_tcp_send_reset(sk, skb, reason);



	tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, 1,

			     ipv6_get_dsfield(ipv6h), label, priority, txhash,