github/sparrow-kata-full
1
0
Fork 0
mirror of https://github.com/AmbiML/sparrow-kata-full.git synced 2025-07-15 15:01:45 +00:00
Code Issues Projects Releases Wiki Activity

MemoryManager: workaround release build problem

Browse Source 
Running test_obj_alloc and similar (e.g. install+start+stop+uninstall)
on a  release build yields kernel complaints about using a null
capability. Traced this down to delete_caps for ObjDesc's with count >
1. Checking the result from the syscall resolves things. Seems like an
optimizer bug.

Change-Id: Ib09095ac4255261b1ef67fec68ef3267d6be4883
GitOrigin-RevId: 7149d33b88d2b383d4ab65903c62c478e1659d1d
This commit is contained in:
Sam Leffler 2022-05-16 17:52:26 +00:00
parent 0286d516ce
commit ea5b34e20b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/system/components/MemoryManager/kata-memory-manager/src/memory_manager/mod.rs
View File

@ -8,7 +8,7 @@ use kata_memory_interface::MemoryError;
use kata_memory_interface::MemoryManagerInterface; use kata_memory_interface::MemoryManagerInterface;
use kata_memory_interface::MemoryManagerStats; use kata_memory_interface::MemoryManagerStats;
use kata_os_common::sel4_sys; use kata_os_common::sel4_sys;
use log::{debug, error, trace}; use log::{debug, error, warn, trace};
use sel4_sys::seL4_CPtr; use sel4_sys::seL4_CPtr;
use sel4_sys::seL4_CNode_Delete; use sel4_sys::seL4_CNode_Delete;
use sel4_sys::seL4_Error; use sel4_sys::seL4_Error;
@ -174,8 +174,10 @@ impl MemoryManager {
fn delete_caps(root: seL4_CPtr, depth: u8, od: &ObjDesc) -> seL4_Result { fn delete_caps(root: seL4_CPtr, depth: u8, od: &ObjDesc) -> seL4_Result {
for offset in 0..od.retype_count() { for offset in 0..od.retype_count() {
// TODO(sleffler) warn about errors? let path = (root, od.cptr + offset, depth);
unsafe { seL4_CNode_Delete(root, od.cptr + offset, depth) }?; if let Err(e) = unsafe { seL4_CNode_Delete(path.0, path.1, path.2) } {
warn!("DELETE {:?} failed: od {:?} error {:?}", &path, od, e);
}
} }
Ok(()) Ok(())
} }