|
|
|
|
@ -16,7 +16,7 @@ use log::debug;
|
|
|
|
|
use object::{Endianness, SectionIndex};
|
|
|
|
|
|
|
|
|
|
use crate::{
|
|
|
|
|
Object,
|
|
|
|
|
EbpfSectionKind, Map, Object,
|
|
|
|
|
btf::{
|
|
|
|
|
Array, BtfEnum, BtfEnum64, BtfKind, BtfMember, BtfType, Const, DataSec, DataSecEntry, Enum,
|
|
|
|
|
Enum64, Enum64Fallback, Enum64VariantFallback, FuncInfo, FuncLinkage, Int, IntEncoding,
|
|
|
|
|
@ -24,7 +24,8 @@ use crate::{
|
|
|
|
|
info::{FuncSecInfo, LineSecInfo},
|
|
|
|
|
relocation::Relocation,
|
|
|
|
|
},
|
|
|
|
|
generated::{btf_ext_header, btf_header},
|
|
|
|
|
generated::{BPF_F_RDONLY_PROG, bpf_map_type, btf_ext_header, btf_header},
|
|
|
|
|
maps::{LegacyMap, bpf_map_def},
|
|
|
|
|
util::{HashMap, bytes_of},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -161,6 +162,20 @@ pub enum BtfError {
|
|
|
|
|
#[error("Unable to get symbol name")]
|
|
|
|
|
InvalidSymbolName,
|
|
|
|
|
|
|
|
|
|
/// external symbol is invalid
|
|
|
|
|
#[error("Invalid extern symbol `{symbol_name}`")]
|
|
|
|
|
InvalidExternalSymbol {
|
|
|
|
|
/// name of the symbol
|
|
|
|
|
symbol_name: String,
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/// external symbol not found
|
|
|
|
|
#[error("Extern symbol not found `{symbol_name}`")]
|
|
|
|
|
ExternalSymbolNotFound {
|
|
|
|
|
/// name of the symbol
|
|
|
|
|
symbol_name: String,
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/// BTF map wrapper's layout is unexpected
|
|
|
|
|
#[error("BTF map wrapper's layout is unexpected: {0:?}")]
|
|
|
|
|
UnexpectedBtfMapWrapperLayout(Struct),
|
|
|
|
|
@ -478,6 +493,57 @@ impl Btf {
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(crate) fn type_align(&self, root_type_id: u32) -> Result<usize, BtfError> {
|
|
|
|
|
let mut type_id = root_type_id;
|
|
|
|
|
for _ in 0..MAX_RESOLVE_DEPTH {
|
|
|
|
|
let ty = self.types.type_by_id(type_id)?;
|
|
|
|
|
let size = match ty {
|
|
|
|
|
BtfType::Array(Array { array, .. }) => {
|
|
|
|
|
type_id = array.element_type;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
BtfType::Struct(Struct { size, members, .. })
|
|
|
|
|
| BtfType::Union(Union { size, members, .. }) => {
|
|
|
|
|
let mut max_align = 1;
|
|
|
|
|
|
|
|
|
|
for m in members {
|
|
|
|
|
let align = self.type_align(m.btf_type)?;
|
|
|
|
|
max_align = usize::max(align, max_align);
|
|
|
|
|
|
|
|
|
|
if ty.member_bit_field_size(m).unwrap() == 0
|
|
|
|
|
&& m.offset % (8 * align as u32) != 0
|
|
|
|
|
{
|
|
|
|
|
return Ok(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if size % max_align as u32 != 0 {
|
|
|
|
|
return Ok(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return Ok(max_align);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
other => {
|
|
|
|
|
if let Some(size) = other.size() {
|
|
|
|
|
u32::min(BtfType::ptr_size(), size)
|
|
|
|
|
} else if let Some(next) = other.btf_type() {
|
|
|
|
|
type_id = next;
|
|
|
|
|
continue;
|
|
|
|
|
} else {
|
|
|
|
|
return Err(BtfError::UnexpectedBtfType { type_id });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return Ok(size as usize);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Err(BtfError::MaximumTypeDepthReached {
|
|
|
|
|
type_id: root_type_id,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Encodes the metadata as BTF format
|
|
|
|
|
pub fn to_bytes(&self) -> Vec<u8> {
|
|
|
|
|
// Safety: btf_header is POD
|
|
|
|
|
@ -653,7 +719,19 @@ impl Btf {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
e.offset = *offset as u32;
|
|
|
|
|
debug!("{kind} {name}: VAR {var_name}: fixup offset {offset}");
|
|
|
|
|
|
|
|
|
|
// For kconfig support
|
|
|
|
|
if var.linkage == VarLinkage::Extern {
|
|
|
|
|
let mut var = var.clone();
|
|
|
|
|
var.linkage = VarLinkage::Global;
|
|
|
|
|
|
|
|
|
|
types.types[e.btf_type as usize] = BtfType::Var(var);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
debug!(
|
|
|
|
|
"{} {}: VAR {}: fixup offset {}",
|
|
|
|
|
kind, name, var_name, offset
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
return Err(BtfError::InvalidDatasec);
|
|
|
|
|
}
|
|
|
|
|
@ -821,6 +899,139 @@ impl Default for Btf {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Object {
|
|
|
|
|
fn patch_extern_data_internal(
|
|
|
|
|
&mut self,
|
|
|
|
|
externs: &HashMap<String, Vec<u8>>,
|
|
|
|
|
) -> Result<Option<(SectionIndex, Vec<u8>)>, BtfError> {
|
|
|
|
|
if let Some(obj_btf) = &mut self.btf {
|
|
|
|
|
if obj_btf.is_empty() {
|
|
|
|
|
return Ok(None);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Build a single-pass index of all VARs contained in DATASEC types:
|
|
|
|
|
// var_name -> (datasec_name, var)
|
|
|
|
|
let mut datasec_var_index: HashMap<String, (String, Var)> = HashMap::new();
|
|
|
|
|
for t in &obj_btf.types.types {
|
|
|
|
|
let BtfType::DataSec(d) = t else {
|
|
|
|
|
continue;
|
|
|
|
|
};
|
|
|
|
|
let sec_name = obj_btf.string_at(d.name_offset)?.into_owned();
|
|
|
|
|
for entry in &d.entries {
|
|
|
|
|
let BtfType::Var(var) = obj_btf.types.type_by_id(entry.btf_type)? else {
|
|
|
|
|
continue;
|
|
|
|
|
};
|
|
|
|
|
let var_name = obj_btf.string_at(var.name_offset)?.into_owned();
|
|
|
|
|
datasec_var_index.insert(var_name, (sec_name.clone(), var.clone()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let kconfig_map_index = self.maps.len();
|
|
|
|
|
|
|
|
|
|
let symbols = self
|
|
|
|
|
.symbol_table
|
|
|
|
|
.iter_mut()
|
|
|
|
|
.filter(|(_, s)| s.name.is_some() && s.section_index.is_none() && s.is_external)
|
|
|
|
|
.map(|(_, s)| (s.name.as_ref().unwrap().clone(), s));
|
|
|
|
|
|
|
|
|
|
let mut section_data = Vec::<u8>::new();
|
|
|
|
|
let mut offset = 0u64;
|
|
|
|
|
let mut has_extern_data = false;
|
|
|
|
|
|
|
|
|
|
for (name, symbol) in symbols {
|
|
|
|
|
let (datasec_name, var) = match datasec_var_index.get(&name) {
|
|
|
|
|
Some((sec_name, var)) => {
|
|
|
|
|
if var.linkage == VarLinkage::Extern {
|
|
|
|
|
(sec_name.as_str(), var)
|
|
|
|
|
} else {
|
|
|
|
|
return Err(BtfError::InvalidExternalSymbol { symbol_name: name });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
None => {
|
|
|
|
|
return Err(BtfError::ExternalSymbolNotFound { symbol_name: name });
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if datasec_name == ".kconfig" {
|
|
|
|
|
has_extern_data = true;
|
|
|
|
|
|
|
|
|
|
let type_size = obj_btf.type_size(var.btf_type)?;
|
|
|
|
|
let type_align = obj_btf.type_align(var.btf_type)? as u64;
|
|
|
|
|
|
|
|
|
|
let mut external_value_opt = externs.get(&name);
|
|
|
|
|
let empty_data = vec![0; type_size];
|
|
|
|
|
|
|
|
|
|
if external_value_opt.is_none() && symbol.is_weak {
|
|
|
|
|
external_value_opt = Some(&empty_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(data) = external_value_opt {
|
|
|
|
|
symbol.address = (offset + (type_align - 1)) & !(type_align - 1);
|
|
|
|
|
symbol.size = type_size as u64;
|
|
|
|
|
symbol.section_index = Some(kconfig_map_index);
|
|
|
|
|
|
|
|
|
|
section_data
|
|
|
|
|
.resize(section_data.len() + (symbol.address - offset) as usize, 0);
|
|
|
|
|
|
|
|
|
|
self.symbol_offset_by_name.insert(name, symbol.address);
|
|
|
|
|
section_data.extend(data);
|
|
|
|
|
offset = section_data.len() as u64;
|
|
|
|
|
} else {
|
|
|
|
|
return Err(BtfError::ExternalSymbolNotFound { symbol_name: name });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if has_extern_data {
|
|
|
|
|
self.section_infos.insert(
|
|
|
|
|
".kconfig".into(),
|
|
|
|
|
(SectionIndex(kconfig_map_index), section_data.len() as u64),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
return Ok(Some((SectionIndex(kconfig_map_index), section_data)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Ok(None)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Patches the BPF object with external data symbol values.
|
|
|
|
|
///
|
|
|
|
|
/// External data symbols (e.g., kernel config values marked with `__kconfig`)
|
|
|
|
|
/// are resolved and embedded into the object as a `.kconfig` map section.
|
|
|
|
|
///
|
|
|
|
|
/// # Arguments
|
|
|
|
|
/// * `externs` - A map of external symbol names to their byte values.
|
|
|
|
|
///
|
|
|
|
|
/// # Errors
|
|
|
|
|
/// Returns an error if:
|
|
|
|
|
/// - External symbols are found but not defined in `externs` (unless weak).
|
|
|
|
|
/// - BTF type information is invalid for external symbols.
|
|
|
|
|
pub fn patch_extern_data(
|
|
|
|
|
&mut self,
|
|
|
|
|
externs: &HashMap<String, Vec<u8>>,
|
|
|
|
|
) -> Result<(), BtfError> {
|
|
|
|
|
if let Some((section_index, data)) = self.patch_extern_data_internal(externs)? {
|
|
|
|
|
self.maps.insert(
|
|
|
|
|
".kconfig".into(),
|
|
|
|
|
Map::Legacy(LegacyMap {
|
|
|
|
|
def: bpf_map_def {
|
|
|
|
|
map_type: bpf_map_type::BPF_MAP_TYPE_ARRAY as u32,
|
|
|
|
|
key_size: mem::size_of::<u32>() as u32,
|
|
|
|
|
value_size: data.len() as u32,
|
|
|
|
|
max_entries: 1,
|
|
|
|
|
map_flags: BPF_F_RDONLY_PROG,
|
|
|
|
|
..Default::default()
|
|
|
|
|
},
|
|
|
|
|
section_index: section_index.0,
|
|
|
|
|
section_kind: EbpfSectionKind::Rodata,
|
|
|
|
|
symbol_index: None,
|
|
|
|
|
data,
|
|
|
|
|
}),
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Fixes up and sanitizes BTF data.
|
|
|
|
|
///
|
|
|
|
|
/// Mostly, it removes unsupported types and works around LLVM behaviours.
|
|
|
|
|
@ -1191,8 +1402,8 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
use crate::btf::{
|
|
|
|
|
BtfEnum64, BtfParam, DataSec, DataSecEntry, DeclTag, Enum64, Float, Func, FuncProto, Ptr,
|
|
|
|
|
TypeTag, Var,
|
|
|
|
|
BtfEnum64, BtfMember, BtfParam, DataSec, DataSecEntry, DeclTag, Enum64, Float, Func,
|
|
|
|
|
FuncProto, Int, IntEncoding, Ptr, Struct, TypeTag, Var,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
@ -2017,4 +2228,60 @@ mod tests {
|
|
|
|
|
let raw = btf.to_bytes();
|
|
|
|
|
Btf::parse(&raw, Endianness::default()).unwrap();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn type_align_struct_naturally_aligned() {
|
|
|
|
|
// Build a struct:
|
|
|
|
|
// struct S { u64 a; u32 b; };
|
|
|
|
|
// a @ 0 bits (8-byte aligned), b @ 64 bits (8 bytes), total size 16 bytes.
|
|
|
|
|
// On 32-bit architectures, u64 alignment is capped at ptr_size() (4 bytes).
|
|
|
|
|
let mut btf = Btf::new();
|
|
|
|
|
let u32_ty = btf.add_type(BtfType::Int(Int::new(0, 4, IntEncoding::None, 0)));
|
|
|
|
|
let u64_ty = btf.add_type(BtfType::Int(Int::new(0, 8, IntEncoding::None, 0)));
|
|
|
|
|
|
|
|
|
|
let members = vec![
|
|
|
|
|
BtfMember {
|
|
|
|
|
name_offset: 0,
|
|
|
|
|
btf_type: u64_ty,
|
|
|
|
|
offset: 0, // bits
|
|
|
|
|
},
|
|
|
|
|
BtfMember {
|
|
|
|
|
name_offset: 0,
|
|
|
|
|
btf_type: u32_ty,
|
|
|
|
|
offset: 64, // bits
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
let s_id = btf.add_type(BtfType::Struct(Struct::new(0, members, 16)));
|
|
|
|
|
|
|
|
|
|
let align = btf.type_align(s_id).unwrap();
|
|
|
|
|
// Alignment is capped at ptr_size(), so on 32-bit archs it's 4, on 64-bit it's 8
|
|
|
|
|
let expected_align = usize::min(BtfType::ptr_size() as usize, 8);
|
|
|
|
|
assert_eq!(align, expected_align);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn type_align_struct_misaligned_member_is_packed() {
|
|
|
|
|
// Build a struct with a misaligned non-bitfield member:
|
|
|
|
|
// struct P { u64 a; u32 b; }; where b is at 1-byte offset (misaligned)
|
|
|
|
|
let mut btf = Btf::new();
|
|
|
|
|
let u32_ty = btf.add_type(BtfType::Int(Int::new(0, 4, IntEncoding::None, 0)));
|
|
|
|
|
let u64_ty = btf.add_type(BtfType::Int(Int::new(0, 8, IntEncoding::None, 0)));
|
|
|
|
|
|
|
|
|
|
let members = vec![
|
|
|
|
|
BtfMember {
|
|
|
|
|
name_offset: 0,
|
|
|
|
|
btf_type: u64_ty,
|
|
|
|
|
offset: 0, // bits
|
|
|
|
|
},
|
|
|
|
|
BtfMember {
|
|
|
|
|
name_offset: 0,
|
|
|
|
|
btf_type: u32_ty,
|
|
|
|
|
offset: 8, // bits (1 byte) -> not aligned to 4 bytes
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
let p_id = btf.add_type(BtfType::Struct(Struct::new(0, members, 16)));
|
|
|
|
|
|
|
|
|
|
let align = btf.type_align(p_id).unwrap();
|
|
|
|
|
assert_eq!(align, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|