integration-test: attach uprobes to self

For unclear reasons, two of the integration tests related to uprobes
were resolving a symbol in libc. The integration-test binary can be
built statically, in which case it would not load or reference libc.
Statically linking the integration tests and running them in a VM
without a userland is a convenient mechanism to exercise the tests
against different kernel versions.

The fact that the statically linked integration-test binary does not
load libc is not the only reason these tests failed in such an
environment. In fact, the logic to look in the process's memory
maps was not running (because no pid was being passed).

Separate logic to determine which object file to use when attempting
to resolve a symbol for attaching a uprobe changes its behavior based
on whether that target is an absolute path. If the target is not an
absolute path, the code searches through the LdSoCache. This cache does
not always exist in linux systems; when an attach call is made with a
relative path target and there is no /etc/ld.so.cache file, the attach
call will fail. This commit does not change that behavior, it merely
sidesteps it.
pull/717/head
Andrew Werner 1 year ago
parent dcc6b84a88
commit 79c9489a4f

@ -201,7 +201,9 @@ fn basic_uprobe() {
prog.load().unwrap(); prog.load().unwrap();
assert_loaded("test_uprobe"); assert_loaded("test_uprobe");
let link = prog.attach(Some("sleep"), 0, "libc", None).unwrap(); let link = prog
.attach(Some("uprobe_function"), 0, "/proc/self/exe", None)
.unwrap();
{ {
let _link_owned = prog.take_link(link).unwrap(); let _link_owned = prog.take_link(link).unwrap();
@ -213,7 +215,8 @@ fn basic_uprobe() {
prog.load().unwrap(); prog.load().unwrap();
assert_loaded("test_uprobe"); assert_loaded("test_uprobe");
prog.attach(Some("sleep"), 0, "libc", None).unwrap(); prog.attach(Some("uprobe_function"), 0, "/proc/self/exe", None)
.unwrap();
assert_loaded("test_uprobe"); assert_loaded("test_uprobe");
prog.unload().unwrap(); prog.unload().unwrap();
@ -424,14 +427,23 @@ fn pin_lifecycle_kprobe() {
assert_unloaded("test_kprobe"); assert_unloaded("test_kprobe");
} }
#[no_mangle]
#[inline(never)]
extern "C" fn uprobe_function() {
core::hint::black_box(uprobe_function);
}
#[test] #[test]
fn pin_lifecycle_uprobe() { fn pin_lifecycle_uprobe() {
const FIRST_PIN_PATH: &str = "/sys/fs/bpf/aya-uprobe-test-prog-1";
const SECOND_PIN_PATH: &str = "/sys/fs/bpf/aya-uprobe-test-prog-2";
// 1. Load Program and Pin // 1. Load Program and Pin
{ {
let mut bpf = Bpf::load(crate::TEST).unwrap(); let mut bpf = Bpf::load(crate::TEST).unwrap();
let prog: &mut UProbe = bpf.program_mut("test_uprobe").unwrap().try_into().unwrap(); let prog: &mut UProbe = bpf.program_mut("test_uprobe").unwrap().try_into().unwrap();
prog.load().unwrap(); prog.load().unwrap();
prog.pin("/sys/fs/bpf/aya-uprobe-test-prog").unwrap(); prog.pin(FIRST_PIN_PATH).unwrap();
} }
// should still be loaded since prog was pinned // should still be loaded since prog was pinned
@ -439,11 +451,7 @@ fn pin_lifecycle_uprobe() {
// 2. Load program from bpffs but don't attach it // 2. Load program from bpffs but don't attach it
{ {
let _ = UProbe::from_pin( let _ = UProbe::from_pin(FIRST_PIN_PATH, aya::programs::ProbeKind::UProbe).unwrap();
"/sys/fs/bpf/aya-uprobe-test-prog",
aya::programs::ProbeKind::UProbe,
)
.unwrap();
} }
// should still be loaded since prog was pinned // should still be loaded since prog was pinned
@ -451,17 +459,13 @@ fn pin_lifecycle_uprobe() {
// 3. Load program from bpffs and attach // 3. Load program from bpffs and attach
{ {
let mut prog = UProbe::from_pin( let mut prog = UProbe::from_pin(FIRST_PIN_PATH, aya::programs::ProbeKind::UProbe).unwrap();
"/sys/fs/bpf/aya-uprobe-test-prog", let link_id = prog
aya::programs::ProbeKind::UProbe, .attach(Some("uprobe_function"), 0, "/proc/self/exe", None)
) .unwrap();
.unwrap();
let link_id = prog.attach(Some("sleep"), 0, "libc", None).unwrap();
let link = prog.take_link(link_id).unwrap(); let link = prog.take_link(link_id).unwrap();
let fd_link: FdLink = link.try_into().unwrap(); let fd_link: FdLink = link.try_into().unwrap();
fd_link fd_link.pin(SECOND_PIN_PATH).unwrap();
.pin("/sys/fs/bpf/aya-uprobe-test-bash-sleep")
.unwrap();
// Unpin the program. It will stay attached since its links were pinned. // Unpin the program. It will stay attached since its links were pinned.
prog.unpin().unwrap(); prog.unpin().unwrap();
@ -472,7 +476,7 @@ fn pin_lifecycle_uprobe() {
// 4. unpin link, and make sure everything is unloaded // 4. unpin link, and make sure everything is unloaded
{ {
PinnedLink::from_pin("/sys/fs/bpf/aya-uprobe-test-bash-sleep") PinnedLink::from_pin(SECOND_PIN_PATH)
.unwrap() .unwrap()
.unpin() .unpin()
.unwrap(); .unwrap();
@ -480,4 +484,7 @@ fn pin_lifecycle_uprobe() {
// program should be unloaded // program should be unloaded
assert_unloaded("test_uprobe"); assert_unloaded("test_uprobe");
// Make sure the function isn't optimized out.
uprobe_function();
} }

Loading…
Cancel
Save