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

Use Set (instead of Map) to hold links

Browse Source 
This uses hashbrown instead of std because the latter relies on Borrow
which requires a reference; hashbrown's Equivalent is more flexible.
reviewable/pr1135/r1
Tamir Duberstein 2 months ago
parent 69144a977e
commit 356cf45914
16 changed files with 444 additions and 58 deletions
Show Stats Download Patch File Download Diff File

1
aya/Cargo.toml
Unescape Escape View File

@ -18,6 +18,7 @@ async-io = { workspace = true, optional = true }
aya-obj = { path = "../aya-obj", version = "^0.2.1", features = ["std"] } aya-obj = { path = "../aya-obj", version = "^0.2.1", features = ["std"] }
bitflags = { workspace = true } bitflags = { workspace = true }
bytes = { workspace = true } bytes = { workspace = true }
hashbrown = { workspace = true }
libc = { workspace = true } libc = { workspace = true }
log = { workspace = true } log = { workspace = true }
object = { workspace = true, features = ["elf", "read_core", "std", "write"] } object = { workspace = true, features = ["elf", "read_core", "std", "write"] }

6
aya/src/programs/cgroup_device.rs
Unescape Escape View File

@ -5,8 +5,8 @@ use std::os::fd::AsFd;
use crate::{ use crate::{
generated::{bpf_attach_type::BPF_CGROUP_DEVICE, bpf_prog_type::BPF_PROG_TYPE_CGROUP_DEVICE}, generated::{bpf_attach_type::BPF_CGROUP_DEVICE, bpf_prog_type::BPF_PROG_TYPE_CGROUP_DEVICE},
programs::{ programs::{
bpf_prog_get_fd_by_id, define_link_wrapper, load_program, query, CgroupAttachMode, FdLink, bpf_prog_get_fd_by_id, define_link_wrapper, id_as_key, load_program, query,
Link, ProgAttachLink, ProgramData, ProgramError, ProgramFd, CgroupAttachMode, FdLink, Link, ProgAttachLink, ProgramData, ProgramError, ProgramFd,
}, },
sys::{bpf_link_create, LinkTarget, ProgQueryTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, ProgQueryTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -153,6 +153,8 @@ impl Link for CgroupDeviceLinkInner {
} }
} }
id_as_key!(CgroupDeviceLinkInner, CgroupDeviceLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupDevice] programs. /// The link used by [CgroupDevice] programs.
CgroupDeviceLink, CgroupDeviceLink,

6
aya/src/programs/cgroup_skb.rs
Unescape Escape View File

@ -8,8 +8,8 @@ use crate::{
bpf_prog_type::BPF_PROG_TYPE_CGROUP_SKB, bpf_prog_type::BPF_PROG_TYPE_CGROUP_SKB,
}, },
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -172,6 +172,8 @@ impl Link for CgroupSkbLinkInner {
} }
} }
id_as_key!(CgroupSkbLinkInner, CgroupSkbLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupSkb] programs. /// The link used by [CgroupSkb] programs.
CgroupSkbLink, CgroupSkbLink,

6
aya/src/programs/cgroup_sock.rs
Unescape Escape View File

@ -7,8 +7,8 @@ pub use aya_obj::programs::CgroupSockAttachType;
use crate::{ use crate::{
generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCK, generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCK,
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -147,6 +147,8 @@ impl Link for CgroupSockLinkInner {
} }
} }
id_as_key!(CgroupSockLinkInner, CgroupSockLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupSock] programs. /// The link used by [CgroupSock] programs.
CgroupSockLink, CgroupSockLink,

6
aya/src/programs/cgroup_sock_addr.rs
Unescape Escape View File

@ -7,8 +7,8 @@ pub use aya_obj::programs::CgroupSockAddrAttachType;
use crate::{ use crate::{
generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCK_ADDR, generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -148,6 +148,8 @@ impl Link for CgroupSockAddrLinkInner {
} }
} }
id_as_key!(CgroupSockAddrLinkInner, CgroupSockAddrLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupSockAddr] programs. /// The link used by [CgroupSockAddr] programs.
CgroupSockAddrLink, CgroupSockAddrLink,

6
aya/src/programs/cgroup_sockopt.rs
Unescape Escape View File

@ -7,8 +7,8 @@ pub use aya_obj::programs::CgroupSockoptAttachType;
use crate::{ use crate::{
generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCKOPT, generated::bpf_prog_type::BPF_PROG_TYPE_CGROUP_SOCKOPT,
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -147,6 +147,8 @@ impl Link for CgroupSockoptLinkInner {
} }
} }
id_as_key!(CgroupSockoptLinkInner, CgroupSockoptLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupSockopt] programs. /// The link used by [CgroupSockopt] programs.
CgroupSockoptLink, CgroupSockoptLink,

6
aya/src/programs/cgroup_sysctl.rs
Unescape Escape View File

@ -5,8 +5,8 @@ use std::{hash::Hash, os::fd::AsFd};
use crate::{ use crate::{
generated::{bpf_attach_type::BPF_CGROUP_SYSCTL, bpf_prog_type::BPF_PROG_TYPE_CGROUP_SYSCTL}, generated::{bpf_attach_type::BPF_CGROUP_SYSCTL, bpf_prog_type::BPF_PROG_TYPE_CGROUP_SYSCTL},
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -128,6 +128,8 @@ impl Link for CgroupSysctlLinkInner {
} }
} }
id_as_key!(CgroupSysctlLinkInner, CgroupSysctlLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [CgroupSysctl] programs. /// The link used by [CgroupSysctl] programs.
CgroupSysctlLink, CgroupSysctlLink,

100
aya/src/programs/links.rs
Unescape Escape View File

@ -1,12 +1,12 @@
//! Program links. //! Program links.
use std::{ use std::{
collections::{hash_map::Entry, HashMap},
ffi::CString, ffi::CString,
io, io,
os::fd::{AsFd as _, AsRawFd as _, BorrowedFd, RawFd}, os::fd::{AsFd as _, AsRawFd as _, BorrowedFd, RawFd},
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use hashbrown::hash_set::{Entry, HashSet};
use thiserror::Error; use thiserror::Error;
use crate::{ use crate::{
@ -20,9 +20,9 @@ use crate::{
}; };
/// A Link. /// A Link.
pub trait Link: std::fmt::Debug + 'static { pub trait Link: std::fmt::Debug + Eq + std::hash::Hash + 'static {
/// Unique Id /// Unique Id
type Id: std::fmt::Debug + std::hash::Hash + Eq + PartialEq; type Id: std::fmt::Debug + Eq + std::hash::Hash + hashbrown::Equivalent<Self>;
/// Returns the link id /// Returns the link id
fn id(&self) -> Self::Id; fn id(&self) -> Self::Id;
@ -56,48 +56,50 @@ impl From<CgroupAttachMode> for u32 {
} }
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct LinkMap<T: Link> { pub(crate) struct Links<T: Link> {
links: HashMap<T::Id, T>, links: HashSet<T>,
} }
impl<T: Link> LinkMap<T> { impl<T> Links<T>
where
T: Eq + std::hash::Hash + Link,
T::Id: hashbrown::Equivalent<T> + Eq + std::hash::Hash,
{
pub(crate) fn new() -> Self { pub(crate) fn new() -> Self {
Self { Self {
links: HashMap::new(), links: Default::default(),
} }
} }
pub(crate) fn insert(&mut self, link: T) -> Result<T::Id, ProgramError> { pub(crate) fn insert(&mut self, link: T) -> Result<T::Id, ProgramError> {
let id = link.id(); match self.links.entry(link) {
Entry::Occupied(_entry) => Err(ProgramError::AlreadyAttached),
match self.links.entry(link.id()) { Entry::Vacant(entry) => Ok(entry.insert().get().id()),
Entry::Occupied(_) => return Err(ProgramError::AlreadyAttached), }
Entry::Vacant(e) => e.insert(link),
};
Ok(id)
} }
pub(crate) fn remove(&mut self, link_id: T::Id) -> Result<(), ProgramError> { pub(crate) fn remove(&mut self, link_id: T::Id) -> Result<(), ProgramError> {
self.links self.links
.remove(&link_id) .take(&link_id)
.ok_or(ProgramError::NotAttached)? .ok_or(ProgramError::NotAttached)?
.detach() .detach()
} }
pub(crate) fn forget(&mut self, link_id: T::Id) -> Result<T, ProgramError> {
self.links.take(&link_id).ok_or(ProgramError::NotAttached)
}
}
impl<T: Link> Links<T> {
pub(crate) fn remove_all(&mut self) -> Result<(), ProgramError> { pub(crate) fn remove_all(&mut self) -> Result<(), ProgramError> {
for (_, link) in self.links.drain() { for link in self.links.drain() {
link.detach()?; link.detach()?;
} }
Ok(()) Ok(())
} }
pub(crate) fn forget(&mut self, link_id: T::Id) -> Result<T, ProgramError> {
self.links.remove(&link_id).ok_or(ProgramError::NotAttached)
}
} }
impl<T: Link> Drop for LinkMap<T> { impl<T: Link> Drop for Links<T> {
fn drop(&mut self) { fn drop(&mut self) {
let _ = self.remove_all(); let _ = self.remove_all();
} }
@ -206,6 +208,8 @@ impl Link for FdLink {
} }
} }
id_as_key!(FdLink, FdLinkId);
impl From<PinnedLink> for FdLink { impl From<PinnedLink> for FdLink {
fn from(p: PinnedLink) -> Self { fn from(p: PinnedLink) -> Self {
p.inner p.inner
@ -321,6 +325,40 @@ impl Link for ProgAttachLink {
} }
} }
id_as_key!(ProgAttachLink, ProgAttachLinkId);
macro_rules! id_as_key {
($wrapper:ident, $wrapper_id:ident) => {
impl PartialEq for $wrapper {
fn eq(&self, other: &Self) -> bool {
use $crate::programs::links::Link as _;
self.id() == other.id()
}
}
impl Eq for $wrapper {}
impl std::hash::Hash for $wrapper {
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
use $crate::programs::links::Link as _;
self.id().hash(state)
}
}
impl hashbrown::Equivalent<$wrapper> for $wrapper_id {
fn equivalent(&self, key: &$wrapper) -> bool {
use $crate::programs::links::Link as _;
*self == key.id()
}
}
};
}
pub(crate) use id_as_key;
macro_rules! define_link_wrapper { macro_rules! define_link_wrapper {
(#[$doc1:meta] $wrapper:ident, #[$doc2:meta] $wrapper_id:ident, $base:ident, $base_id:ident, $program:ident,) => { (#[$doc1:meta] $wrapper:ident, #[$doc2:meta] $wrapper_id:ident, $base:ident, $base_id:ident, $program:ident,) => {
#[$doc2] #[$doc2]
@ -350,7 +388,7 @@ macro_rules! define_link_wrapper {
impl Drop for $wrapper { impl Drop for $wrapper {
fn drop(&mut self) { fn drop(&mut self) {
use crate::programs::links::Link; use $crate::programs::links::Link as _;
if let Some(base) = self.0.take() { if let Some(base) = self.0.take() {
let _ = base.detach(); let _ = base.detach();
@ -370,6 +408,8 @@ macro_rules! define_link_wrapper {
} }
} }
$crate::programs::links::id_as_key!($wrapper, $wrapper_id);
impl From<$base> for $wrapper { impl From<$base> for $wrapper {
fn from(b: $base) -> $wrapper { fn from(b: $base) -> $wrapper {
$wrapper(Some(b)) $wrapper(Some(b))
@ -540,7 +580,7 @@ mod tests {
use assert_matches::assert_matches; use assert_matches::assert_matches;
use tempfile::tempdir; use tempfile::tempdir;
use super::{FdLink, Link, LinkMap}; use super::{FdLink, Link, Links};
use crate::{ use crate::{
generated::{BPF_F_ALLOW_MULTI, BPF_F_ALLOW_OVERRIDE}, generated::{BPF_F_ALLOW_MULTI, BPF_F_ALLOW_OVERRIDE},
programs::{CgroupAttachMode, ProgramError}, programs::{CgroupAttachMode, ProgramError},
@ -578,9 +618,11 @@ mod tests {
} }
} }
id_as_key!(TestLink, TestLinkId);
#[test] #[test]
fn test_link_map() { fn test_link_map() {
let mut links = LinkMap::new(); let mut links = Links::new();
let l1 = TestLink::new(1, 2); let l1 = TestLink::new(1, 2);
let l1_detached = Rc::clone(&l1.detached); let l1_detached = Rc::clone(&l1.detached);
let l2 = TestLink::new(1, 3); let l2 = TestLink::new(1, 3);
@ -603,7 +645,7 @@ mod tests {
#[test] #[test]
fn test_already_attached() { fn test_already_attached() {
let mut links = LinkMap::new(); let mut links = Links::new();
links.insert(TestLink::new(1, 2)).unwrap(); links.insert(TestLink::new(1, 2)).unwrap();
assert_matches!( assert_matches!(
@ -614,7 +656,7 @@ mod tests {
#[test] #[test]
fn test_not_attached() { fn test_not_attached() {
let mut links = LinkMap::new(); let mut links = Links::new();
let l1 = TestLink::new(1, 2); let l1 = TestLink::new(1, 2);
let l1_id1 = l1.id(); let l1_id1 = l1.id();
@ -632,7 +674,7 @@ mod tests {
let l2_detached = Rc::clone(&l2.detached); let l2_detached = Rc::clone(&l2.detached);
{ {
let mut links = LinkMap::new(); let mut links = Links::new();
let id1 = links.insert(l1).unwrap(); let id1 = links.insert(l1).unwrap();
links.insert(l2).unwrap(); links.insert(l2).unwrap();
// manually remove one link // manually remove one link
@ -653,7 +695,7 @@ mod tests {
let l2_detached = Rc::clone(&l2.detached); let l2_detached = Rc::clone(&l2.detached);
let owned_l1 = { let owned_l1 = {
let mut links = LinkMap::new(); let mut links = Links::new();
let id1 = links.insert(l1).unwrap(); let id1 = links.insert(l1).unwrap();
links.insert(l2).unwrap(); links.insert(l2).unwrap();
// manually forget one link // manually forget one link

6
aya/src/programs/lirc_mode2.rs
Unescape Escape View File

@ -4,8 +4,8 @@ use std::os::fd::{AsFd, AsRawFd as _, RawFd};
use crate::{ use crate::{
generated::{bpf_attach_type::BPF_LIRC_MODE2, bpf_prog_type::BPF_PROG_TYPE_LIRC_MODE2}, generated::{bpf_attach_type::BPF_LIRC_MODE2, bpf_prog_type::BPF_PROG_TYPE_LIRC_MODE2},
programs::{ programs::{
load_program, query, CgroupAttachMode, Link, ProgramData, ProgramError, ProgramFd, id_as_key, load_program, query, CgroupAttachMode, Link, ProgramData, ProgramError,
ProgramInfo, ProgramFd, ProgramInfo,
}, },
sys::{bpf_prog_attach, bpf_prog_detach, bpf_prog_get_fd_by_id, ProgQueryTarget}, sys::{bpf_prog_attach, bpf_prog_detach, bpf_prog_get_fd_by_id, ProgQueryTarget},
}; };
@ -153,3 +153,5 @@ impl Link for LircLink {
.map_err(Into::into) .map_err(Into::into)
} }
} }
id_as_key!(LircLink, LircLinkId);

6
aya/src/programs/mod.rs
Unescape Escape View File

@ -487,7 +487,7 @@ pub(crate) struct ProgramData<T: Link> {
pub(crate) name: Option<String>, pub(crate) name: Option<String>,
pub(crate) obj: Option<(obj::Program, obj::Function)>, pub(crate) obj: Option<(obj::Program, obj::Function)>,
pub(crate) fd: Option<ProgramFd>, pub(crate) fd: Option<ProgramFd>,
pub(crate) links: LinkMap<T>, pub(crate) links: Links<T>,
pub(crate) expected_attach_type: Option<bpf_attach_type>, pub(crate) expected_attach_type: Option<bpf_attach_type>,
pub(crate) attach_btf_obj_fd: Option<crate::MockableFd>, pub(crate) attach_btf_obj_fd: Option<crate::MockableFd>,
pub(crate) attach_btf_id: Option<u32>, pub(crate) attach_btf_id: Option<u32>,
@ -509,7 +509,7 @@ impl<T: Link> ProgramData<T> {
name, name,
obj: Some(obj), obj: Some(obj),
fd: None, fd: None,
links: LinkMap::new(), links: Links::new(),
expected_attach_type: None, expected_attach_type: None,
attach_btf_obj_fd: None, attach_btf_obj_fd: None,
attach_btf_id: None, attach_btf_id: None,
@ -541,7 +541,7 @@ impl<T: Link> ProgramData<T> {
name, name,
obj: None, obj: None,
fd: Some(ProgramFd(fd)), fd: Some(ProgramFd(fd)),
links: LinkMap::new(), links: Links::new(),
expected_attach_type: None, expected_attach_type: None,
attach_btf_obj_fd, attach_btf_obj_fd,
attach_btf_id, attach_btf_id,

5
aya/src/programs/perf_attach.rs
Unescape Escape View File

@ -4,6 +4,7 @@ use std::os::fd::{AsFd as _, AsRawFd as _, BorrowedFd, RawFd};
use crate::{ use crate::{
generated::bpf_attach_type::BPF_PERF_EVENT, generated::bpf_attach_type::BPF_PERF_EVENT,
programs::{ programs::{
id_as_key,
probe::{detach_debug_fs, ProbeEvent}, probe::{detach_debug_fs, ProbeEvent},
FdLink, Link, ProgramError, FdLink, Link, ProgramError,
}, },
@ -44,6 +45,8 @@ impl Link for PerfLinkInner {
} }
} }
id_as_key!(PerfLinkInner, PerfLinkIdInner);
/// The identifer of a PerfLink. /// The identifer of a PerfLink.
#[derive(Debug, Hash, Eq, PartialEq)] #[derive(Debug, Hash, Eq, PartialEq)]
pub struct PerfLinkId(RawFd); pub struct PerfLinkId(RawFd);
@ -73,6 +76,8 @@ impl Link for PerfLink {
} }
} }
id_as_key!(PerfLink, PerfLinkId);
pub(crate) fn perf_attach( pub(crate) fn perf_attach(
prog_fd: BorrowedFd<'_>, prog_fd: BorrowedFd<'_>,
fd: crate::MockableFd, fd: crate::MockableFd,

6
aya/src/programs/sock_ops.rs
Unescape Escape View File

@ -4,8 +4,8 @@ use std::os::fd::AsFd;
use crate::{ use crate::{
generated::{bpf_attach_type::BPF_CGROUP_SOCK_OPS, bpf_prog_type::BPF_PROG_TYPE_SOCK_OPS}, generated::{bpf_attach_type::BPF_CGROUP_SOCK_OPS, bpf_prog_type::BPF_PROG_TYPE_SOCK_OPS},
programs::{ programs::{
define_link_wrapper, load_program, CgroupAttachMode, FdLink, Link, ProgAttachLink, define_link_wrapper, id_as_key, load_program, CgroupAttachMode, FdLink, Link,
ProgramData, ProgramError, ProgAttachLink, ProgramData, ProgramError,
}, },
sys::{bpf_link_create, LinkTarget, SyscallError}, sys::{bpf_link_create, LinkTarget, SyscallError},
util::KernelVersion, util::KernelVersion,
@ -123,6 +123,8 @@ impl Link for SockOpsLinkInner {
} }
} }
id_as_key!(SockOpsLinkInner, SockOpsLinkIdInner);
define_link_wrapper!( define_link_wrapper!(
/// The link used by [SockOps] programs. /// The link used by [SockOps] programs.
SockOpsLink, SockOpsLink,

4
aya/src/programs/socket_filter.rs
Unescape Escape View File

@ -9,7 +9,7 @@ use thiserror::Error;
use crate::{ use crate::{
generated::{bpf_prog_type::BPF_PROG_TYPE_SOCKET_FILTER, SO_ATTACH_BPF, SO_DETACH_BPF}, generated::{bpf_prog_type::BPF_PROG_TYPE_SOCKET_FILTER, SO_ATTACH_BPF, SO_DETACH_BPF},
programs::{load_program, Link, ProgramData, ProgramError}, programs::{id_as_key, load_program, Link, ProgramData, ProgramError},
}; };
/// The type returned when attaching a [`SocketFilter`] fails. /// The type returned when attaching a [`SocketFilter`] fails.
@ -148,3 +148,5 @@ impl Link for SocketFilterLink {
Ok(()) Ok(())
} }
} }
id_as_key!(SocketFilterLink, SocketFilterLinkId);

8
aya/src/programs/tc.rs
Unescape Escape View File

@ -17,8 +17,8 @@ use crate::{
TC_H_CLSACT, TC_H_MIN_EGRESS, TC_H_MIN_INGRESS, TC_H_CLSACT, TC_H_MIN_EGRESS, TC_H_MIN_INGRESS,
}, },
programs::{ programs::{
define_link_wrapper, load_program, query, Link, LinkError, LinkOrder, ProgramData, define_link_wrapper, id_as_key, load_program, query, Link, LinkError, LinkOrder,
ProgramError, ProgramData, ProgramError,
}, },
sys::{ sys::{
bpf_link_create, bpf_link_get_info_by_fd, bpf_link_update, bpf_prog_get_fd_by_id, bpf_link_create, bpf_link_get_info_by_fd, bpf_link_update, bpf_prog_get_fd_by_id,
@ -398,6 +398,8 @@ impl Link for NlLink {
} }
} }
id_as_key!(NlLink, NlLinkId);
#[derive(Debug, Hash, Eq, PartialEq)] #[derive(Debug, Hash, Eq, PartialEq)]
pub(crate) enum TcLinkIdInner { pub(crate) enum TcLinkIdInner {
FdLinkId(<FdLink as Link>::Id), FdLinkId(<FdLink as Link>::Id),
@ -428,6 +430,8 @@ impl Link for TcLinkInner {
} }
} }
id_as_key!(TcLinkInner, TcLinkIdInner);
impl<'a> TryFrom<&'a SchedClassifierLink> for &'a FdLink { impl<'a> TryFrom<&'a SchedClassifierLink> for &'a FdLink {
type Error = LinkError; type Error = LinkError;

14
aya/src/programs/xdp.rs
Unescape Escape View File

@ -18,7 +18,8 @@ use crate::{
}, },
obj::programs::XdpAttachType, obj::programs::XdpAttachType,
programs::{ programs::{
define_link_wrapper, load_program, FdLink, Link, LinkError, ProgramData, ProgramError, define_link_wrapper, id_as_key, load_program, FdLink, Link, LinkError, ProgramData,
ProgramError,
}, },
sys::{ sys::{
bpf_link_create, bpf_link_get_info_by_fd, bpf_link_update, netlink_set_xdp_fd, LinkTarget, bpf_link_create, bpf_link_get_info_by_fd, bpf_link_update, netlink_set_xdp_fd, LinkTarget,
@ -246,11 +247,14 @@ pub(crate) struct NlLink {
flags: XdpFlags, flags: XdpFlags,
} }
#[derive(Debug, Hash, Eq, PartialEq)]
pub(crate) struct NlLinkId(i32, RawFd);
impl Link for NlLink { impl Link for NlLink {
type Id = (i32, RawFd); type Id = NlLinkId;
fn id(&self) -> Self::Id { fn id(&self) -> Self::Id {
(self.if_index, self.prog_fd) NlLinkId(self.if_index, self.prog_fd)
} }
fn detach(self) -> Result<(), ProgramError> { fn detach(self) -> Result<(), ProgramError> {
@ -266,6 +270,8 @@ impl Link for NlLink {
} }
} }
id_as_key!(NlLink, NlLinkId);
#[derive(Debug, Hash, Eq, PartialEq)] #[derive(Debug, Hash, Eq, PartialEq)]
pub(crate) enum XdpLinkIdInner { pub(crate) enum XdpLinkIdInner {
FdLinkId(<FdLink as Link>::Id), FdLinkId(<FdLink as Link>::Id),
@ -296,6 +302,8 @@ impl Link for XdpLinkInner {
} }
} }
id_as_key!(XdpLinkInner, XdpLinkIdInner);
impl TryFrom<XdpLink> for FdLink { impl TryFrom<XdpLink> for FdLink {
type Error = LinkError; type Error = LinkError;

316
xtask/public-api/aya.txt
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save