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

Commit 563e0bb0 authored by Yafang Shao's avatar Yafang Shao Committed by David S. Miller
Browse files

net: tracepoint: replace tcp_set_state tracepoint with inet_sock_set_state tracepoint 



As sk_state is a common field for struct sock, so the state
transition tracepoint should not be a TCP specific feature.
Currently it traces all AF_INET state transition, so I rename this
tracepoint to inet_sock_set_state tracepoint with some minor changes and move it
into trace/events/sock.h.
We dont need to create a file named trace/events/inet_sock.h for this one single
tracepoint.

Two helpers are introduced to trace sk_state transition
    - void inet_sk_state_store(struct sock *sk, int newstate);
    - void inet_sk_set_state(struct sock *sk, int state);
As trace header should not be included in other header files,
so they are defined in sock.c.

The protocol such as SCTP maybe compiled as a ko, hence export
inet_sk_set_state().

Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7b850a7

include/net/inet_sock.h

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to, 
#endif



int inet_sk_rebuild_header(struct sock *sk);

void inet_sk_set_state(struct sock *sk, int state);

void inet_sk_state_store(struct sock *sk, int newstate);



static inline unsigned int __inet_ehashfn(const __be32 laddr,

					  const __u16 lport,

include/trace/events/sock.h

+107 −0
Original line number Diff line number Diff line
@@ -6,7 +6,50 @@ 
#define _TRACE_SOCK_H



#include <net/sock.h>

#include <net/ipv6.h>

#include <linux/tracepoint.h>

#include <linux/ipv6.h>

#include <linux/tcp.h>



/* The protocol traced by sock_set_state */

#define inet_protocol_names		\

		EM(IPPROTO_TCP)			\

		EM(IPPROTO_DCCP)		\

		EMe(IPPROTO_SCTP)



#define tcp_state_names			\

		EM(TCP_ESTABLISHED)		\

		EM(TCP_SYN_SENT)		\

		EM(TCP_SYN_RECV)		\

		EM(TCP_FIN_WAIT1)		\

		EM(TCP_FIN_WAIT2)		\

		EM(TCP_TIME_WAIT)		\

		EM(TCP_CLOSE)			\

		EM(TCP_CLOSE_WAIT)		\

		EM(TCP_LAST_ACK)		\

		EM(TCP_LISTEN)			\

		EM(TCP_CLOSING)			\

		EMe(TCP_NEW_SYN_RECV)



/* enums need to be exported to user space */

#undef EM

#undef EMe

#define EM(a)       TRACE_DEFINE_ENUM(a);

#define EMe(a)      TRACE_DEFINE_ENUM(a);



inet_protocol_names

tcp_state_names



#undef EM

#undef EMe

#define EM(a)       { a, #a },

#define EMe(a)      { a, #a }



#define show_inet_protocol_name(val)    \

	__print_symbolic(val, inet_protocol_names)



#define show_tcp_state_name(val)        \

	__print_symbolic(val, tcp_state_names)



TRACE_EVENT(sock_rcvqueue_full,
@@ -63,6 +106,70 @@ TRACE_EVENT(sock_exceed_buf_limit, 
		__entry->rmem_alloc)

);



TRACE_EVENT(inet_sock_set_state,



	TP_PROTO(const struct sock *sk, const int oldstate, const int newstate),



	TP_ARGS(sk, oldstate, newstate),



	TP_STRUCT__entry(

		__field(const void *, skaddr)

		__field(int, oldstate)

		__field(int, newstate)

		__field(__u16, sport)

		__field(__u16, dport)

		__field(__u8, protocol)

		__array(__u8, saddr, 4)

		__array(__u8, daddr, 4)

		__array(__u8, saddr_v6, 16)

		__array(__u8, daddr_v6, 16)

	),



	TP_fast_assign(

		struct inet_sock *inet = inet_sk(sk);

		struct in6_addr *pin6;

		__be32 *p32;



		__entry->skaddr = sk;

		__entry->oldstate = oldstate;

		__entry->newstate = newstate;



		__entry->protocol = sk->sk_protocol;

		__entry->sport = ntohs(inet->inet_sport);

		__entry->dport = ntohs(inet->inet_dport);



		p32 = (__be32 *) __entry->saddr;

		*p32 = inet->inet_saddr;



		p32 = (__be32 *) __entry->daddr;

		*p32 =  inet->inet_daddr;



#if IS_ENABLED(CONFIG_IPV6)

		if (sk->sk_family == AF_INET6) {

			pin6 = (struct in6_addr *)__entry->saddr_v6;

			*pin6 = sk->sk_v6_rcv_saddr;

			pin6 = (struct in6_addr *)__entry->daddr_v6;

			*pin6 = sk->sk_v6_daddr;

		} else

#endif

		{

			pin6 = (struct in6_addr *)__entry->saddr_v6;

			ipv6_addr_set_v4mapped(inet->inet_saddr, pin6);

			pin6 = (struct in6_addr *)__entry->daddr_v6;

			ipv6_addr_set_v4mapped(inet->inet_daddr, pin6);

		}

	),



	TP_printk("protocol=%s sport=%hu dport=%hu saddr=%pI4 daddr=%pI4"

			"saddrv6=%pI6c daddrv6=%pI6c oldstate=%s newstate=%s",

			show_inet_protocol_name(__entry->protocol),

			__entry->sport, __entry->dport,

			__entry->saddr, __entry->daddr,

			__entry->saddr_v6, __entry->daddr_v6,

			show_tcp_state_name(__entry->oldstate),

			show_tcp_state_name(__entry->newstate))

);



#endif /* _TRACE_SOCK_H */



/* This part must be outside protection */

include/trace/events/tcp.h

+0 −31
Original line number Diff line number Diff line
@@ -9,37 +9,6 @@ 
#include <linux/tracepoint.h>

#include <net/ipv6.h>



#define tcp_state_names         \

		EM(TCP_ESTABLISHED)     \

		EM(TCP_SYN_SENT)        \

		EM(TCP_SYN_RECV)        \

		EM(TCP_FIN_WAIT1)       \

		EM(TCP_FIN_WAIT2)       \

		EM(TCP_TIME_WAIT)       \

		EM(TCP_CLOSE)           \

		EM(TCP_CLOSE_WAIT)      \

		EM(TCP_LAST_ACK)        \

		EM(TCP_LISTEN)          \

		EM(TCP_CLOSING)         \

		EMe(TCP_NEW_SYN_RECV)   \



/* enums need to be exported to user space */

#undef EM

#undef EMe

#define EM(a)         TRACE_DEFINE_ENUM(a);

#define EMe(a)        TRACE_DEFINE_ENUM(a);



tcp_state_names



#undef EM

#undef EMe

#define EM(a)         tcp_state_name(a),

#define EMe(a)        tcp_state_name(a)



#define tcp_state_name(state)	{ state, #state }

#define show_tcp_state_name(val)			\

	__print_symbolic(val, tcp_state_names)



/*

 * tcp event with arguments sk and skb

 *

net/ipv4/af_inet.c

+14 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
#endif

#include <net/l3mdev.h>



#include <trace/events/sock.h>



/* The inetsw table contains everything that inet_create needs to

 * build a new socket.
@@ -1220,6 +1221,19 @@ int inet_sk_rebuild_header(struct sock *sk) 
}

EXPORT_SYMBOL(inet_sk_rebuild_header);



void inet_sk_set_state(struct sock *sk, int state)

{

	trace_inet_sock_set_state(sk, sk->sk_state, state);

	sk->sk_state = state;

}

EXPORT_SYMBOL(inet_sk_set_state);



void inet_sk_state_store(struct sock *sk, int newstate)

{

	trace_inet_sock_set_state(sk, sk->sk_state, newstate);

	smp_store_release(&sk->sk_state, newstate);

}



struct sk_buff *inet_gso_segment(struct sk_buff *skb,

				 netdev_features_t features)

{

net/ipv4/inet_connection_sock.c

+3 −3
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, 
	if (newsk) {

		struct inet_connection_sock *newicsk = inet_csk(newsk);



		newsk->sk_state = TCP_SYN_RECV;

		inet_sk_set_state(newsk, TCP_SYN_RECV);

		newicsk->icsk_bind_hash = NULL;



		inet_sk(newsk)->inet_dport = inet_rsk(req)->ir_rmt_port;
@@ -877,7 +877,7 @@ int inet_csk_listen_start(struct sock *sk, int backlog) 
	 * It is OK, because this socket enters to hash table only

	 * after validation is complete.

	 */

	sk_state_store(sk, TCP_LISTEN);

	inet_sk_state_store(sk, TCP_LISTEN);

	if (!sk->sk_prot->get_port(sk, inet->inet_num)) {

		inet->inet_sport = htons(inet->inet_num);
@@ -888,7 +888,7 @@ int inet_csk_listen_start(struct sock *sk, int backlog) 
			return 0;

	}



	sk->sk_state = TCP_CLOSE;

	inet_sk_set_state(sk, TCP_CLOSE);

	return err;

}

EXPORT_SYMBOL_GPL(inet_csk_listen_start);