general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[vm] Minor fix in debug asserts in shm

Browse Source
This commit is contained in:
Shaowei Song 2023-06-26 19:28:39 +08:00 committed by volcano
parent 52d6a92929
commit e2f7e6109a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libos/src/vm/shm_manager.rs
View File

@ -187,9 +187,10 @@ impl ShmManager {
} }
pub fn replace_shared_chunk(&mut self, old_shared_chunk: ChunkRef, new_chunk: ChunkRef) { pub fn replace_shared_chunk(&mut self, old_shared_chunk: ChunkRef, new_chunk: ChunkRef) {
debug_assert!(old_shared_chunk.is_shared() && new_chunk.is_shared()); debug_assert!(old_shared_chunk.is_shared());
let inode_id = { let inode_id = {
let mut new_vma = Self::vma_of(&new_chunk); let mut new_vma = Self::vma_of(&new_chunk);
new_vma.mark_shared();
let old_vma = Self::vma_of(&old_shared_chunk); let old_vma = Self::vma_of(&old_shared_chunk);
// Inherits access and perms from the old one // Inherits access and perms from the old one
new_vma.inherits_access_from(&old_vma); new_vma.inherits_access_from(&old_vma);

2
src/libos/src/vm/vm_manager.rs
View File

@ -714,10 +714,10 @@ impl InternalVMManager {
MmapSharedResult::NeedExpand(old_shared_chunk, expand_range) => { MmapSharedResult::NeedExpand(old_shared_chunk, expand_range) => {
let new_chunk = { let new_chunk = {
let new_chunk = self.new_chunk_with_options(options)?; let new_chunk = self.new_chunk_with_options(options)?;
debug_assert_eq!(*new_chunk.range(), expand_range);
self.merge_two_single_vma_chunks(&old_shared_chunk, &new_chunk) self.merge_two_single_vma_chunks(&old_shared_chunk, &new_chunk)
}; };
let new_range = *new_chunk.range(); let new_range = *new_chunk.range();
debug_assert_eq!(new_range, expand_range);
self.shm_manager self.shm_manager
.replace_shared_chunk(old_shared_chunk, new_chunk); .replace_shared_chunk(old_shared_chunk, new_chunk);
Ok(new_range.start()) Ok(new_range.start())