yanguangshaonian
/
aya
mirror of https://github.com/aya-rs/aya
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aya-obj: Propagate sleepable into ProgramSection

Browse Source 
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
reviewable/pr711/r22
Dave Tucker 1 year ago
parent 7eebdcbdeb
commit 677e7bda4a
2 changed files with 176 additions and 11 deletions
Show Stats Download Patch File Download Diff File

179
aya-obj/src/obj.rs
Unescape Escape View File

@ -222,7 +222,6 @@ pub struct Function {
/// Currently, the following section names are not supported yet:
/// - `flow_dissector`: `BPF_PROG_TYPE_FLOW_DISSECTOR`
/// - `ksyscall+` or `kretsyscall+`
/// - `uprobe.s+` or `uretprobe.s+`
/// - `usdt+`
/// - `kprobe.multi+` or `kretprobe.multi+`: `BPF_TRACE_KPROBE_MULTI`
/// - `lsm_cgroup+`
@ -233,7 +232,6 @@ pub struct Function {
/// - `syscall`
/// - `struct_ops+`
/// - `fmod_ret+`, `fmod_ret.s+`
/// - `fentry.s+`, `fexit.s+`
/// - `iter+`, `iter.s+`
/// - `xdp.frags/cpumap`, `xdp/cpumap`
/// - `xdp.frags/devmap`, `xdp/devmap`
@ -248,9 +246,11 @@ pub enum ProgramSection {
},
UProbe {
name: String,
sleepable: bool,
},
URetProbe {
name: String,
sleepable: bool,
},
TracePoint {
name: String,
@ -315,9 +315,11 @@ pub enum ProgramSection {
},
FEntry {
name: String,
sleepable: bool,
},
FExit {
name: String,
sleepable: bool,
},
Extension {
name: String,
@ -340,8 +342,8 @@ impl ProgramSection {
match self {
ProgramSection::KRetProbe { name } => name,
ProgramSection::KProbe { name } => name,
ProgramSection::UProbe { name } => name,
ProgramSection::URetProbe { name } => name,
ProgramSection::UProbe { name, .. } => name,
ProgramSection::URetProbe { name, .. } => name,
ProgramSection::TracePoint { name } => name,
ProgramSection::SocketFilter { name } => name,
ProgramSection::Xdp { name, .. } => name,
@ -360,9 +362,9 @@ impl ProgramSection {
ProgramSection::PerfEvent { name } => name,
ProgramSection::RawTracePoint { name } => name,
ProgramSection::Lsm { name, .. } => name,
ProgramSection::BtfTracePoint { name } => name,
ProgramSection::FEntry { name } => name,
ProgramSection::FExit { name } => name,
ProgramSection::BtfTracePoint { name, .. } => name,
ProgramSection::FEntry { name, .. } => name,
ProgramSection::FExit { name, .. } => name,
ProgramSection::Extension { name } => name,
ProgramSection::SkLookup { name } => name,
ProgramSection::CgroupSock { name, .. } => name,
@ -388,8 +390,22 @@ impl FromStr for ProgramSection {
Ok(match kind {
"kprobe" => KProbe { name },
"kretprobe" => KRetProbe { name },
"uprobe" => UProbe { name },
"uretprobe" => URetProbe { name },
"uprobe" => UProbe {
name,
sleepable: false,
},
"uprobe.s" => UProbe {
name,
sleepable: true,
},
"uretprobe" => URetProbe {
name,
sleepable: false,
},
"uretprobe.s" => URetProbe {
name,
sleepable: true,
},
"xdp" => Xdp { name, frags: false },
"xdp.frags" => Xdp { name, frags: true },
"tp_btf" => BtfTracePoint { name },
@ -551,8 +567,22 @@ impl FromStr for ProgramSection {
name,
sleepable: true,
},
"fentry" => FEntry { name },
"fexit" => FExit { name },
"fentry" => FEntry {
name,
sleepable: false,
},
"fentry.s" => FEntry {
name,
sleepable: true,
},
"fexit" => FExit {
name,
sleepable: false,
},
"fexit.s" => FExit {
name,
sleepable: true,
},
"freplace" => Extension { name },
"sk_lookup" => SkLookup { name },
_ => {
@ -2018,6 +2048,81 @@ mod tests {
);
}
#[test]
fn test_parse_section_uprobe_sleepable() {
let mut obj = fake_obj();
fake_sym(&mut obj, 0, 0, "foo", FAKE_INS_LEN);
assert_matches!(
obj.parse_section(fake_section(
BpfSectionKind::Program,
"uprobe.s/foo",
bytes_of(&fake_ins()),
None
)),
Ok(())
);
assert_matches!(
obj.programs.get("foo"),
Some(Program {
section: ProgramSection::UProbe {
sleepable: true,
..
},
..
})
);
}
#[test]
fn test_parse_section_uretprobe() {
let mut obj = fake_obj();
fake_sym(&mut obj, 0, 0, "foo", FAKE_INS_LEN);
assert_matches!(
obj.parse_section(fake_section(
BpfSectionKind::Program,
"uretprobe/foo",
bytes_of(&fake_ins()),
None
)),
Ok(())
);
assert_matches!(
obj.programs.get("foo"),
Some(Program {
section: ProgramSection::URetProbe { .. },
..
})
);
}
#[test]
fn test_parse_section_uretprobe_sleepable() {
let mut obj = fake_obj();
fake_sym(&mut obj, 0, 0, "foo", FAKE_INS_LEN);
assert_matches!(
obj.parse_section(fake_section(
BpfSectionKind::Program,
"uretprobe.s/foo",
bytes_of(&fake_ins()),
None
)),
Ok(())
);
assert_matches!(
obj.programs.get("foo"),
Some(Program {
section: ProgramSection::URetProbe {
sleepable: true,
..
},
..
})
);
}
#[test]
fn test_parse_section_trace_point() {
let mut obj = fake_obj();
@ -2313,6 +2418,32 @@ mod tests {
);
}
#[test]
fn test_parse_section_fentry_sleepable() {
let mut obj = fake_obj();
fake_sym(&mut obj, 0, 0, "foo", FAKE_INS_LEN);
assert_matches!(
obj.parse_section(fake_section(
BpfSectionKind::Program,
"fentry.s/foo",
bytes_of(&fake_ins()),
None
)),
Ok(())
);
assert_matches!(
obj.programs.get("foo"),
Some(Program {
section: ProgramSection::FEntry {
sleepable: true,
..
},
..
})
);
}
#[test]
fn test_parse_section_fexit() {
let mut obj = fake_obj();
@ -2336,6 +2467,32 @@ mod tests {
);
}
#[test]
fn test_parse_section_fexit_sleepable() {
let mut obj = fake_obj();
fake_sym(&mut obj, 0, 0, "foo", FAKE_INS_LEN);
assert_matches!(
obj.parse_section(fake_section(
BpfSectionKind::Program,
"fexit.s/foo",
bytes_of(&fake_ins()),
None
)),
Ok(())
);
assert_matches!(
obj.programs.get("foo"),
Some(Program {
section: ProgramSection::FExit {
sleepable: true,
..
},
..
})
);
}
#[test]
fn test_parse_section_cgroup_skb_ingress_unnamed() {
let mut obj = fake_obj();

8
xtask/public-api/aya-obj.txt
Unescape Escape View File

@ -5837,8 +5837,10 @@ pub aya_obj::obj::ProgramSection::Extension
pub aya_obj::obj::ProgramSection::Extension::name: alloc::string::String
pub aya_obj::obj::ProgramSection::FEntry
pub aya_obj::obj::ProgramSection::FEntry::name: alloc::string::String
pub aya_obj::obj::ProgramSection::FEntry::sleepable: bool
pub aya_obj::obj::ProgramSection::FExit
pub aya_obj::obj::ProgramSection::FExit::name: alloc::string::String
pub aya_obj::obj::ProgramSection::FExit::sleepable: bool
pub aya_obj::obj::ProgramSection::KProbe
pub aya_obj::obj::ProgramSection::KProbe::name: alloc::string::String
pub aya_obj::obj::ProgramSection::KRetProbe
@ -5870,8 +5872,10 @@ pub aya_obj::obj::ProgramSection::TracePoint
pub aya_obj::obj::ProgramSection::TracePoint::name: alloc::string::String
pub aya_obj::obj::ProgramSection::UProbe
pub aya_obj::obj::ProgramSection::UProbe::name: alloc::string::String
pub aya_obj::obj::ProgramSection::UProbe::sleepable: bool
pub aya_obj::obj::ProgramSection::URetProbe
pub aya_obj::obj::ProgramSection::URetProbe::name: alloc::string::String
pub aya_obj::obj::ProgramSection::URetProbe::sleepable: bool
pub aya_obj::obj::ProgramSection::Xdp
pub aya_obj::obj::ProgramSection::Xdp::frags: bool
pub aya_obj::obj::ProgramSection::Xdp::name: alloc::string::String
@ -6585,8 +6589,10 @@ pub aya_obj::ProgramSection::Extension
pub aya_obj::ProgramSection::Extension::name: alloc::string::String
pub aya_obj::ProgramSection::FEntry
pub aya_obj::ProgramSection::FEntry::name: alloc::string::String
pub aya_obj::ProgramSection::FEntry::sleepable: bool
pub aya_obj::ProgramSection::FExit
pub aya_obj::ProgramSection::FExit::name: alloc::string::String
pub aya_obj::ProgramSection::FExit::sleepable: bool
pub aya_obj::ProgramSection::KProbe
pub aya_obj::ProgramSection::KProbe::name: alloc::string::String
pub aya_obj::ProgramSection::KRetProbe
@ -6618,8 +6624,10 @@ pub aya_obj::ProgramSection::TracePoint
pub aya_obj::ProgramSection::TracePoint::name: alloc::string::String
pub aya_obj::ProgramSection::UProbe
pub aya_obj::ProgramSection::UProbe::name: alloc::string::String
pub aya_obj::ProgramSection::UProbe::sleepable: bool
pub aya_obj::ProgramSection::URetProbe
pub aya_obj::ProgramSection::URetProbe::name: alloc::string::String
pub aya_obj::ProgramSection::URetProbe::sleepable: bool
pub aya_obj::ProgramSection::Xdp
pub aya_obj::ProgramSection::Xdp::frags: bool
pub aya_obj::ProgramSection::Xdp::name: alloc::string::String

Write Preview
Loading…
Cancel
Save