Merge branch 'develop' into fusedemo_explain

linuxkerneltravel · Dec 3, 2023 · 8f6089b · 8f6089b
2 parents a6f17bb + 967633f
commit 8f6089b
Show file tree

Hide file tree

Showing 41 changed files with 2,042 additions and 1,633 deletions.
diff --git a/.github/workflows/libbpf.yml → .github/workflows/cpu_watcher.yml b/.github/workflows/libbpf.yml → .github/workflows/cpu_watcher.yml
@@ -1,18 +1,18 @@
-name: libbpf
+name: cpu_watcher
 
 on:
   push:
     branches:
       - "*"
     paths: 
-      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay/**'
-      - '.github/workflows/libbpf.yml'
+      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/**'
+      - '.github/workflows/cpu_watcher.yml'
   pull_request:
     branches:
       - "*"
     paths:
-      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay/**'
-      - '.github/workflows/libbpf.yml'
+      - 'eBPF_Supermarket/CPU_Subsystem/cpu_watcher/**'
+      - '.github/workflows/cpu_watcher.yml'
 
 jobs:
   libbpf-project-build-and-test:
@@ -26,8 +26,8 @@ jobs:
           sudo apt install libbpf-dev clang llvm libelf-dev libpcap-dev gcc-multilib build-essential
           git submodule update --init --recursive
 
-      - name: Run cs_delay
+      - name: Run cpu_watcher
         run: |
-          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cs_delay/libbpf_cs_delay
-          make cs_delay
-          sudo ./cs_delay
+          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/
+          make cpu_watcher
+          sudo ./cpu_watcher 
diff --git a/.github/workflows/eBPF_proc_image.yml b/.github/workflows/eBPF_proc_image.yml
@@ -55,6 +55,12 @@ jobs:
           cd eBPF_Supermarket/CPU_Subsystem/eBPF_proc_image
           make proc_image
           sudo ./proc_image -t 1
+      
+      - name: Run new_proc_image
+        run: |
+          cd eBPF_Supermarket/CPU_Subsystem/eBPF_proc_image/developing
+          make proc_image
+          sudo ./proc_image -r -t 1
 
       - name: Run mutex_test
         run: |

diff --git a/.github/workflows/kvm_watcher.yml b/.github/workflows/kvm_watcher.yml
@@ -27,13 +27,12 @@ jobs:
           sudo apt install linux-tools-$(uname -r)
           sudo apt install linux-cloud-tools-$(uname -r)
           sudo modprobe kvm
-      - name: Run kvm_exits
+      - name: Run kvm_watcher
         run: |
-          cd eBPF_Supermarket/kvm_watcher/vm_exits
+          cd eBPF_Supermarket/kvm_watcher/
           make
-          sudo ./kvm_exits -t 5
-      - name: Run kvm_vcpu
-        run: |
-          cd eBPF_Supermarket/kvm_watcher/vcpu
-          make
-          sudo ./kvm_vcpu -w -t 5
+          sudo ./kvm_watcher -w -t 5
+          sudo ./kvm_watcher -e -t 5 -s
+          sudo ./kvm_watcher -n -t 5 
+          make clean
+
diff --git a/.github/workflows/system_cpu.yml b/.github/workflows/system_cpu.yml
@@ -104,7 +104,7 @@ jobs:
           uname -r
           ./run.sh
 
-  libbpf_sar-project-build-and-test:
+  cpu_watcher-project-build-and-test:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -115,8 +115,8 @@ jobs:
           sudo apt install libbpf-dev clang llvm libelf-dev libpcap-dev gcc-multilib build-essential
           git submodule update --init --recursive
 
-      - name: Run libbpf_sar
+      - name: Run cpu_watcher
         run: |
-          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher/libbpf_sar
-          make libbpf_sar
-          sudo ./libbpf_sar -t 1
+          cd eBPF_Supermarket/CPU_Subsystem/cpu_watcher
+          make cpu_watcher
+          sudo ./cpu_watcher
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1,7 @@
 *      @helight @LinkinPF @chenamy2017
+/eBPF_Supermarket/Filesystem_Subsystem/fast_fuse @13186379707
+/eBPF_Supermarket/Network_Subsystem/net_watcher @helight @LinkinPF @chenamy2017
+/eBPF_Supermarket/CPU_Subsystem/cpu_watcher @helight @LinkinPF @chenamy2017
+/eBPF_Supermarket/CPU_Subsystem/eBPF_proc_image @helight @LinkinPF @chenamy2017
+/eBPF_Supermarket/Stack_Analyser @helight @LinkinPF @chenamy2017
+/eBPF_Supermarket/kvm_watcher @helight @LinkinPF @chenamy2017
diff --git a/..._watcher/cs_delay/BCC_cs_delay/cs_delay.c → ...ket/CPU_Subsystem/BCC_cs_delay/cs_delay.c b/..._watcher/cs_delay/BCC_cs_delay/cs_delay.c → ...ket/CPU_Subsystem/BCC_cs_delay/cs_delay.c
diff --git a/...watcher/cs_delay/BCC_cs_delay/cs_delay.py → ...et/CPU_Subsystem/BCC_cs_delay/cs_delay.py b/...watcher/cs_delay/BCC_cs_delay/cs_delay.py → ...et/CPU_Subsystem/BCC_cs_delay/cs_delay.py
diff --git a/...watcher/cs_delay/libbpf_cs_delay/Makefile → ...market/CPU_Subsystem/cpu_watcher/Makefile b/...watcher/cs_delay/libbpf_cs_delay/Makefile → ...market/CPU_Subsystem/cpu_watcher/Makefile
@@ -19,12 +19,12 @@
 # SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 OUTPUT := .output
 CLANG ?= clang
-LIBBPF_SRC := $(abspath ../../../libbpf/src)
-BPFTOOL_SRC := $(abspath ../../../bpftool/src)
+LIBBPF_SRC := $(abspath ../libbpf/src)
+BPFTOOL_SRC := $(abspath ../bpftool/src)
 LIBBPF_OBJ := $(abspath $(OUTPUT)/libbpf.a)
 BPFTOOL_OUTPUT ?= $(abspath $(OUTPUT)/bpftool)
 BPFTOOL ?= $(BPFTOOL_OUTPUT)/bootstrap/bpftool
-LIBBLAZESYM_SRC := $(abspath ../../../blazesym/)
+LIBBLAZESYM_SRC := $(abspath ../blazesym/)
 LIBBLAZESYM_INC := $(abspath $(LIBBLAZESYM_SRC)/include)
 LIBBLAZESYM_OBJ := $(abspath $(OUTPUT)/libblazesym.a)
 ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
@@ -34,15 +34,15 @@ ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
 			 | sed 's/mips.*/mips/' \
 			 | sed 's/riscv64/riscv/' \
 			 | sed 's/loongarch64/loongarch/')
-VMLINUX := ../../../vmlinux/$(ARCH)/vmlinux.h
+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)
 CFLAGS := -g -Wall
 ALL_LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 
-APPS = cs_delay
+APPS = cpu_watcher
 
 CARGO ?= $(shell which cargo)
 ifeq ($(strip $(CARGO)),)