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

maps: make LegacyMap hold MapDef

Browse Source 
Now both BtfMap and LegacyMap hold MapDef
pull/935/head
Alessandro Decina 10 months ago
parent e723c84f50
commit ba5bf6f912
7 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File

17
aya-obj/src/maps.rs
Unescape Escape View File

@ -78,6 +78,21 @@ pub struct MapDef {
pub btf_value_type_id: Option<u32>, pub btf_value_type_id: Option<u32>,
} }
impl From<bpf_map_def> for MapDef {
fn from(def: bpf_map_def) -> Self {
Self {
map_type: def.map_type,
key_size: def.key_size,
value_size: def.value_size,
max_entries: def.max_entries,
map_flags: def.map_flags,
pinning: def.pinning,
btf_key_type_id: None,
btf_value_type_id: None,
}
}
}
/// The pinning type /// The pinning type
/// ///
/// Upon pinning a map, a file representation is created for the map, /// Upon pinning a map, a file representation is created for the map,
@ -266,7 +281,7 @@ impl Map {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct LegacyMap { pub struct LegacyMap {
/// The definition of the map /// The definition of the map
pub def: bpf_map_def, pub def: MapDef,
/// The section index /// The section index
pub section_index: usize, pub section_index: usize,
/// The section kind /// The section kind

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

@ -794,14 +794,14 @@ impl Object {
.name .name
.as_ref() .as_ref()
.ok_or(ParseError::MapSymbolNameNotFound { i: *i })?; .ok_or(ParseError::MapSymbolNameNotFound { i: *i })?;
let def = parse_map_def(name, data)?; let def = parse_legacy_map_def(name, data)?;
maps.insert( maps.insert(
name.to_string(), name.to_string(),
Map::Legacy(LegacyMap { Map::Legacy(LegacyMap {
section_index: section.index.0, section_index: section.index.0,
section_kind: section.kind, section_kind: section.kind,
symbol_index: Some(sym.index), symbol_index: Some(sym.index),
def, def: def.into(),
data: Vec::new(), data: Vec::new(),
}), }),
); );
@ -1192,12 +1192,12 @@ fn parse_data_map_section(section: &Section) -> Result<Map, ParseError> {
section_kind: section.kind, section_kind: section.kind,
// Data maps don't require symbols to be relocated // Data maps don't require symbols to be relocated
symbol_index: None, symbol_index: None,
def, def: def.into(),
data, data,
})) }))
} }
fn parse_map_def(name: &str, data: &[u8]) -> Result<bpf_map_def, ParseError> { fn parse_legacy_map_def(name: &str, data: &[u8]) -> Result<bpf_map_def, ParseError> {
if data.len() < MINIMUM_MAP_SIZE { if data.len() < MINIMUM_MAP_SIZE {
return Err(ParseError::InvalidMapDefinition { return Err(ParseError::InvalidMapDefinition {
name: name.to_owned(), name: name.to_owned(),
@ -1324,7 +1324,8 @@ pub fn parse_map_info(info: bpf_map_info, pinned: PinningType) -> Map {
map_flags: info.map_flags, map_flags: info.map_flags,
pinning: pinned, pinning: pinned,
id: info.id, id: info.id,
}, }
.into(),
section_index: 0, section_index: 0,
symbol_index: None, symbol_index: None,
section_kind: EbpfSectionKind::Undefined, section_kind: EbpfSectionKind::Undefined,
@ -1502,7 +1503,7 @@ mod tests {
#[test] #[test]
fn test_parse_map_def_error() { fn test_parse_map_def_error() {
assert_matches!( assert_matches!(
parse_map_def("foo", &[]), parse_legacy_map_def("foo", &[]),
Err(ParseError::InvalidMapDefinition { .. }) Err(ParseError::InvalidMapDefinition { .. })
); );
} }
@ -1520,7 +1521,7 @@ mod tests {
}; };
assert_eq!( assert_eq!(
parse_map_def("foo", &bytes_of(&def)[..MINIMUM_MAP_SIZE]).unwrap(), parse_legacy_map_def("foo", &bytes_of(&def)[..MINIMUM_MAP_SIZE]).unwrap(),
def def
); );
} }
@ -1537,7 +1538,7 @@ mod tests {
pinning: PinningType::ByName, pinning: PinningType::ByName,
}; };
assert_eq!(parse_map_def("foo", bytes_of(&def)).unwrap(), def); assert_eq!(parse_legacy_map_def("foo", bytes_of(&def)).unwrap(), def);
} }
#[test] #[test]
@ -1554,7 +1555,7 @@ mod tests {
let mut buf = [0u8; 128]; let mut buf = [0u8; 128];
unsafe { ptr::write_unaligned(buf.as_mut_ptr() as *mut _, def) }; unsafe { ptr::write_unaligned(buf.as_mut_ptr() as *mut _, def) };
assert_eq!(parse_map_def("foo", &buf).unwrap(), def); assert_eq!(parse_legacy_map_def("foo", &buf).unwrap(), def);
} }
#[test] #[test]
@ -1573,14 +1574,15 @@ mod tests {
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Data, section_kind: EbpfSectionKind::Data,
symbol_index: None, symbol_index: None,
def: bpf_map_def { def: MapDef {
map_type: _map_type, map_type: _map_type,
key_size: 4, key_size: 4,
value_size, value_size,
max_entries: 1, max_entries: 1,
map_flags: 0, map_flags: 0,
id: 0,
pinning: PinningType::None, pinning: PinningType::None,
btf_key_type_id: None,
btf_value_type_id: None,
}, },
data, data,
})) if data == map_data && value_size == map_data.len() as u32 })) if data == map_data && value_size == map_data.len() as u32
@ -1755,7 +1757,7 @@ mod tests {
fake_sym(&mut obj, 0, 0, "foo", mem::size_of::<bpf_map_def>() as u64); fake_sym(&mut obj, 0, 0, "foo", mem::size_of::<bpf_map_def>() as u64);
fake_sym(&mut obj, 0, 28, "bar", mem::size_of::<bpf_map_def>() as u64); fake_sym(&mut obj, 0, 28, "bar", mem::size_of::<bpf_map_def>() as u64);
fake_sym(&mut obj, 0, 60, "baz", mem::size_of::<bpf_map_def>() as u64); fake_sym(&mut obj, 0, 60, "baz", mem::size_of::<bpf_map_def>() as u64);
let def = &bpf_map_def { let def = bpf_map_def {
map_type: 1, map_type: 1,
key_size: 2, key_size: 2,
value_size: 3, value_size: 3,
@ -1763,7 +1765,7 @@ mod tests {
map_flags: 5, map_flags: 5,
..Default::default() ..Default::default()
}; };
let map_data = bytes_of(def).to_vec(); let map_data = bytes_of(&def).to_vec();
let mut buf = vec![]; let mut buf = vec![];
buf.extend(&map_data); buf.extend(&map_data);
buf.extend(&map_data); buf.extend(&map_data);
@ -1782,9 +1784,10 @@ mod tests {
assert!(obj.maps.contains_key("foo")); assert!(obj.maps.contains_key("foo"));
assert!(obj.maps.contains_key("bar")); assert!(obj.maps.contains_key("bar"));
assert!(obj.maps.contains_key("baz")); assert!(obj.maps.contains_key("baz"));
let def = MapDef::from(def);
for map in obj.maps.values() { for map in obj.maps.values() {
assert_matches!(map, Map::Legacy(m) => { assert_matches!(map, Map::Legacy(m) => {
assert_eq!(&m.def, def); assert_eq!(m.def, def);
}) })
} }
} }
@ -2549,7 +2552,8 @@ mod tests {
map_flags: BPF_F_RDONLY_PROG, map_flags: BPF_F_RDONLY_PROG,
id: 1, id: 1,
pinning: PinningType::None, pinning: PinningType::None,
}, }
.into(),
section_index: 1, section_index: 1,
section_kind: EbpfSectionKind::Rodata, section_kind: EbpfSectionKind::Rodata,
symbol_index: Some(1), symbol_index: Some(1),

6
aya/src/maps/bloom_filter.rs
Unescape Escape View File

@ -104,7 +104,8 @@ mod tests {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: None, symbol_index: None,
@ -148,7 +149,8 @@ mod tests {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: None, symbol_index: None,

3
aya/src/maps/hash_map/mod.rs
Unescape Escape View File

@ -73,7 +73,8 @@ mod test_utils {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
data: Vec::new(), data: Vec::new(),

6
aya/src/maps/lpm_trie.rs
Unescape Escape View File

@ -221,7 +221,8 @@ mod tests {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: None, symbol_index: None,
@ -277,7 +278,8 @@ mod tests {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: None, symbol_index: None,

3
aya/src/maps/mod.rs
Unescape Escape View File

@ -1043,7 +1043,8 @@ mod tests {
value_size: 4, value_size: 4,
max_entries: 1024, max_entries: 1024,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: Some(0), symbol_index: Some(0),

3
aya/src/sys/bpf.rs
Unescape Escape View File

@ -764,7 +764,8 @@ pub(crate) fn is_bpf_global_data_supported() -> bool {
value_size: 32, value_size: 32,
max_entries: 1, max_entries: 1,
..Default::default() ..Default::default()
}, }
.into(),
section_index: 0, section_index: 0,
section_kind: EbpfSectionKind::Maps, section_kind: EbpfSectionKind::Maps,
symbol_index: None, symbol_index: None,

Write Preview
Loading…
Cancel
Save