Merge branch 'linuxkerneltravel:develop' into develop

linuxkerneltravel · May 10, 2024 · 1415720 · 1415720
2 parents 11f1b6c + 8ba3acf
commit 1415720
Show file tree

Hide file tree

Showing 48 changed files with 932 additions and 1,016 deletions.
diff --git a/.github/workflows/ebpf_kvm_watcher.yml b/.github/workflows/ebpf_kvm_watcher.yml
@@ -19,10 +19,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-
-      - name: Test program execution
+      - name: Install dependencies
         run: |
           cd eBPF_Supermarket/kvm_watcher/
           make deps 
-          make 
- 
+      - name: Test program execution
+        continue-on-error: true 
+        run: |
+          cd eBPF_Supermarket/kvm_watcher/
+          make 
diff --git a/.github/workflows/ebpf_net_watcher.yml b/.github/workflows/ebpf_net_watcher.yml
@@ -45,4 +45,5 @@ jobs:
           sudo timeout -s SIGINT 5 ./netwatcher -k || if [[ $? != 124 && $? != 0 ]];then exit $?;fi
           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
         timeout-minutes: 5
diff --git a/.github/workflows/ebpf_stack_analyser.yml b/.github/workflows/ebpf_stack_analyser.yml
@@ -30,8 +30,10 @@ jobs:
         run: |
           cd eBPF_Supermarket/Stack_Analyser
           make
+          sudo ./stack_analyzer on_cpu off_cpu memleak io readahead llc_stat probe vfs_open -d 5
+
           gcc -o ./testdir/usdt_pthread ./testdir/usdt_pthread.c
-          sudo ./stack_analyzer on_cpu off_cpu memleak io readahead llc_stat probe u:pthread:pthread_create -c "./testdir/usdt_pthread" -t 5
+          sudo ./stack_analyzer probe u:pthread:pthread_create -c "./testdir/usdt_pthread" -d 5
 
   magic-eyes-build-and-test:
     runs-on: ubuntu-22.04
@@ -49,4 +51,5 @@ jobs:
           cd MagicEyes/build
           cmake -DBUILD_STACK_ANALYZER=ON ..
           make
-          sudo ./src/backend/system_diagnosis/stack_analyzer/stack_analyzer on_cpu off_cpu memleak io readahead llc_stat probe u:pthread:pthread_create -c "../../eBPF_Supermarket/Stack_Analyser/testdir/usdt_pthread" -t 5
+          sudo ./src/backend/system_diagnosis/stack_analyzer/stack_analyzer on_cpu off_cpu memleak io readahead llc_stat probe vfs_open -d 5
+          sudo ./src/backend/system_diagnosis/stack_analyzer/stack_analyzer probe u:pthread:pthread_create -c "../../eBPF_Supermarket/Stack_Analyser/testdir/usdt_pthread" -d 5
diff --git a/eBPF_Supermarket/Memory_Subsystem/mem_watcher/README.md b/eBPF_Supermarket/Memory_Subsystem/mem_watcher/README.md
diff --git a/eBPF_Supermarket/Network_Subsystem/net_watcher/common.bpf.h b/eBPF_Supermarket/Network_Subsystem/net_watcher/common.bpf.h
@@ -202,7 +202,7 @@ struct {
 const volatile int filter_dport = 0;
 const volatile int filter_sport = 0;
 const volatile int all_conn = 0, err_packet = 0, extra_conn_info = 0,
-                   layer_time = 0, http_info = 0, retrans_info = 0, udp_info =0,net_filter = 0,kfree_info = 0,icmp_info = 0 ,tcp_info = 0;
+                   layer_time = 0, http_info = 0, retrans_info = 0, udp_info =0,net_filter = 0,drop_reason = 0,icmp_info = 0 ,tcp_info = 0;
 
 /* help macro */
 

diff --git a/eBPF_Supermarket/Network_Subsystem/net_watcher/drop.bpf.h b/eBPF_Supermarket/Network_Subsystem/net_watcher/drop.bpf.h
@@ -18,7 +18,7 @@
 static __always_inline
 int __tp_kfree(struct trace_event_raw_kfree_skb *ctx)
 {
-    if(!kfree_info)
+    if(!drop_reason)
         return 0;
     struct sk_buff *skb=ctx->skbaddr;
     if (skb == NULL) // 判断是否为空