sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't bother with unmapping physical memory in non-sanitycheck mode.

Browse source
This commit is contained in:
Ben Gras 2009-05-12 11:51:53 +00:00
parent 581e68433a
commit 909c1bb8a7
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
servers/vm/i386/pagetable.c
View file

@ -728,12 +728,24 @@ PUBLIC void pt_cycle(void)
vm_checkspares(); vm_checkspares();
} }
/* In sanity check mode, pages are mapped and unmapped explicitly, so
* unexpected double mappings (overwriting a page table entry) are caught.
* If not sanity checking, simply keep the page mapped in and overwrite
* the mapping entry; we need WMF_OVERWRITE for that in PHYS_MAP though.
*/
#if SANITYCHECKS
#define MAPFLAGS 0
#else
#define MAPFLAGS WMF_OVERWRITE
#endif
#define PHYS_MAP(a, o) \ #define PHYS_MAP(a, o) \
{ int r; \ { int r; \
u32_t wipeme = (u32_t) varmap; \
vm_assert(varmap); \ vm_assert(varmap); \
(o) = (a) % I386_PAGE_SIZE; \ (o) = (a) % I386_PAGE_SIZE; \
r = pt_writemap(&vmp->vm_pt, varmap_loc, (a) - (o), I386_PAGE_SIZE, \ r = pt_writemap(&vmp->vm_pt, (vir_bytes) varmap_loc, (a) - (o), I386_PAGE_SIZE, \
I386_VM_PRESENT | I386_VM_USER | I386_VM_WRITE, 0); \ I386_VM_PRESENT | I386_VM_USER | I386_VM_WRITE, MAPFLAGS); \
if(r != OK) \ if(r != OK) \
vm_panic("PHYS_MAP: pt_writemap failed", NO_NUM); \ vm_panic("PHYS_MAP: pt_writemap failed", NO_NUM); \
/* pt_bind() flushes TLB. */ \ /* pt_bind() flushes TLB. */ \
@ -742,12 +754,15 @@ PUBLIC void pt_cycle(void)
#define PHYSMAGIC 0x7b9a0590 #define PHYSMAGIC 0x7b9a0590
#if SANITYCHECKS
#define PHYS_UNMAP if(OK != pt_writemap(&vmp->vm_pt, varmap_loc, MAP_NONE,\ #define PHYS_UNMAP if(OK != pt_writemap(&vmp->vm_pt, varmap_loc, MAP_NONE,\
I386_PAGE_SIZE, 0, WMF_OVERWRITE)) { \ I386_PAGE_SIZE, 0, WMF_OVERWRITE)) { \
vm_panic("PHYS_UNMAP: pt_writemap failed", NO_NUM); } vm_panic("PHYS_UNMAP: pt_writemap failed", NO_NUM); }
#endif
#define PHYS_VAL(o) (* (phys_bytes *) (varmap + (o))) #define PHYS_VAL(o) (* (phys_bytes *) (varmap + (o)))
/*===========================================================================* /*===========================================================================*
* phys_writeaddr * * phys_writeaddr *
*===========================================================================*/ *===========================================================================*/
@ -761,8 +776,8 @@ PUBLIC void phys_writeaddr(phys_bytes addr, phys_bytes v1, phys_bytes v2)
PHYS_VAL(offset + sizeof(phys_bytes)) = v2; PHYS_VAL(offset + sizeof(phys_bytes)) = v2;
#if SANITYCHECKS #if SANITYCHECKS
PHYS_VAL(offset + 2*sizeof(phys_bytes)) = PHYSMAGIC; PHYS_VAL(offset + 2*sizeof(phys_bytes)) = PHYSMAGIC;
#endif
PHYS_UNMAP; PHYS_UNMAP;
#endif
SANITYCHECK(SCL_DETAIL); SANITYCHECK(SCL_DETAIL);
} }
@ -779,7 +794,7 @@ PUBLIC void phys_readaddr(phys_bytes addr, phys_bytes *v1, phys_bytes *v2)
*v2 = PHYS_VAL(offset + sizeof(phys_bytes)); *v2 = PHYS_VAL(offset + sizeof(phys_bytes));
#if SANITYCHECKS #if SANITYCHECKS
vm_assert(PHYS_VAL(offset + 2*sizeof(phys_bytes)) == PHYSMAGIC); vm_assert(PHYS_VAL(offset + 2*sizeof(phys_bytes)) == PHYSMAGIC);
#endif
PHYS_UNMAP; PHYS_UNMAP;
#endif
SANITYCHECK(SCL_DETAIL); SANITYCHECK(SCL_DETAIL);
} }