greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify freevm using deallocuvm

Browse source
This commit is contained in:
Austin Clements 2010-09-02 15:18:19 -04:00
parent c7c21467c3
commit b3cfd7fc37
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
vm.c
View file

@ -206,8 +206,7 @@ allocuvm(pde_t *pgdir, char *addr, uint sz)
return 1; return 1;
} }
// deallocate some of the user pages, in response to sbrk() // deallocate some of the user pages. if addr is not page-aligned,
// with a negative argument. if addr is not page-aligned,
// then only deallocates starting at the next page boundary. // then only deallocates starting at the next page boundary.
int int
deallocuvm(pde_t *pgdir, char *addr, uint sz) deallocuvm(pde_t *pgdir, char *addr, uint sz)
@ -235,26 +234,14 @@ deallocuvm(pde_t *pgdir, char *addr, uint sz)
void void
freevm(pde_t *pgdir) freevm(pde_t *pgdir)
{ {
uint i, j, da; uint i;
if(!pgdir) if(!pgdir)
panic("freevm: no pgdir\n"); panic("freevm: no pgdir");
deallocuvm(pgdir, 0, USERTOP);
for(i = 0; i < NPDENTRIES; i++){ for(i = 0; i < NPDENTRIES; i++){
da = PTE_ADDR(pgdir[i]); if(pgdir[i] & PTE_P)
if(da != 0){ kfree((void *) PTE_ADDR(pgdir[i]));
pte_t *pgtab = (pte_t*) da;
for(j = 0; j < NPTENTRIES; j++){
if(pgtab[j] != 0){
uint pa = PTE_ADDR(pgtab[j]);
uint va = PGADDR(i, j, 0);
if(va < USERTOP) // user memory
kfree((void *) pa);
pgtab[j] = 0;
}
}
kfree((void *) da);
pgdir[i] = 0;
}
} }
kfree((void *) pgdir); kfree((void *) pgdir);
} }