Bricoles/xv6-riscv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made va and size page aligned in mappages

Browse source
This commit is contained in:
asselism 2022-10-17 16:02:54 -04:00
parent 0802d56a9b
commit 74c1eba516
1 changed files with 11 additions and 4 deletions

15
kernel/vm.c
View file

@ -136,8 +136,9 @@ kvmmap(pagetable_t kpgtbl, uint64 va, uint64 pa, uint64 sz, int perm)
} }
// Create PTEs for virtual addresses starting at va that refer to // Create PTEs for virtual addresses starting at va that refer to
// physical addresses starting at pa. va and size might not // physical addresses starting at pa.
// be page-aligned. Returns 0 on success, -1 if walk() couldn't // va and size MUST be page-aligned.
// Returns 0 on success, -1 if walk() couldn't
// allocate a needed page-table page. // allocate a needed page-table page.
int int
mappages(pagetable_t pagetable, uint64 va, uint64 size, uint64 pa, int perm) mappages(pagetable_t pagetable, uint64 va, uint64 size, uint64 pa, int perm)
@ -145,11 +146,17 @@ mappages(pagetable_t pagetable, uint64 va, uint64 size, uint64 pa, int perm)
uint64 a, last; uint64 a, last;
pte_t *pte; pte_t *pte;
if((va % PGSIZE) != 0)
panic("mappages: va not aligned");
if((size % PGSIZE) != 0)
panic("mappages: size not aligned");
if(size == 0) if(size == 0)
panic("mappages: size"); panic("mappages: size");
a = PGROUNDDOWN(va); a = va;
last = PGROUNDDOWN(va + size - 1); last = va + size - PGSIZE;
for(;;){ for(;;){
if((pte = walk(pagetable, a, 1)) == 0) if((pte = walk(pagetable, a, 1)) == 0)
return -1; return -1;