gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Aligned program heap (#11657) (#11812)

Browse Source 
(cherry picked from commit f8606fca4f)

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-08-24 20:12:58 +00:00
committed by GitHub
parent 0dcbc6d4d1
commit 67bf7515a7
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
programs/bpf_loader/src/syscalls.rs
View File

@@ -350,7 +350,10 @@ impl SyscallObject<BPFError> for SyscallSolAllocFree {
_ro_regions: &[MemoryRegion],
_rw_regions: &[MemoryRegion],
) -> Result<u64, EbpfError<BPFError>> {
let layout = Layout::from_size_align(size as usize, align_of::<u8>()).unwrap();
let layout = match Layout::from_size_align(size as usize, align_of::<u128>()) {
Ok(layout) => layout,
Err(_) => return Ok(0),
};
if free_addr == 0 {
match self.allocator.alloc(layout) {
Ok(addr) => Ok(addr as u64),
@@ -1142,6 +1145,12 @@ mod tests {
.unwrap(),
0
);
assert_eq!(
syscall
.call(u64::MAX, 0, 0, 0, 0, ro_regions, rw_regions)
.unwrap(),
0
);
}
// many small allocs
{
@@ -1151,7 +1160,7 @@ mod tests {
let mut syscall = SyscallSolAllocFree {
allocator: BPFAllocator::new(heap, MM_HEAP_START),
};
for _ in 0..100 {
for _ in 0..12 {
assert_ne!(
syscall.call(1, 0, 0, 0, 0, ro_regions, rw_regions).unwrap(),
0
@@ -1164,5 +1173,25 @@ mod tests {
0
);
}
// aligned allocs
fn check_alignment<T>() {
let heap = vec![0_u8; 100];
let ro_regions = &[MemoryRegion::default()];
let rw_regions = &[MemoryRegion::new_from_slice(&heap, MM_HEAP_START)];
let mut syscall = SyscallSolAllocFree {
allocator: BPFAllocator::new(heap, MM_HEAP_START),
};
let address = syscall
.call(size_of::<u8>() as u64, 0, 0, 0, 0, ro_regions, rw_regions)
.unwrap();
assert_ne!(address, 0);
assert_eq!((address as *const u8).align_offset(align_of::<u8>()), 0);
}
check_alignment::<u8>();
check_alignment::<u16>();
check_alignment::<u32>();
check_alignment::<u64>();
check_alignment::<u128>();
}
}