Merge branch 'develop4' of github.com:syxl-time/lmp into develop4

.github/workflows/ebpf_cpu_watcher.yml

@@ -31,3 +31,10 @@ jobs:
           cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/
           make 
           sudo ./cpu_watcher 
+
+       - name: Run test_cpuwatcher
+
+        run: |
+          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/test
+          make
+          ./test_cpuwatcher

.github/workflows/ebpf_net_watcher.yml

@@ -46,4 +46,6 @@ jobs:
           sudo timeout -s SIGINT 5 ./netwatcher -k -T || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
           sudo timeout -s SIGINT 5 ./netwatcher -I || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
           sudo timeout -s SIGINT 5 ./netwatcher -S || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
+          sudo timeout -s SIGINT 5 ./netwatcher -D || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
+          sudo timeout -s SIGINT 5 ./netwatcher -M || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
         timeout-minutes: 5

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/Makefile

@@ -44,6 +44,7 @@ ALL_LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 
 APPS =cs_delay sar sc_delay preempt schedule_delay mq_delay
 TARGETS=cpu_watcher
+CONTROLLER := controller
 
 SRC_DIR = ./include
 
@@ -81,12 +82,12 @@ $(call allow-override,CC,$(CROSS_COMPILE)cc)
 $(call allow-override,LD,$(CROSS_COMPILE)ld)
 
 .PHONY: all
-all: $(TARGETS)
+all: $(CONTROLLER) $(TARGETS)
 
 .PHONY: clean
 clean:
 	$(call msg,CLEAN)
-	$(Q)rm -rf $(OUTPUT) $(TARGETS)
+	$(Q)rm -rf $(OUTPUT) $(TARGETS) $(CONTROLLER)
 
 $(OUTPUT) $(OUTPUT)/libbpf $(BPFTOOL_OUTPUT):
 	$(call msg,MKDIR,$@)
@@ -132,11 +133,19 @@ $(OUTPUT)/%.o: $(SRC_DIR)/%.c | $(OUTPUT)
 	$(call msg,CC,$@)
 	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
+$(OUTPUT)/%.o: $(CONTROLLER).c | $(OUTPUT)
+	$(call msg,CC,$@)
+	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
 $(OUTPUT)/$(TARGETS).o: $(TARGETS).c $(APPS) | $(OUTPUT)
 	$(call msg,CC,$@)
 	$(Q)$(CC) $(CFLAGS) $(INCLUDES) -c $(filter %.c,$^) -o $@
 
 # Build application binary
+$(CONTROLLER): %: $(OUTPUT)/%.o $(COMMON_OBJ) $(LIBBPF_OBJ) | $(OUTPUT)
+	$(call msg,BINARY,$@)
+	$(Q)$(CC) $^ $(ALL_LDFLAGS) -lstdc++ -lelf -lz -o $@
+
 $(TARGETS): %: $(OUTPUT)/%.o $(COMMON_OBJ) $(LIBBPF_OBJ) | $(OUTPUT)
 	$(call msg,BINARY,$@)
 	$(Q)$(CC) $(CFLAGS) $^ $(ALL_LDFLAGS) -lstdc++ -lelf -lz -o $@

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/cs_delay.bpf.c

@@ -21,17 +21,28 @@
 #include "cpu_watcher.h"
 
 char LICENSE[] SEC("license") = "Dual BSD/GPL";
-
+const int ctrl_key = 0;
 //记录时间戳；
 BPF_ARRAY(start,int,u64,1);
+BPF_ARRAY(cs_ctrl_map,int,struct cs_ctrl,1);
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 256 * 1024);
 } rb SEC(".maps");
 
+static inline struct cs_ctrl *get_cs_ctrl(void) {
+    struct cs_ctrl *cs_ctrl;
+    cs_ctrl = bpf_map_lookup_elem(&cs_ctrl_map, &ctrl_key);
+    if (!cs_ctrl || !cs_ctrl->cs_func) {
+        return NULL;
+    }
+    return cs_ctrl;
+}
+
 SEC("kprobe/schedule")
 int BPF_KPROBE(schedule)
 {
+	struct cs_ctrl *cs_ctrl = get_cs_ctrl();
 	u64 t1;
 	t1 = bpf_ktime_get_ns()/1000;
 	int key =0;
@@ -42,6 +53,7 @@ int BPF_KPROBE(schedule)
 SEC("kretprobe/schedule")
 int BPF_KRETPROBE(schedule_exit)
 {	
+	struct cs_ctrl *cs_ctrl = get_cs_ctrl();
 	u64 t2 = bpf_ktime_get_ns()/1000;
 	u64 t1,delay;
 	int key = 0;

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/mq_delay.bpf.c

@@ -23,15 +23,26 @@
 
 
 char LICENSE[] SEC("license") = "Dual BSD/GPL";
-
+const int ctrl_key = 0;
 BPF_HASH(send_msg1,pid_t,struct send_events,1024);//记录pid->u_msg_ptr的关系；do_mq_timedsend入参
 BPF_HASH(send_msg2,u64,struct send_events,1024);//记录msg->time的关系；
 BPF_HASH(rcv_msg1,pid_t,struct rcv_events,1024);//记录pid->u_msg_ptr的关系；do_mq_timedsend入参
+BPF_ARRAY(mq_ctrl_map,int,struct mq_ctrl,1);
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 256 * 1024);
 } rb SEC(".maps");
 
+static inline struct mq_ctrl *get_mq_ctrl(void) {
+    struct mq_ctrl *mq_ctrl;
+    mq_ctrl = bpf_map_lookup_elem(&mq_ctrl_map, &ctrl_key);
+    if (!mq_ctrl || !mq_ctrl->mq_func) {
+        return NULL;
+    }
+    return mq_ctrl;
+}
+
+
 // int print_send_info(struct send_events * mq_send_info,int flag){
 // 	bpf_printk("---------------------test----------------------------test--------------------------test--------------------------------------------test---------------------test---------------------test\n");
 // 	bpf_printk("send_msg_prio: %-8lu\n",mq_send_info->msg_prio);
@@ -63,6 +74,7 @@ int BPF_KPROBE(mq_timedsend,mqd_t mqdes, const char *u_msg_ptr,
 		size_t msg_len, unsigned int msg_prio,
 		struct timespec64 *ts)
 {
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	u64 send_enter_time = bpf_ktime_get_ns();//开始发送信息时间；
 	int pid = bpf_get_current_pid_tgid();//发送端pid
 
@@ -82,6 +94,7 @@ int BPF_KPROBE(mq_timedsend,mqd_t mqdes, const char *u_msg_ptr,
 /*仅获取mq_send_info -> src*/
 SEC("kprobe/load_msg")
 int BPF_KPROBE(load_msg_enter,const void *src, size_t len){
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	int pid = bpf_get_current_pid_tgid();//发送端pid
 	/*记录load入参src*/
 	struct send_events *mq_send_info = bpf_map_lookup_elem(&send_msg1, &pid);
@@ -96,6 +109,7 @@ int BPF_KPROBE(load_msg_enter,const void *src, size_t len){
 /*获取消息块作为key，并建立 message -> mq_send_info 的哈希表*/
 SEC("kretprobe/load_msg")
 int BPF_KRETPROBE(load_msg_exit,void *ret){
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	int pid = bpf_get_current_pid_tgid();//发送端pid
 	/*构建消息块结构体，作为key*/
 	struct send_events *mq_send_info = bpf_map_lookup_elem(&send_msg1, &pid);
@@ -121,6 +135,7 @@ int BPF_KRETPROBE(load_msg_exit,void *ret){
 SEC("kretprobe/do_mq_timedsend")
 int BPF_KRETPROBE(do_mq_timedsend_exit,void *ret)
 {
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	bpf_printk("do_mq_timedsend_exit----------------------------------------------------------------\n");
 	u64 send_exit_time = bpf_ktime_get_ns();//开始发送信息时间；
 	int pid = bpf_get_current_pid_tgid();//发送端pid
@@ -148,6 +163,7 @@ int BPF_KPROBE(mq_timedreceive_entry,mqd_t mqdes, const char __user *u_msg_ptr,
 		size_t msg_len, unsigned int msg_prio,
 		struct timespec64 *ts)
 {
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	u64 rcv_enter_time = bpf_ktime_get_ns();
 	int pid = bpf_get_current_pid_tgid();
 
@@ -165,6 +181,7 @@ int BPF_KPROBE(mq_timedreceive_entry,mqd_t mqdes, const char __user *u_msg_ptr,
 SEC("kprobe/store_msg")
 int BPF_KPROBE(store_msg,void __user *dest, struct msg_msg *msg, size_t len)
 {
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	int pid = bpf_get_current_pid_tgid();
 
 	/*make key*/
@@ -192,6 +209,7 @@ int BPF_KPROBE(store_msg,void __user *dest, struct msg_msg *msg, size_t len)
 
 SEC("kretprobe/do_mq_timedreceive")
 int BPF_KRETPROBE(do_mq_timedreceive_exit,void *ret){
+	struct mq_ctrl *mq_ctrl = get_mq_ctrl();
 	u64 rcv_exit_time = bpf_ktime_get_ns();
 	int pid = bpf_get_current_pid_tgid();
 	u64 send_enter_time,delay;

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/preempt.bpf.c

@@ -23,17 +23,27 @@
 char LICENSE[] SEC("license") = "Dual BSD/GPL";
 
 #define TIF_NEED_RESCHED 3
-
+const int ctrl_key = 0;
 // 记录时间戳
 BPF_HASH(preemptTime, pid_t, u64, 4096);
-
+BPF_ARRAY(preempt_ctrl_map,int,struct preempt_ctrl,1);
 struct {
     __uint(type, BPF_MAP_TYPE_RINGBUF);
     __uint(max_entries, 256 * 1024);
 } rb SEC(".maps");
 
+static inline struct preempt_ctrl *get_preempt_ctrl(void) {
+    struct preempt_ctrl *preempt_ctrl;
+    preempt_ctrl = bpf_map_lookup_elem(&preempt_ctrl_map, &ctrl_key);
+    if (!preempt_ctrl || !preempt_ctrl->preempt_func) {
+        return NULL;
+    }
+    return preempt_ctrl;
+}
+
 SEC("tp_btf/sched_switch")
 int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_struct *next) {
+    struct preempt_ctrl *preempt_ctrl = get_preempt_ctrl();
     u64 start_time = bpf_ktime_get_ns();
     pid_t prev_pid = BPF_CORE_READ(prev, pid);
 
@@ -52,6 +62,7 @@ int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_s
 // SEC("kprobe/finish_task_switch") 
 SEC("kprobe/finish_task_switch.isra.0") 
 int BPF_KPROBE(finish_task_switch, struct task_struct *prev) {
+    struct preempt_ctrl *preempt_ctrl = get_preempt_ctrl();
     u64 end_time = bpf_ktime_get_ns();
     pid_t pid = BPF_CORE_READ(prev, pid);
     u64 *val;

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/sar.bpf.c

@@ -23,7 +23,7 @@
 char LICENSE[] SEC("license") = "Dual BSD/GPL";
 
 const volatile long long unsigned int forks_addr = 0;
-
+const int ctrl_key = 0;
 #define PF_IDLE			0x00000002	/* I am an IDLE thread */
 #define PF_KTHREAD		0x00200000	/* I am a kernel thread */
 
@@ -51,11 +51,23 @@ BPF_ARRAY(kt_LastTime,u32,u64,1);
 BPF_ARRAY(ut_LastTime,u32,u64,1);
 BPF_ARRAY(tick_user,u32,u64,1);
 BPF_ARRAY(symAddr,u32,u64,1);
+BPF_ARRAY(sar_ctrl_map,int,struct sar_ctrl,1);
+
+static inline struct sar_ctrl *get_sar_ctrl(void) {
+    struct sar_ctrl *sar_ctrl;
+    sar_ctrl = bpf_map_lookup_elem(&sar_ctrl_map, &ctrl_key);
+    if (!sar_ctrl || !sar_ctrl->sar_func) {
+        return NULL;
+    }
+    return sar_ctrl;
+}
+
 // 统计fork数
 SEC("kprobe/finish_task_switch.isra.0")
 // SEC("kprobe/finish_task_switch")
 int kprobe__finish_task_switch(struct pt_regs *ctx)
 {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
     u32 key = 0;
     u64 val, *valp = NULL;
     unsigned long total_forks;
@@ -73,6 +85,7 @@ int kprobe__finish_task_switch(struct pt_regs *ctx)
 //获取进程切换数;
 SEC("tracepoint/sched/sched_switch")
 int trace_sched_switch2(struct cswch_args *info) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	pid_t prev = info->prev_pid, next = info->next_pid;
 	if (prev != next) {
 		u32 key = 0;
@@ -94,6 +107,7 @@ int trace_sched_switch2(struct cswch_args *info) {
 // SEC("kprobe/finish_task_switch")
 SEC("kprobe/finish_task_switch.isra.0")
 int BPF_KPROBE(finish_task_switch,struct task_struct *prev){
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	pid_t pid=BPF_CORE_READ(prev,pid);
 	u64 *val, time = bpf_ktime_get_ns();
 	u64 delta;
@@ -124,6 +138,7 @@ int BPF_KPROBE(finish_task_switch,struct task_struct *prev){
 //统计运行队列长度
 SEC("kprobe/update_rq_clock")
 int BPF_KPROBE(update_rq_clock,struct rq *rq){
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
     u32 key = 0;
     u64 val = BPF_CORE_READ(rq,nr_running);
     bpf_map_update_elem(&runqlen,&key,&val,BPF_ANY);
@@ -133,6 +148,7 @@ int BPF_KPROBE(update_rq_clock,struct rq *rq){
 //软中断
 SEC("tracepoint/irq/softirq_entry")
 int trace_softirq_entry(struct __softirq_info *info) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	u32 key = info->vec;
 	u64 val = bpf_ktime_get_ns();
 	bpf_map_update_elem(&softirqCpuEnterTime, &key, &val, BPF_ANY);
@@ -141,6 +157,7 @@ int trace_softirq_entry(struct __softirq_info *info) {
 
 SEC("tracepoint/irq/softirq_exit")
 int trace_softirq_exit(struct __softirq_info *info) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	u32 key = info->vec;
 	u64 now = bpf_ktime_get_ns(), *valp = 0;
 	valp =bpf_map_lookup_elem(&softirqCpuEnterTime, &key);
@@ -159,6 +176,7 @@ int trace_softirq_exit(struct __softirq_info *info) {
 注意这是所有CPU时间的叠加，平均到每个CPU应该除以CPU个数。*/
 SEC("tracepoint/irq/irq_handler_entry")
 int trace_irq_handler_entry(struct __irq_info *info) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	u32 key = info->irq;
 	u64 ts = bpf_ktime_get_ns();
     bpf_map_update_elem(&irq_cpu_enter_start, &key, &ts, BPF_ANY);
@@ -167,6 +185,7 @@ int trace_irq_handler_entry(struct __irq_info *info) {
 
 SEC("tracepoint/irq/irq_handler_exit")
 int trace_irq_handler_exit(struct __irq_info *info) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	u32 key = info->irq;
 	u64 now = bpf_ktime_get_ns(), *ts = 0;
     ts = bpf_map_lookup_elem(&irq_cpu_enter_start, &key);
@@ -186,6 +205,7 @@ int trace_irq_handler_exit(struct __irq_info *info) {
 //tracepoint:power_cpu_idle 表征了CPU进入IDLE的状态，比较准确
 SEC("tracepoint/power/cpu_idle")
 int trace_cpu_idle(struct idleStruct *pIDLE) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 	u64 delta, time = bpf_ktime_get_ns();
 	u32 key = pIDLE->cpu_id;
 	if (pIDLE->state == -1) {
@@ -215,6 +235,7 @@ static __always_inline int user_mode(struct pt_regs *regs)
 // 两个CPU各自会产生一个调用，这正好方便我们使用
 SEC("perf_event")
 int tick_update(struct pt_regs *ctx) {
+	struct sar_ctrl *sar_ctrl = get_sar_ctrl();
 
 	// bpf_trace_printk("cs_rpl = %x\n", ctx->cs & 3);
 	u32 key = 0;