From c929bcd105c7c46894afe2dc1efc8af7e0a8bfc3 Mon Sep 17 00:00:00 2001
From: Xiaobo Liu <cppcoffee@gmail.com>
Date: Fri, 22 Aug 2025 11:47:33 +0800
Subject: [PATCH] more tweak

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
---
 test/integration-common/src/lib.rs       | 5 +++++
 test/integration-ebpf/src/queue_test.rs  | 4 +---
 test/integration-ebpf/src/stack_test.rs  | 4 +---
 test/integration-test/src/tests/queue.rs | 8 +++-----
 test/integration-test/src/tests/stack.rs | 8 +++-----
 test/integration-test/src/utils.rs       | 4 +++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/integration-common/src/lib.rs b/test/integration-common/src/lib.rs
index f75a3939..e2d261a7 100644
--- a/test/integration-common/src/lib.rs
+++ b/test/integration-common/src/lib.rs
@@ -64,3 +64,8 @@ pub mod strncmp {
     #[cfg(feature = "user")]
     unsafe impl aya::Pod for TestResult {}
 }
+
+pub mod stack_queue {
+    pub const PEEK_INDEX: u32 = 0;
+    pub const POP_INDEX: u32 = 1;
+}
diff --git a/test/integration-ebpf/src/queue_test.rs b/test/integration-ebpf/src/queue_test.rs
index 968894e9..941a590d 100644
--- a/test/integration-ebpf/src/queue_test.rs
+++ b/test/integration-ebpf/src/queue_test.rs
@@ -9,9 +9,7 @@ use aya_ebpf::{
 };
 #[cfg(not(test))]
 extern crate ebpf_panic;
-
-const PEEK_INDEX: u32 = 0;
-const POP_INDEX: u32 = 1;
+use integration_common::stack_queue::{PEEK_INDEX, POP_INDEX};
 
 #[map]
 static RESULT: Array<u64> = Array::<u64>::with_max_entries(2, 0);
diff --git a/test/integration-ebpf/src/stack_test.rs b/test/integration-ebpf/src/stack_test.rs
index 6aca84e0..80c2830d 100644
--- a/test/integration-ebpf/src/stack_test.rs
+++ b/test/integration-ebpf/src/stack_test.rs
@@ -9,9 +9,7 @@ use aya_ebpf::{
 };
 #[cfg(not(test))]
 extern crate ebpf_panic;
-
-const PEEK_INDEX: u32 = 0;
-const POP_INDEX: u32 = 1;
+use integration_common::stack_queue::{PEEK_INDEX, POP_INDEX};
 
 #[map]
 static RESULT: Array<u64> = Array::<u64>::with_max_entries(2, 0);
diff --git a/test/integration-test/src/tests/queue.rs b/test/integration-test/src/tests/queue.rs
index f922e2f2..90bf3e97 100644
--- a/test/integration-test/src/tests/queue.rs
+++ b/test/integration-test/src/tests/queue.rs
@@ -1,9 +1,7 @@
-use aya::{EbpfLoader, maps::Array, programs::UProbe};
+use aya::{EbpfLoader, maps::Array};
 
 use crate::utils::attach_uprobe;
-
-const PEEK_INDEX: u32 = 0;
-const POP_INDEX: u32 = 1;
+use integration_common::stack_queue::{PEEK_INDEX, POP_INDEX};
 
 #[unsafe(no_mangle)]
 #[inline(never)]
@@ -34,7 +32,7 @@ fn queue_basic() {
         ("test_queue_pop", "trigger_queue_pop"),
         ("test_queue_peek", "trigger_queue_peek"),
     ] {
-        attach_uprobe(bpf, probe_name, symbol);
+        attach_uprobe(&mut bpf, probe_name, symbol);
     }
 
     let array_map = bpf.map("RESULT").unwrap();
diff --git a/test/integration-test/src/tests/stack.rs b/test/integration-test/src/tests/stack.rs
index fd2e5606..1604e0aa 100644
--- a/test/integration-test/src/tests/stack.rs
+++ b/test/integration-test/src/tests/stack.rs
@@ -1,9 +1,7 @@
-use aya::{EbpfLoader, maps::Array, programs::UProbe};
+use aya::{EbpfLoader, maps::Array};
 
 use crate::utils::attach_uprobe;
-
-const PEEK_INDEX: u32 = 0;
-const POP_INDEX: u32 = 1;
+use integration_common::stack_queue::{PEEK_INDEX, POP_INDEX};
 
 #[unsafe(no_mangle)]
 #[inline(never)]
@@ -34,7 +32,7 @@ fn stack_basic() {
         ("test_stack_peek", "trigger_stack_peek"),
         ("test_stack_pop", "trigger_stack_pop"),
     ] {
-        attach_uprobe(bpf, probe_name, symbol);
+        attach_uprobe(&mut bpf, probe_name, symbol);
     }
 
     let array_map = bpf.map("RESULT").unwrap();
diff --git a/test/integration-test/src/utils.rs b/test/integration-test/src/utils.rs
index 81608cfa..4da06e0a 100644
--- a/test/integration-test/src/utils.rs
+++ b/test/integration-test/src/utils.rs
@@ -6,7 +6,9 @@ use std::{
     sync::atomic::{AtomicU64, Ordering},
 };
 
+use aya::Ebpf;
 use aya::netlink_set_link_up;
+use aya::programs::UProbe;
 use libc::if_nametoindex;
 use netns_rs::{NetNs, get_from_current_thread};
 
@@ -102,7 +104,7 @@ macro_rules! kernel_assert_eq {
 
 pub(crate) use kernel_assert_eq;
 
-pub(crate) fn attach_uprobe(bpf: &mut Bpf, probe_name: &str, symbol: &str) {
+pub(crate) fn attach_uprobe(bpf: &mut Ebpf, probe_name: &str, symbol: &str) {
     let prog: &mut UProbe = bpf.program_mut(probe_name).unwrap().try_into().unwrap();
     prog.load().unwrap();
     prog.attach(symbol, "/proc/self/exe", None, None).unwrap();