CPU_Watcher: 更改cpu_watcher架构 && 更改Makefile && 完善README (#776)

* 调整cpu_watcher架构 && 更改Makefile文件

* Update README.md

完善README

---------

Co-authored-by: xhb <[email protected]>

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/Makefile

@@ -38,13 +38,15 @@ VMLINUX := ../vmlinux/$(ARCH)/vmlinux.h
 # Use our own libbpf API headers and Linux UAPI headers distributed with
 # libbpf to avoid dependency on system-wide headers, which could be missing or
 # outdated
-INCLUDES := -I$(OUTPUT) -I../../../libbpf/include/uapi -I$(dir $(VMLINUX)) -I$(LIBBLAZESYM_INC) -I./
+INCLUDES := -I$(OUTPUT) -I../../../libbpf/include/uapi -I$(dir $(VMLINUX)) -I$(LIBBLAZESYM_INC) -I./include
 CFLAGS := -g -Wall
 ALL_LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 
 APPS =cs_delay sar sc_delay preempt schedule_delay mq_delay
 TARGETS=cpu_watcher
 
+SRC_DIR = ./include
+
 
 # Get Clang's default includes on this system. We'll explicitly add these dirs
 # to the includes list when compiling with `-target bpf` because otherwise some
@@ -112,7 +114,7 @@ $(LIBBLAZESYM_OBJ): $(LIBBLAZESYM_SRC)/target/release/libblazesym.a | $(OUTPUT)
 	$(Q)cp $(LIBBLAZESYM_SRC)/target/release/libblazesym.a $@
 
 # Build BPF code
-$(OUTPUT)/%.bpf.o: %.bpf.c $(LIBBPF_OBJ) $(wildcard %.h) $(VMLINUX) | $(OUTPUT) $(BPFTOOL)
+$(OUTPUT)/%.bpf.o: bpf/%.bpf.c $(LIBBPF_OBJ) $(wildcard %.h) $(VMLINUX) | $(OUTPUT) $(BPFTOOL)
 	$(call msg,BPF,$@)
 	$(Q)$(CLANG) -g -O2 -target bpf -D__TARGET_ARCH_$(ARCH)		      \
 		     $(INCLUDES) $(CLANG_BPF_SYS_INCLUDES)		      \
@@ -126,14 +128,18 @@ $(APPS): %: $(OUTPUT)/%.bpf.o | $(OUTPUT) $(BPFTOOL)
 	$(Q)$(BPFTOOL) gen skeleton $< > $(OUTPUT)/$@.skel.h
 
 # Build user-space code
+$(OUTPUT)/%.o: $(SRC_DIR)/%.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
 $(TARGETS): %: $(OUTPUT)/%.o $(COMMON_OBJ) $(LIBBPF_OBJ) | $(OUTPUT)
 	$(call msg,BINARY,$@)
-	$(Q)$(CC) $(CFLAGS) $^ $(ALL_LDFLAGS) -lelf -lz -o $@
+	$(Q)$(CC) $(CFLAGS) $^ $(ALL_LDFLAGS) -lstdc++ -lelf -lz -o $@
 
 # delete failed targets
 .DELETE_ON_ERROR:

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/README.md

@@ -68,6 +68,9 @@ make clean                       清除生成文件
 - `sysc/ms`: CPU执行用户程序系统调用(`syscall`)所占用的时间，是所有CPU的叠加。
 - ` utime/ms`：CPU执行普通用户进程时，花在用户态的时间，是所有CPU的叠加。
 
+原理介绍:
+
+[libbpf_sar工具原理分析](docs/libbpf_sar.md)
 ### **2.统计抢占调度时间：**
 
 ​	统计系统中发生抢占调度的情况，包括抢占进程的`pid`与进程名，以及被强占进程的`pid`，和本次抢占时间，单位纳秒。
@@ -214,9 +217,11 @@ per_len = 1000
 
 ​	获取内核全局变量，直接从内核全局变量读取信息。如proc/s就是通过直接读取total_forks内核全局变量来计算每秒产生进程数的。
 
+## 五、cpu_watcher可视化
 
+[cpu_watcher可视化指南](docs/cpu_watcher_vis_guide.md)
 
-## 五、未来展望
+## 六、未来展望
 
 目前`cpu_watcher`工具的总体框架已经完成，工具所能满足的功能已覆盖CPU所涉及的大部分性能指标。下一阶段，本工具将从以下几个方向进行开发和优化：
 

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

@@ -1,3 +1,19 @@
+// Copyright 2023 The LMP Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// author: [email protected] [email protected] [email protected]
+
 #include <vmlinux.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_core_read.h>

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

@@ -1,4 +1,4 @@
-// Copyright 2024 The LMP Authors.
+// Copyright 2023 The LMP Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// author: [email protected]
+// author: [email protected] [email protected] [email protected]
 
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>		//包含了BPF 辅助函数

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

@@ -1,3 +1,19 @@
+// Copyright 2023 The LMP Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// author: [email protected] [email protected] [email protected]
+
 #include <vmlinux.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_core_read.h>
@@ -33,7 +49,8 @@ int BPF_PROG(sched_switch, bool preempt, struct task_struct *prev, struct task_s
     return 0;
 }
 
-SEC("kprobe/finish_task_switch") 
+// SEC("kprobe/finish_task_switch") 
+SEC("kprobe/finish_task_switch.isra.0") 
 int BPF_KPROBE(finish_task_switch, struct task_struct *prev) {
     u64 end_time = bpf_ktime_get_ns();
     pid_t pid = BPF_CORE_READ(prev, pid);

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

@@ -1,3 +1,19 @@
+// Copyright 2023 The LMP Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// author: [email protected] [email protected] [email protected]
+
 #include <vmlinux.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_core_read.h>
@@ -36,8 +52,8 @@ BPF_ARRAY(ut_LastTime,u32,u64,1);
 BPF_ARRAY(tick_user,u32,u64,1);
 BPF_ARRAY(symAddr,u32,u64,1);
 // 统计fork数
-//SEC("kprobe/finish_task_switch.isra.0")
-SEC("kprobe/finish_task_switch")
+SEC("kprobe/finish_task_switch.isra.0")
+// SEC("kprobe/finish_task_switch")
 int kprobe__finish_task_switch(struct pt_regs *ctx)
 {
     u32 key = 0;
@@ -75,8 +91,8 @@ int trace_sched_switch2(struct cswch_args *info) {
 	return 0;
 }
 
-SEC("kprobe/finish_task_switch")
-//SEC("kprobe/finish_task_switch.isra.0")
+// SEC("kprobe/finish_task_switch")
+SEC("kprobe/finish_task_switch.isra.0")
 int BPF_KPROBE(finish_task_switch,struct task_struct *prev){
 	pid_t pid=BPF_CORE_READ(prev,pid);
 	u64 *val, time = bpf_ktime_get_ns();

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/sc_delay.bpf.c → eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/sc_delay.bpf.c

@@ -1,3 +1,19 @@
+// Copyright 2023 The LMP Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// author: [email protected] [email protected] [email protected]
+
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>		//包含了BPF 辅助函数
 #include <bpf/bpf_tracing.h>

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/schedule_delay.bpf.c → eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/schedule_delay.bpf.c

@@ -1,3 +1,19 @@
+// Copyright 2023 The LMP Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// author: [email protected] [email protected] [email protected]
+
 #include <vmlinux.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_core_read.h>

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cpu_watcher.c

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// author: [email protected]
+// author: [email protected] [email protected] [email protected]
 
 
 #include <argp.h>

eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cpu_watcher.h → eBPF_Supermarket/CPU_Subsystem/cpu_watcher/include/cpu_watcher.h

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// author: [email protected]
-//
-// eBPF map for libbpf sar
+// author: [email protected] [email protected] [email protected]
+
 #include <asm/types.h>
 #include <linux/version.h>