nettrace: show socket state in sock mode

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

shared/bpf/skb_parse.h

@@ -7,6 +7,9 @@
 #ifndef _H_BPF_SKB_UTILS
 #define _H_BPF_SKB_UTILS
 
+#undef bpf_core_type_exists
+#undef bpf_core_field_exists
+#undef bpf_core_enum_value_exists
 #include <bpf/bpf_core_read.h>
 
 #include "skb_macro.h"
@@ -405,11 +408,12 @@ static try_inline int __probe_parse_sk(parse_ctx_t *ctx)
 			      ske->l4.tcp.dport))
 		goto err;
 
-	ske->rqlen = _C(&(sk->sk_receive_queue), qlen);
-	ske->wqlen = _C(&(sk->sk_write_queue), qlen);
+	ske->rqlen = _C(sk, sk_receive_queue.qlen);
+	ske->wqlen = _C(sk, sk_write_queue.qlen);
 
 	ske->proto_l3 = l3_proto;
 	ske->proto_l4 = l4_proto;
+	ske->state = _C(skc, skc_state);
 
 	icsk = (void *)sk;
 	if (bpf_core_helper_exist(jiffies64))

shared/bpf/skb_shared.h

@@ -117,6 +117,7 @@ typedef struct {
 	u16 proto_l3;
 	u8 proto_l4;
 	u8 timer_pending;
+	u8 state;
 } sock_t;
 
 #define TCP_FLAGS_ACK	(1 << 4)

shared/pkt_utils.c

@@ -7,6 +7,7 @@
 #define _LINUX_IN_H
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/tcp.h>
 
 #include <sys_utils.h>
 
@@ -158,6 +159,20 @@ static const char *timer_name[] = {
 	[ICSK_TIME_LOSS_PROBE] = "loss_probe",
 	[ICSK_TIME_REO_TIMEOUT] = "reo_timeout",
 };
+static const char *state_name[] = {
+	[0] = "UNKNOW",
+	[TCP_ESTABLISHED] = "ESTABLISHED",
+	[TCP_SYN_SENT] = "SYN_SENT",
+	[TCP_SYN_RECV] = "SYN_RECV",
+	[TCP_FIN_WAIT1] = "FIN_WAIT1",
+	[TCP_FIN_WAIT2] = "FIN_WAIT2",
+	[TCP_TIME_WAIT] = "TIME_WAIT",
+	[TCP_CLOSE] = "CLOSE",
+	[TCP_CLOSE_WAIT] = "CLOSE_WAIT",
+	[TCP_LAST_ACK] = "LAST_ACK",
+	[TCP_LISTEN] = "LISTEN",
+	[TCP_CLOSING] = "CLOSING",
+};
 
 int ts_print_sock(char *buf, sock_t *ske, char *minfo, bool date_format)
 {
@@ -222,7 +237,8 @@ int ts_print_sock(char *buf, sock_t *ske, char *minfo, bool date_format)
 
 	switch (l4) {
 	case IPPROTO_TCP:
-		BUF_FMT(" info:(%u %u)", ske->l4.tcp.packets_out,
+		BUF_FMT(" %s info:(%u %u)", state_name[ske->state],
+			ske->l4.tcp.packets_out,
 			ske->l4.tcp.retrans_out);
 	case IPPROTO_UDP:
 		hz = kernel_hz();