Skip to content

Commit

Permalink
feat(aya): Add iterator program type
Browse files Browse the repository at this point in the history
BPF iterators[0] are a way to dump kernel data into user-space and an
alternative to `/proc` filesystem.

This change adds support for BPF iterators on the user-space side. It
provides a possibility to retrieve the outputs of BPF iterator programs
both from sync and async Rust code.

[0] https://docs.kernel.org/bpf/bpf_iterators.html
  • Loading branch information
vadorovsky committed Nov 23, 2024
1 parent e423fce commit 9165e7f
Show file tree
Hide file tree
Showing 15 changed files with 543 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ edition = "2021"
[workspace.dependencies]
anyhow = { version = "1", default-features = false }
assert_matches = { version = "1.5.0", default-features = false }
async-io = { version = "2.0", default-features = false }
async-fs = { version = "2.1", default-features = false }
async-io = { version = "2.4", default-features = false }
bindgen = { version = "0.70", default-features = false }
bitflags = { version = "2.2.1", default-features = false }
bytes = { version = "1", default-features = false }
Expand Down
5 changes: 5 additions & 0 deletions aya-obj/src/obj.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ pub enum ProgramSection {
attach_type: CgroupSockAttachType,
},
CgroupDevice,
Iter {
sleepable: bool,
},
}

impl FromStr for ProgramSection {
Expand Down Expand Up @@ -439,6 +442,8 @@ impl FromStr for ProgramSection {
"fexit.s" => FExit { sleepable: true },
"freplace" => Extension,
"sk_lookup" => SkLookup,
"iter" => Iter { sleepable: false },
"iter.s" => Iter { sleepable: true },
_ => {
return Err(ParseError::InvalidProgramSection {
section: section.to_owned(),
Expand Down
1 change: 1 addition & 0 deletions aya/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ edition.workspace = true

[dependencies]
assert_matches = { workspace = true }
async-fs = { workspace = true, optional = true }
async-io = { workspace = true, optional = true }
aya-obj = { path = "../aya-obj", version = "^0.2.1", features = ["std"] }
bitflags = { workspace = true }
Expand Down
17 changes: 13 additions & 4 deletions aya/src/bpf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ use crate::{
},
programs::{
BtfTracePoint, CgroupDevice, CgroupSkb, CgroupSkbAttachType, CgroupSock, CgroupSockAddr,
CgroupSockopt, CgroupSysctl, Extension, FEntry, FExit, KProbe, LircMode2, Lsm, PerfEvent,
ProbeKind, Program, ProgramData, ProgramError, RawTracePoint, SchedClassifier, SkLookup,
SkMsg, SkSkb, SkSkbKind, SockOps, SocketFilter, TracePoint, UProbe, Xdp,
CgroupSockopt, CgroupSysctl, Extension, FEntry, FExit, Iter, KProbe, LircMode2, Lsm,
PerfEvent, ProbeKind, Program, ProgramData, ProgramError, RawTracePoint, SchedClassifier,
SkLookup, SkMsg, SkSkb, SkSkbKind, SockOps, SocketFilter, TracePoint, UProbe, Xdp,
},
sys::{
bpf_load_btf, is_bpf_cookie_supported, is_bpf_global_data_supported,
Expand Down Expand Up @@ -410,7 +410,8 @@ impl<'a> EbpfLoader<'a> {
| ProgramSection::FEntry { sleepable: _ }
| ProgramSection::FExit { sleepable: _ }
| ProgramSection::Lsm { sleepable: _ }
| ProgramSection::BtfTracePoint => {
| ProgramSection::BtfTracePoint
| ProgramSection::Iter { sleepable: _ } => {
return Err(EbpfError::BtfError(err))
}
ProgramSection::KRetProbe
Expand Down Expand Up @@ -688,6 +689,14 @@ impl<'a> EbpfLoader<'a> {
ProgramSection::CgroupDevice => Program::CgroupDevice(CgroupDevice {
data: ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level),
}),
ProgramSection::Iter { sleepable } => {
let mut data =
ProgramData::new(prog_name, obj, btf_fd, *verifier_log_level);
if *sleepable {
data.flags = BPF_F_SLEEPABLE;
}
Program::Iter(Iter { data })
}
}
};
(name, program)
Expand Down
160 changes: 160 additions & 0 deletions aya/src/programs/iter.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
//! Iterators.
use std::os::fd::{AsFd, BorrowedFd};

use crate::{
generated::{bpf_attach_type::BPF_TRACE_ITER, bpf_link_type, bpf_prog_type},
obj::btf::{Btf, BtfKind},
programs::{
define_link_wrapper, load_program, FdLink, LinkError, PerfLinkIdInner, PerfLinkInner,
ProgramData, ProgramError,
},
sys::{bpf_create_iter, bpf_link_create, bpf_link_get_info_by_fd, LinkTarget, SyscallError},
};

/// An eBPF iterator which allows to dump into user space.
///
/// It can be seen as an alternative to `/proc` filesystem, as it offers more
/// flexibility about what information should be retrieved and how it should be
/// formatted.
///
/// # Minimum kernel version
///
/// The minimum kernel version required to use this feature is 5.8.
///
/// # Examples
///
/// ## Non-async Rust
///
/// ```no_run
/// use std::io::{BufRead, BufReader};
/// use aya::{programs::{Iter, ProgramError}, BtfError, Btf, Ebpf};
/// # let mut ebpf = Ebpf::load_file("ebpf_programs.o")?;
///
/// let btf = Btf::from_sys_fs()?;
/// let program: &mut Iter = ebpf.program_mut("iter_prog").unwrap().try_into()?;
/// program.load("task", &btf)?;
///
/// let link_id = program.attach()?;
/// let link = program.take_link(link_id)?;
/// let file = link.into_file()?;
/// let reader = BufReader::new(file);
///
/// let mut lines = reader.lines();
/// for line in lines {
/// let line = line?;
/// println!("{line}");
/// }
/// # Ok::<(), Box<dyn std::error::Error>>(())
/// ```
#[derive(Debug)]
pub struct Iter {
pub(crate) data: ProgramData<IterLink>,
}

impl Iter {
/// Loads the program inside the kernel.
pub fn load(&mut self, iter_type: &str, btf: &Btf) -> Result<(), ProgramError> {
self.data.expected_attach_type = Some(BPF_TRACE_ITER);
let type_name = format!("bpf_iter_{iter_type}");
self.data.attach_btf_id =
Some(btf.id_by_type_name_kind(type_name.as_str(), BtfKind::Func)?);
load_program(bpf_prog_type::BPF_PROG_TYPE_TRACING, &mut self.data)
}

/// Attaches the program.
///
/// The returned value can be used to detach, see [`Iter::detach`].
pub fn attach(&mut self) -> Result<IterLinkId, ProgramError> {
let prog_fd = self.fd()?;
let prog_fd = prog_fd.as_fd();
let link_fd = bpf_link_create(prog_fd, LinkTarget::Iter, BPF_TRACE_ITER, None, 0, None)
.map_err(|(_, io_error)| SyscallError {
call: "bpf_link_create",
io_error,
})?;

self.data
.links
.insert(IterLink::new(PerfLinkInner::FdLink(FdLink::new(link_fd))))
}

/// Detaches the program.
///
/// See [`Iter::attach`].
pub fn detach(&mut self, link_id: IterLinkId) -> Result<(), ProgramError> {
self.data.links.remove(link_id)
}

/// Takes ownership of the link referenced by the provided link_id.
///
/// The caller takes the responsibility of managing the lifetime of the
/// link. When the returned `IterLink` is dropped, the link is detached.
pub fn take_link(&mut self, link_id: IterLinkId) -> Result<IterLink, ProgramError> {
self.data.take_link(link_id)
}
}

/// An iterator descriptor.
#[derive(Debug)]
pub struct IterFd {
fd: crate::MockableFd,
}

impl AsFd for IterFd {
fn as_fd(&self) -> BorrowedFd<'_> {
let Self { fd } = self;
fd.as_fd()
}
}

impl TryFrom<IterLink> for FdLink {
type Error = LinkError;

fn try_from(value: IterLink) -> Result<Self, Self::Error> {
if let PerfLinkInner::FdLink(fd) = value.into_inner() {
Ok(fd)
} else {
Err(LinkError::InvalidLink)
}
}
}

impl TryFrom<FdLink> for IterLink {
type Error = LinkError;

fn try_from(fd_link: FdLink) -> Result<Self, Self::Error> {
let info = bpf_link_get_info_by_fd(fd_link.fd.as_fd())?;
if info.type_ == (bpf_link_type::BPF_LINK_TYPE_ITER as u32) {
return Ok(Self::new(PerfLinkInner::FdLink(fd_link)));
}
Err(LinkError::InvalidLink)
}
}

define_link_wrapper!(
/// The link used by [Iter] programs.
IterLink,
/// The type returned by [Iter::attach]. Can be passed to [Iter::detach].
IterLinkId,
PerfLinkInner,
PerfLinkIdInner
);

impl IterLink {
/// Converts [IterLink] into a [std::fs::File]. That file can be used to
/// retrieve the outputs of the iterator program.
pub fn into_file(self) -> Result<std::fs::File, LinkError> {
if let PerfLinkInner::FdLink(fd) = self.into_inner() {
let fd = bpf_create_iter(fd.fd.as_fd()).map_err(|(_, error)| {
LinkError::SyscallError(SyscallError {
call: "bpf_iter_create",
io_error: error,
})
})?;
let file: std::fs::File = fd.into_inner().into();
Ok(file)
} else {
Err(LinkError::InvalidLink)
}
}
}
27 changes: 26 additions & 1 deletion aya/src/programs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pub mod cgroup_sysctl;
pub mod extension;
pub mod fentry;
pub mod fexit;
pub mod iter;
pub mod kprobe;
pub mod links;
pub mod lirc_mode2;
Expand Down Expand Up @@ -94,6 +95,7 @@ pub use crate::programs::{
extension::{Extension, ExtensionError},
fentry::FEntry,
fexit::FExit,
iter::Iter,
kprobe::{KProbe, KProbeError},
links::{CgroupAttachMode, Link, LinkOrder},
lirc_mode2::LircMode2,
Expand Down Expand Up @@ -303,6 +305,8 @@ pub enum Program {
CgroupSock(CgroupSock),
/// A [`CgroupDevice`] program
CgroupDevice(CgroupDevice),
/// An [`Iter`] program
Iter(Iter),
}

impl Program {
Expand All @@ -324,7 +328,18 @@ impl Program {
Self::PerfEvent(_) => ProgramType::PerfEvent,
Self::RawTracePoint(_) => ProgramType::RawTracePoint,
Self::Lsm(_) => ProgramType::Lsm,
Self::BtfTracePoint(_) | Self::FEntry(_) | Self::FExit(_) => ProgramType::Tracing,
// The following program types are a subset of `TRACING` programs:
//
// - `BPF_TRACE_RAW_TP` (`BtfTracePoint`)
// - `BTF_TRACE_FENTRY` (`FEntry`)
// - `BPF_MODIFY_RETURN` (not supported yet in Aya)
// - `BPF_TRACE_FEXIT` (`FExit`)
// - `BPF_TRACE_ITER` (`Iter`)
//
// https://github.com/torvalds/linux/blob/v6.12/kernel/bpf/syscall.c#L3935-L3940
Self::BtfTracePoint(_) | Self::FEntry(_) | Self::FExit(_) | Self::Iter(_) => {
ProgramType::Tracing
}
Self::Extension(_) => ProgramType::Extension,
Self::CgroupSockAddr(_) => ProgramType::CgroupSockAddr,
Self::SkLookup(_) => ProgramType::SkLookup,
Expand Down Expand Up @@ -360,6 +375,7 @@ impl Program {
Self::SkLookup(p) => p.pin(path),
Self::CgroupSock(p) => p.pin(path),
Self::CgroupDevice(p) => p.pin(path),
Self::Iter(p) => p.pin(path),
}
}

Expand Down Expand Up @@ -390,6 +406,7 @@ impl Program {
Self::SkLookup(mut p) => p.unload(),
Self::CgroupSock(mut p) => p.unload(),
Self::CgroupDevice(mut p) => p.unload(),
Self::Iter(mut p) => p.unload(),
}
}

Expand Down Expand Up @@ -422,6 +439,7 @@ impl Program {
Self::SkLookup(p) => p.fd(),
Self::CgroupSock(p) => p.fd(),
Self::CgroupDevice(p) => p.fd(),
Self::Iter(p) => p.fd(),
}
}

Expand Down Expand Up @@ -455,6 +473,7 @@ impl Program {
Self::SkLookup(p) => p.info(),
Self::CgroupSock(p) => p.info(),
Self::CgroupDevice(p) => p.info(),
Self::Iter(p) => p.info(),
}
}
}
Expand Down Expand Up @@ -771,6 +790,7 @@ impl_program_unload!(
SockOps,
CgroupSock,
CgroupDevice,
Iter,
);

macro_rules! impl_fd {
Expand Down Expand Up @@ -811,6 +831,7 @@ impl_fd!(
SockOps,
CgroupSock,
CgroupDevice,
Iter,
);

/// Trait implemented by the [`Program`] types which support the kernel's
Expand Down Expand Up @@ -916,6 +937,7 @@ impl_program_pin!(
SockOps,
CgroupSock,
CgroupDevice,
Iter,
);

macro_rules! impl_from_pin {
Expand Down Expand Up @@ -954,6 +976,7 @@ impl_from_pin!(
SkLookup,
SockOps,
CgroupDevice,
Iter,
);

macro_rules! impl_try_from_program {
Expand Down Expand Up @@ -1009,6 +1032,7 @@ impl_try_from_program!(
SkLookup,
CgroupSock,
CgroupDevice,
Iter,
);

impl_info!(
Expand Down Expand Up @@ -1036,6 +1060,7 @@ impl_info!(
SockOps,
CgroupSock,
CgroupDevice,
Iter,
);

// TODO(https://github.com/aya-rs/aya/issues/645): this API is currently used in tests. Stabilize
Expand Down
Loading

0 comments on commit 9165e7f

Please sign in to comment.