fix: update dep

Signed-off-by: Godones <chenlinfeng25@outlook.com>

Author: Godones

Cargo.lock

@@ -250,7 +250,7 @@ gdb-client:
 	riscv64-unknown-elf-gdb -ex 'file kernel-qemu' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'
 
 kernel_asm:
-	@riscv64-unknown-elf-objdump -d target/riscv64gc-unknown-none-elf/release/kernel > kernel.asm
+	@riscv64-unknown-elf-objdump -d $(KERNEL_FILE) > kernel.asm
 	@vim kernel.asm
 	@rm kernel.asm
 

Makefile

@@ -27,12 +27,7 @@ shim = { path = "../subsystems/shim", features = ["kernel"] }
 kprobe = { git = "https://github.com/Godones/ext_ebpf" }
 bpf-basic = { git = "https://github.com/Godones/ext_ebpf" }
 ksym = { git = "https://github.com/Godones/ext_ebpf" }
-# kprobe = { path = "../../os-modules/ext_ebpf/kprobe" }
-# bpf-basic = { path = "../../os-modules/ext_ebpf/bpf-basic" }
-# ksym = { path = "../../os-modules/ext_ebpf/ksym" }
-rbpf = { path = "../../os-modules/ext_ebpf/rbpf", default-features = false, features = [
-    "skip_mem_check",
-] }
+rbpf = { git = "https://github.com/qmonnet/rbpf.git", default-features = false }
 
 
 riscv = "0.10"

kernel/Cargo.toml

@@ -38,7 +38,10 @@ impl PerfEventOps for BpfPerfEvent {
 
 pub fn perf_event_open_bpf(args: PerfProbeArgs) -> BpfPerfEvent {
     // For bpf prog output
-    assert_eq!(args.config, perf_sw_ids::PERF_COUNT_SW_BPF_OUTPUT);
+    // assert_eq!(
+    //     args.config,
+    //     PerfProbeConfig::PerfSwIds(perf_sw_ids::PERF_COUNT_SW_BPF_OUTPUT)
+    // );
     assert_eq!(
         args.sample_type,
         Some(perf_event_sample_format::PERF_SAMPLE_RAW)

kernel/src/perf/ebpf.rs

@@ -1,5 +1,5 @@
-use alloc::{boxed::Box, sync::Arc};
-use core::any::Any;
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
+use core::{any::Any, sync::atomic::AtomicU32};
 
 use bpf_basic::perf::PerfProbeArgs;
 use kprobe::{CallBackFunc, KprobeBuilder, ProbeArgs};
@@ -17,10 +17,24 @@ use crate::{
 pub struct KprobePerfEvent {
     _args: PerfProbeArgs,
     kprobe: Arc<KernelKprobe>,
+    callback_list: Vec<u32>,
+}
+
+impl KprobePerfEvent {
+    pub fn new(args: PerfProbeArgs, kprobe: Arc<KernelKprobe>) -> Self {
+        KprobePerfEvent {
+            _args: args,
+            kprobe,
+            callback_list: Vec::new(),
+        }
+    }
 }
 
 impl Drop for KprobePerfEvent {
     fn drop(&mut self) {
+        for callback_id in &self.callback_list {
+            self.kprobe.unregister_event_callback(*callback_id);
+        }
         unregister_kprobe(self.kprobe.clone());
     }
 }
@@ -92,10 +106,16 @@ impl KprobePerfEvent {
         for (key, value) in BPF_HELPER_FUN_SET.iter() {
             vm.register_helper(*key, *value).unwrap();
         }
+
+        static CALLBACK_ID: AtomicU32 = AtomicU32::new(0);
+
+        let id = CALLBACK_ID.fetch_add(1, core::sync::atomic::Ordering::Relaxed);
+
         // create a callback to execute the ebpf prog
         let callback = Box::new(KprobePerfCallBack::new(bpf_prog, vm));
         // update callback for kprobe
-        self.kprobe.update_event_callback(callback);
+        self.kprobe.register_event_callback(id, callback);
+        self.callback_list.push(id);
         Ok(())
     }
 }
@@ -115,8 +135,5 @@ pub fn perf_event_open_kprobe(args: PerfProbeArgs) -> KprobePerfEvent {
     let builder = perf_probe_arg_to_kprobe_builder(&args);
     let kprobe = register_kprobe(builder);
     println_color!(32, "create kprobe ok");
-    KprobePerfEvent {
-        _args: args,
-        kprobe,
-    }
+    KprobePerfEvent::new(args, kprobe)
 }