mathieu/matos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmap fix

Browse Source 
Keep region list sorted on heap grow
Fix checking region overlap
Assert that mmap appends at loaded address for init
This commit is contained in:
Mathieu Maret 2024-02-12 18:25:27 +01:00 committed by Mathieu Maret
parent f8b1b2c5a7
commit 758017a8e7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/elf.c
View File

@ -148,7 +148,7 @@ uaddr_t loadElfProg(const char *prog, struct process *proc)
// Hack: Even if already allocated mark the adresse space as managed by a ressource // Hack: Even if already allocated mark the adresse space as managed by a ressource
// So this address space is not used by another ressource. // So this address space is not used by another ressource.
uaddr = elf_phdrs[i].p_vaddr; uaddr = elf_phdrs[i].p_vaddr;
zeroMmap(as, &uaddr, elf_phdrs[i].p_memsz, PAGING_MEM_USER | PAGING_MEM_WRITE | PAGING_MEM_READ, 0); assert(zeroMmap(as, &uaddr, elf_phdrs[i].p_memsz, PAGING_MEM_USER | PAGING_MEM_WRITE | PAGING_MEM_READ, 0) == 0);
} }
processInitHeap(proc, lastUserAddr); processInitHeap(proc, lastUserAddr);

9
core/uaddrspace.c
View File

@ -216,7 +216,8 @@ int uAddrSpaceUnmap(struct uAddrSpace *as, uaddr_t uaddr, size_t size)
reg->res->ops->unmap(reg, uaddr, size); reg->res->ops->unmap(reg, uaddr, size);
break; break;
// Only affect the end // Only affect the end
} else if (uaddr > reg->addr && uaddr + size > reg->addr + reg->size) { } else if (uaddr > reg->addr && uaddr < reg->addr + size &&
uaddr + size > reg->addr + reg->size) {
size_t unmapSize = reg->addr + reg->size - uaddr; size_t unmapSize = reg->addr + reg->size - uaddr;
reg->size = uaddr - reg->addr; reg->size = uaddr - reg->addr;
@ -306,6 +307,12 @@ int uAddrSpaceHeapCheckNAlloc(struct uAddrSpace *as, vaddr_t addr)
newReg->size = PAGE_SIZE; newReg->size = PAGE_SIZE;
newReg->right = right; newReg->right = right;
// keep the AS list sorted
struct uAddrVirtualReg *prev = findVirtualRegionBeforeAddr(as, addrAlign);
if (prev)
list_insert_after_named(as->listVirtualReg, prev, newReg, prevInAddrSpace,
nextInAddrSpace);
else
list_add_tail_named(as->listVirtualReg, newReg, nextInAddrSpace, prevInAddrSpace); list_add_tail_named(as->listVirtualReg, newReg, nextInAddrSpace, prevInAddrSpace);
unrefPhyPage(ppage); unrefPhyPage(ppage);