github/sparrow-kata-full
1
0
Fork 0
mirror of https://github.com/AmbiML/sparrow-kata-full.git synced 2025-08-17 12:46:59 +00:00
Code Issues Projects Releases Wiki Activity

kata-memory-component: add debug asserts for attached capabilities

Browse Source 
Change-Id: I1ef3fa98583a7ac59269d8c3aa15c886a0d8b768
GitOrigin-RevId: 815a4358d6516986e57dc2987f3a9ade46cbffb6
This commit is contained in:
Sam Leffler 2022-06-23 03:11:43 +00:00
parent 393a7653e7
commit 9920153e10
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/system/components/MemoryManager/kata-memory-component/src/run.rs
View File

@ -92,7 +92,9 @@ pub unsafe extern "C" fn memory_alloc(
let raw_slice = slice::from_raw_parts(c_raw_data, c_raw_data_len as usize); let raw_slice = slice::from_raw_parts(c_raw_data, c_raw_data_len as usize);
let ret_status = match postcard::from_bytes::<ObjDescBundle>(raw_slice) { let ret_status = match postcard::from_bytes::<ObjDescBundle>(raw_slice) {
Ok(mut bundle) => { Ok(mut bundle) => {
// TODO(sleffler): verify we received a CNode in MEMORY_RECV_CNODE. // We must have a CNode for returning allocated objects.
Camkes::debug_assert_slot_cnode("memory_alloc", &recv_path);
bundle.cnode = recv_path.1; bundle.cnode = recv_path.1;
// NB: bundle.depth should reflect the received cnode // NB: bundle.depth should reflect the received cnode
KATA_MEMORY.alloc(&bundle).into() KATA_MEMORY.alloc(&bundle).into()
@ -116,7 +118,9 @@ pub unsafe extern "C" fn memory_free(
let raw_slice = slice::from_raw_parts(c_raw_data, c_raw_data_len as usize); let raw_slice = slice::from_raw_parts(c_raw_data, c_raw_data_len as usize);
let ret_status = match postcard::from_bytes::<ObjDescBundle>(raw_slice) { let ret_status = match postcard::from_bytes::<ObjDescBundle>(raw_slice) {
Ok(mut bundle) => { Ok(mut bundle) => {
// TODO(sleffler): verify we received a CNode in MEMORY_RECV_CNODE. // We must have a CNode for returning allocated objects.
Camkes::debug_assert_slot_cnode("memory_free", &recv_path);
bundle.cnode = recv_path.1; bundle.cnode = recv_path.1;
// NB: bundle.depth should reflect the received cnode // NB: bundle.depth should reflect the received cnode
KATA_MEMORY.free(&bundle).into() KATA_MEMORY.free(&bundle).into()
@ -132,13 +136,19 @@ pub unsafe extern "C" fn memory_free(
pub unsafe extern "C" fn memory_stats( pub unsafe extern "C" fn memory_stats(
c_raw_resp_data: *mut RawMemoryStatsData, c_raw_resp_data: *mut RawMemoryStatsData,
) -> MemoryManagerError { ) -> MemoryManagerError {
// TODO(sleffler): verify no cap was received let recv_path = CAMKES.get_current_recv_path();
// NB: make sure noone clobbers the setup done in memory__init
CAMKES.assert_recv_path();
match KATA_MEMORY.stats() { match KATA_MEMORY.stats() {
Ok(stats) => { Ok(stats) => {
match postcard::to_slice(&stats, &mut (*c_raw_resp_data)[..]) { // Verify no cap was received
Ok(_) => MemoryManagerError::MmeSuccess, Camkes::debug_assert_slot_empty("memory_stats", &recv_path);
Err(_) => MemoryManagerError::MmeSerializeFailed,
} match postcard::to_slice(&stats, &mut (*c_raw_resp_data)[..]) {
Ok(_) => MemoryManagerError::MmeSuccess,
Err(_) => MemoryManagerError::MmeSerializeFailed,
}
} }
Err(e) => e.into(), Err(e) => e.into(),
} }