optimize: optimize the define of struct bpf_args_t

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

Author: menglongdong

common.mk

@@ -1,7 +1,8 @@
 LIBBPF		?= /usr/include/bpf
 COMPONENT	:= $(ROOT)/component
-COMMON_SHARED	:= $(ROOT)/shared/pkt_utils.c $(COMPONENT)/net_utils.c \
-		   $(COMPONENT)/arg_parse.c $(COMPONENT)/sys_utils.c
+COMMON_SHARED	:= $(ROOT)/shared/pkt_utils.c $(COMPONENT)/net_utils.c	\
+		   $(COMPONENT)/arg_parse.c $(COMPONENT)/sys_utils.c	\
+		   $(ROOT)/shared/bpf_utils.c
 
 CFLAGS		+= -I./ -I$(ROOT)/shared/bpf/
 BPF_CFLAGS	= $(CFLAGS) -I$(LIBBPF) -Wno-unused-function

droptrace/droptrace.c

@@ -9,13 +9,15 @@
 #include <bpf/bpf.h>
 
 #include <net_utils.h>
-#include <bpf_utils.h>
 #include <arg_parse.h>
 #include <pkt_utils.h>
 #include <parse_sym.h>
+#include <common_args.h>
 
 #include "reasons.h"
 #include "./progs/shared.h"
+#include <bpf_utils.h>
+
 #include "progs/probe.skel.h"
 #include "progs/trace.skel.h"
 
@@ -102,10 +104,8 @@ static int parse_opts(int argc, char *argv[], bpf_args_t *args)
 	int proto_l = 0;
 	u16 proto;
 
-#define E(name) &(args->pkt.enable_##name)
-#define R(name)	&(args->pkt.name)
 	option_item_t opts[] = {
-#include <common_args.h>
+		COMMON_PROG_ARGS(&args->pkt),
 		{
 			.lname = "reason",
 			.sname = 'r',

droptrace/progs/shared.h

@@ -1,22 +1,19 @@
-#include <packet.h>
+#include <skb_shared.h>
 
 typedef struct {
 	u64	location;
 	packet_t pkt;
 	u16 reason;
 } event_t;
 
-struct bpf_args {
-	pkt_args_t pkt;
-	u16 reason;
-	bool enable_reason;
-	u32 limit;
-	bool enable_limit;
-	u32 limit_bucket;
-	bool enable_limit_bucket;
-	bool snmp_mode;
-	u32 snmp_reasons[SKB_DROP_REASON_MAX];
-	int current_budget;
-	u64 last_ts;
-};
-typedef struct bpf_args bpf_args_t;
+#define DEFINE_BPF_ARGS()		\
+	u16 reason;			\
+	bool enable_reason;		\
+	u32 limit;			\
+	bool enable_limit;		\
+	u32 limit_bucket;		\
+	bool enable_limit_bucket;	\
+	bool snmp_mode;			\
+	u32 snmp_reasons[SKB_DROP_REASON_MAX];	\
+	int current_budget;		\
+	u64 last_ts

nodetrace/common.h

@@ -12,11 +12,11 @@
 #include <bpf/bpf.h>
 
 #include <net_utils.h>
-#include <bpf_utils.h>
 #include <arg_parse.h>
 #include <pkt_utils.h>
 
 #include "progs/shared.h"
+#include <bpf_utils.h>
 
 static inline int tc_attach(int prog_fd, char *nic, char *pref,
 			    bool ingress)

nodetrace/mark.c

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MulanPSL-2.0
+#include <common_args.h>
 
 #include "common.h"
 #include "progs/shared.h"
@@ -33,10 +34,8 @@ static int parse_opts(int argc, char *argv[], bpf_args_t *args)
 	int proto_l;
 	u16 proto;
 
-#define E(name) &(args->pkt.enable_##name)
-#define R(name)	&(args->pkt.name)
 	option_item_t opts[] = {
-#include <common_args.h>
+		COMMON_PROG_ARGS(&args->pkt),
 		{ .type = OPTION_BLANK },
 		{
 			.sname = 'i', .dest = &nic, .type = OPTION_STRING,

nodetrace/progs/shared.h

@@ -1,7 +1,10 @@
 #ifndef _H_SHARED
 #define _H_SHARED
 
-#include <packet.h>
+#include <skb_shared.h>
+
+#define DEFINE_BPF_ARGS()	\
+	bool quiet
 
 typedef struct {
 	packet_t pkt;
@@ -15,10 +18,4 @@ enum {
 	LOCALTION_ERR,
 };
 
-struct bpf_args {
-	pkt_args_t pkt;
-	bool quiet;
-};
-typedef struct bpf_args bpf_args_t;
-
 #endif

shared/bpf/macro.h

@@ -1,3 +1,6 @@
+#ifndef _H_BPF_MACRO
+#define _H_BPF_MACRO
+
 #define ETH_P_IP	0x0800		/* Internet Protocol packet	*/
 #define ETH_P_IPV6	0x86DD		/* IPv6 over bluebook		*/
 
@@ -20,3 +23,5 @@
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 #endif
+
+#endif

shared/bpf/packet.h shared/bpf/skb_shared.hshared/bpf/packet.h renamed to shared/bpf/skb_shared.h

@@ -1,5 +1,5 @@
-#ifndef _H_BPF_PACKET
-#define _H_BPF_PACKET
+#ifndef _H_BPF_SKB_SHARED
+#define _H_BPF_SKB_SHARED
 
 typedef struct {
 	u16	sport;
@@ -26,10 +26,6 @@ typedef struct __attribute__((__packed__)) {
 			u32	ack;
 			u8	flags;
 		} tcp;
-#define field_sport	field_tcp.sport
-#define field_dport	field_tcp.dport
-#define field_flags	field_tcp.flags
-#define field_tcp	l4.tcp
 		struct {
 			u16	sport;
 			u16	dport;

shared/bpf/skb_utils.h

@@ -1,8 +1,19 @@
 #ifndef _H_BPF_SKB_UTILS
 #define _H_BPF_SKB_UTILS
 
+/* This file can only be used in eBPF program, can't be used in user space
+ * code.
+ */
+
 #include "macro.h"
-#include "packet.h"
+#include "skb_shared.h"
+
+typedef struct {
+	pkt_args_t pkt;
+#ifdef DEFINE_BPF_ARGS
+	DEFINE_BPF_ARGS();
+#endif
+} bpf_args_t;
 
 struct {
 	__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
@@ -22,12 +33,11 @@ struct {
 	tmp;						\
 })
 
-struct bpf_args;
 #ifdef MAP_CONFIG
 struct {
 	__uint(type, BPF_MAP_TYPE_ARRAY);
 	__uint(key_size, sizeof(int));
-	__uint(value_size, CONFIG_MAP_SIZE);
+	__uint(value_size, sizeof(bpf_args_t));
 	__uint(max_entries, 1);
 } m_config SEC(".maps");
 
@@ -36,12 +46,12 @@ struct {
 	void * _v = bpf_map_lookup_elem(&m_config, &_key);	\
 	if (!_v)						\
 		return 0; /* this can't happen */		\
-	(struct bpf_args*)_v;					\
+	(bpf_args_t*)_v;					\
 })
 
 #define try_inline __attribute__((always_inline))
 #else
-extern struct bpf_args _bpf_args;
+bpf_args_t _bpf_args;
 #define CONFIG() &_bpf_args
 #define try_inline inline
 #endif
@@ -51,7 +61,7 @@ extern struct bpf_args _bpf_args;
 
 #define ARGS_ENABLED(name)	bpf_args->enable_##name
 #define ARGS_GET(name)		bpf_args->name
-#define ARGS_GET_CONFIG(name)	((struct bpf_args *)CONFIG())->name
+#define ARGS_GET_CONFIG(name)	((bpf_args_t *)CONFIG())->name
 #define ARGS_CHECK(name, val)	\
 	(ARGS_ENABLED(name) && bpf_args->name != (val))
 
@@ -137,10 +147,9 @@ static try_inline bool skb_l4_check(u16 l4, u16 l3)
 	return l4 == 0xFFFF || l4 <= l3;
 }
 
-#define CHECK_ATTR(attr)			\
-	((ARGS_CHECK(attr, d##attr) &&		\
-	  ARGS_CHECK(attr, s##attr)) ||		\
-	 ARGS_CHECK(s##attr, s##attr) ||	\
+#define CHECK_ATTR(attr)						\
+	((ARGS_CHECK(attr, d##attr) && ARGS_CHECK(attr, s##attr)) ||	\
+	 ARGS_CHECK(s##attr, s##attr) ||				\
 	 ARGS_CHECK(d##attr, d##attr))
 
 static try_inline int probe_parse_ip(void *ip, parse_ctx_t *ctx)
@@ -299,7 +308,7 @@ static try_inline int probe_parse_skb(struct sk_buff *skb, packet_t *pkt)
 }
 
 static try_inline int probe_parse_skb_no_filter(struct sk_buff *skb,
-					    packet_t *pkt)
+						packet_t *pkt)
 {
 	parse_ctx_t ctx = {
 		.args = (void *)CONFIG(),
@@ -379,4 +388,4 @@ static try_inline int direct_parse_skb(struct __sk_buff *skb, packet_t *pkt,
 	return 1;
 }
 
-#endif
+#endif

shared/bpf_utils.c

@@ -0,0 +1,93 @@
+#include <bpf/libbpf.h>
+#include <bpf/bpf.h>
+#include <linux/perf_event.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <linux/hw_breakpoint.h>
+#include <sys/syscall.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include <sys_utils.h>
+
+#include "bpf_utils.h"
+
+void
+perf_output_cond(int fd, perf_buffer_sample_fn cb, perf_buffer_lost_fn lost,
+		 bool *stop)
+{
+	struct perf_buffer_opts pb_opts = {
+		.sample_cb = cb,
+		.lost_cb = lost,
+	};
+	struct perf_buffer *pb;
+	int ret;
+
+	pb = perf_buffer__new(fd, 1024, &pb_opts);
+	ret = libbpf_get_error(pb);
+	if (ret) {
+		printf("failed to setup perf_buffer: %d\n", ret);
+		return;
+	}
+
+	while ((ret = perf_buffer__poll(pb, 1000)) >= 0)
+		if (stop && *stop)
+			break;
+}
+
+int compat_bpf_attach_kprobe(int fd, char *name, bool ret)
+{
+	struct perf_event_attr attr = {};
+	char buf[1024], target[128];
+	int id, err;
+
+	attr.type = PERF_TYPE_TRACEPOINT;
+	attr.sample_type = PERF_SAMPLE_RAW;
+	attr.sample_period = 1;
+	attr.wakeup_events = 1;
+
+	sprintf(target, "%s%s", ret ? "ret_" : "", name);
+	sprintf(buf, "/sys/kernel/debug/tracing/events/kprobes/%s/id",
+		target);
+	if (file_exist(buf))
+		goto exist;
+
+	sprintf(buf, "(echo '%c:%s %s' >> /sys/kernel/debug/tracing/kprobe_events) 2>&1",
+		ret ? 'r' : 'p', target, name);
+	if (simple_exec(buf)) {
+		pr_warn("failed to create kprobe: %s\n", target);
+		return -1;
+	}
+	sprintf(buf, "/sys/kernel/debug/tracing/events/kprobes/%s/id",
+		target);
+exist:;
+	int efd = open(buf, O_RDONLY, 0);
+	if (efd < 0) {
+		pr_warn("failed to open event %s\n", name);
+		return -1;
+	}
+	
+	err = read(efd, buf, sizeof(buf));
+	if (err < 0 || err >= sizeof(buf)) {
+		pr_warn("read from '%s' failed '%s'\n", target, strerror(errno));
+		return -1;
+	}
+
+	close(efd);
+
+	buf[err] = 0;
+	id = atoi(buf);
+	attr.config = id;
+
+	efd = syscall(SYS_perf_event_open, &attr, -1, 0, -1, 0);
+	if (efd < 0) {
+		pr_warn("event %d fd %d err %s\n", id, efd, strerror(errno));
+		return -1;
+	}
+	ioctl(efd, PERF_EVENT_IOC_ENABLE, 0);
+	ioctl(efd, PERF_EVENT_IOC_SET_BPF, fd);
+
+	return 0;
+}