aya: Make features a lazy_static

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
pull/329/head
Dave Tucker 2 years ago
parent 2f40e623e0
commit 730cbabe31

@ -116,6 +116,10 @@ impl Default for PinningType {
}
}
lazy_static! {
pub(crate) static ref FEATURES: Features = Features::new();
}
// Features implements BPF and BTF feature detection
#[derive(Default, Debug)]
pub(crate) struct Features {
@ -131,41 +135,43 @@ pub(crate) struct Features {
}
impl Features {
fn probe_features(&mut self) {
self.bpf_name = is_prog_name_supported();
debug!("[FEAT PROBE] BPF program name support: {}", self.bpf_name);
self.bpf_cookie = is_bpf_cookie_supported();
debug!("[FEAT PROBE] BPF cookie support: {}", self.bpf_cookie);
self.btf = is_btf_supported();
debug!("[FEAT PROBE] BTF support: {}", self.btf);
fn new() -> Self {
let mut f = Features {
bpf_name: is_prog_name_supported(),
bpf_cookie: is_bpf_cookie_supported(),
btf: is_btf_supported(),
..Default::default()
};
debug!("[FEAT PROBE] BPF program name support: {}", f.bpf_name);
debug!("[FEAT PROBE] BPF cookie support: {}", f.bpf_cookie);
debug!("[FEAT PROBE] BTF support: {}", f.btf);
if self.btf {
self.btf_func = is_btf_func_supported();
debug!("[FEAT PROBE] BTF func support: {}", self.btf_func);
if f.btf {
f.btf_func = is_btf_func_supported();
debug!("[FEAT PROBE] BTF func support: {}", f.btf_func);
self.btf_func_global = is_btf_func_global_supported();
f.btf_func_global = is_btf_func_global_supported();
debug!(
"[FEAT PROBE] BTF global func support: {}",
self.btf_func_global
f.btf_func_global
);
self.btf_datasec = is_btf_datasec_supported();
f.btf_datasec = is_btf_datasec_supported();
debug!(
"[FEAT PROBE] BTF var and datasec support: {}",
self.btf_datasec
f.btf_datasec
);
self.btf_float = is_btf_float_supported();
debug!("[FEAT PROBE] BTF float support: {}", self.btf_float);
f.btf_float = is_btf_float_supported();
debug!("[FEAT PROBE] BTF float support: {}", f.btf_float);
self.btf_decl_tag = is_btf_decl_tag_supported();
debug!("[FEAT PROBE] BTF decl_tag support: {}", self.btf_decl_tag);
f.btf_decl_tag = is_btf_decl_tag_supported();
debug!("[FEAT PROBE] BTF decl_tag support: {}", f.btf_decl_tag);
self.btf_type_tag = is_btf_type_tag_supported();
debug!("[FEAT PROBE] BTF type_tag support: {}", self.btf_type_tag);
f.btf_type_tag = is_btf_type_tag_supported();
debug!("[FEAT PROBE] BTF type_tag support: {}", f.btf_type_tag);
}
f
}
}
@ -196,7 +202,6 @@ pub struct BpfLoader<'a> {
map_pin_path: Option<PathBuf>,
globals: HashMap<&'a str, &'a [u8]>,
max_entries: HashMap<&'a str, u32>,
features: Features,
extensions: HashSet<&'a str>,
verifier_log_level: VerifierLogLevel,
}
@ -226,14 +231,11 @@ impl Default for VerifierLogLevel {
impl<'a> BpfLoader<'a> {
/// Creates a new loader instance.
pub fn new() -> BpfLoader<'a> {
let mut features = Features::default();
features.probe_features();
BpfLoader {
btf: Btf::from_sys_fs().ok().map(Cow::Owned),
map_pin_path: None,
globals: HashMap::new(),
max_entries: HashMap::new(),
features,
extensions: HashSet::new(),
verifier_log_level: VerifierLogLevel::default(),
}
@ -417,12 +419,12 @@ impl<'a> BpfLoader<'a> {
let mut obj = Object::parse(data)?;
obj.patch_map_data(self.globals.clone())?;
let btf_fd = if self.features.btf {
let btf_fd = if FEATURES.btf {
if let Some(ref mut obj_btf) = obj.btf {
// fixup btf
let section_data = obj.section_sizes.clone();
let symbol_offsets = obj.symbol_offset_by_name.clone();
obj_btf.fixup_and_sanitize(&section_data, &symbol_offsets, &self.features)?;
obj_btf.fixup_and_sanitize(&section_data, &symbol_offsets, &FEATURES)?;
// load btf to the kernel
let raw_btf = obj_btf.to_bytes();
Some(load_btf(raw_btf)?)
@ -508,7 +510,7 @@ impl<'a> BpfLoader<'a> {
.programs
.drain()
.map(|(name, obj)| {
let prog_name = if self.features.bpf_name {
let prog_name = if FEATURES.bpf_name {
Some(name.clone())
} else {
None

Loading…
Cancel
Save