Merge pull request #146 from OpenCloudOS/dev

Dev

Author: menglongdong

src/analysis.c

@@ -1044,8 +1044,9 @@ DEFINE_ANALYZER_ENTRY(rtt, TRACE_MODE_ALL_MASK)
 	char *msg = malloc(1024);
 
 	msg[0] = '\0';
-	sprintf(msg, PFMT_EMPH_STR(" *rtt:%ums, rtt_min:%ums*"),
-		event->first_rtt, event->last_rtt);
+	sprintf(msg, PFMT_EMPH_STR(" *rtt:%u.%03ums, rtt_min:%u.%03ums*"),
+		event->first_rtt / 1000, event->first_rtt % 1000,
+		event->last_rtt / 1000, event->last_rtt % 1000);
 	entry_set_msg(e, msg);
 
 	return RESULT_CONT;

src/progs/core.c

@@ -4,9 +4,8 @@
 #include <bpf/bpf_endian.h>
 #include <bpf/bpf_tracing.h>
 
+#include "skb_parse.h"
 #include "shared.h"
-
-#include "kprobe_trace.h"
 #include "core.h"
 
 #ifdef KERN_VER
@@ -783,9 +782,6 @@ DEFINE_KPROBE_INIT(tcp_ack_update_rtt, tcp_ack_update_rtt, 6,
 	if ((long)first_rtt < 0)
 		return -1;
 
-	first_rtt = first_rtt / 1000;
-	last_rtt = last_rtt / 1000;
-
 	if (first_rtt < info->args->first_rtt || last_rtt < info->args->last_rtt)
 		return -1;
 

src/progs/core.h

@@ -1,8 +1,6 @@
 #ifndef _H_PROG_CORE
 #define _H_PROG_CORE
 
-#include "skb_parse.h"
-
 typedef struct {
 	u16 func1;
 	u16 func2;

src/progs/kprobe.c

@@ -1,14 +1,9 @@
 #define KBUILD_MODNAME ""
-#include <kheaders.h>
-#include <bpf/bpf_helpers.h>
-#include <bpf/bpf_endian.h>
-#include <bpf/bpf_tracing.h>
 
+#include "skb_parse.h"
 #include "shared.h"
 #include "core.h"
 
-#include "kprobe_trace.h"
-
 #define pt_regs_param_0 PT_REGS_PARM1
 #define pt_regs_param_1 PT_REGS_PARM2
 #define pt_regs_param_2 PT_REGS_PARM3

src/progs/shared.h

@@ -4,7 +4,6 @@
 #define MAX_FUNC_STACK 16
 
 #include "skb_shared.h"
-
 #include "kprobe_trace.h"
 
 typedef struct {

src/progs/skb_parse.h

@@ -7,6 +7,10 @@
 #ifndef _H_BPF_SKB_UTILS
 #define _H_BPF_SKB_UTILS
 
+#include <kheaders.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_endian.h>
+#include <bpf/bpf_tracing.h>
 #include <bpf/bpf_core_read.h>
 
 #include "skb_macro.h"
@@ -46,6 +50,7 @@ const volatile bool bpf_func_exist[BPF_LOCAL_FUNC_MAX] = {0};
 #endif
 
 #define skb_cb(__skb) ((void *)(__skb) + bpf_core_field_offset(typeof(*__skb), cb))
+#define __ptr(a) ((void *)(a))
 
 #define CONFIG() ({						\
 	int _key = 0;						\
@@ -439,7 +444,7 @@ static inline int probe_parse_sk(struct sock *sk, sock_t *ske,
 
 	switch (l4_proto) {
 	case IPPROTO_TCP: {
-		struct tcp_sock *tp = (void *)sk;
+		struct tcp_sock *tp = __ptr(sk);
 
 		if (bpf_core_type_exists(struct tcp_sock)) {
 			ske->l4.tcp.packets_out = _C(tp, packets_out);
@@ -472,7 +477,7 @@ static inline int probe_parse_sk(struct sock *sk, sock_t *ske,
 	if (!bpf_core_type_exists(struct inet_connection_sock))
 		return 0;
 
-	icsk = (void *)sk;
+	icsk = __ptr(sk);
 	bpf_probe_read_kernel(&ske->ca_state, sizeof(u8),
 		(u8 *)icsk +
 		bpf_core_field_offset(struct inet_connection_sock,
@@ -566,7 +571,7 @@ static inline int probe_parse_skb_sk(struct sock *sk, struct sk_buff *skb,
 	/* parse L4 information from the socket */
 	switch (l4_proto) {
 	case IPPROTO_TCP: {
-		struct tcp_sock *tp = (void *)sk;
+		struct tcp_sock *tp = __ptr(sk);
 		struct tcp_skb_cb *cb;
 
 		cb = skb_cb(skb);
@@ -664,7 +669,7 @@ static __always_inline int probe_parse_skb(struct sk_buff *skb, struct sock *sk,
 		/* mac header is set properly, we can use it directly. */
 		struct ethhdr *eth = ctx->data + ctx->mac_header;
 
-		l3 = (void *)eth + ETH_HLEN;
+		l3 = __ptr(eth) + ETH_HLEN;
 		l3_proto = bpf_ntohs(_(eth->h_proto));
 	}
 
@@ -697,9 +702,9 @@ static inline int direct_parse_skb(struct __sk_buff *skb, packet_t *pkt,
 				   pkt_args_t *bpf_args)
 {
 	struct ethhdr *eth = SKB_DATA(skb);
-	struct iphdr *ip = (void *)(eth + 1);
+	struct iphdr *ip = __ptr(eth + 1);
 
-	if ((void *)ip > SKB_END(skb))
+	if (__ptr(ip) > SKB_END(skb))
 		goto err;
 
 	if (bpf_args && args_check(bpf_args, l3_proto, eth->h_proto))
@@ -714,8 +719,8 @@ static inline int direct_parse_skb(struct __sk_buff *skb, packet_t *pkt,
 			 args_check(bpf_args, daddr, ip->daddr)))
 		goto err;
 
-	l4_min_t *l4_p = (void *)(ip + 1);
-	struct tcphdr *tcp = (void *)l4_p;
+	l4_min_t *l4_p = __ptr(ip + 1);
+	struct tcphdr *tcp = __ptr(l4_p);
 
 	switch (ip->protocol) {
 	case IPPROTO_UDP:
@@ -733,7 +738,7 @@ static inline int direct_parse_skb(struct __sk_buff *skb, packet_t *pkt,
 		pkt->l4.min = *l4_p;
 		break;
 	case IPPROTO_ICMP: {
-		struct icmphdr *icmp = (void *)l4_p;
+		struct icmphdr *icmp = __ptr(l4_p);
 		if (SKB_CHECK_ICMP(skb))
 			goto err;
 

src/trace.c

@@ -542,8 +542,11 @@ static int trace_prepare_args()
 	}
 
 	/* enable tcp_ack_update_rtt as monitor if rtt set */
-	if (bpf_args->first_rtt || bpf_args->last_rtt)
+	if (bpf_args->first_rtt || bpf_args->last_rtt) {
+		bpf_args->first_rtt *= 1000;
+		bpf_args->last_rtt *= 1000;
 		trace_tcp_ack_update_rtt.monitor = 2;
+	}
 
 	if (trace_prepare_mode(args))
 		goto err;