oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move field offset from vir region from phys_block to phys_region, so

Browse Source 
the same blocks of physical memory can be mapped in in different offsets
within regions.
This commit is contained in:
Ben Gras 2009-06-03 12:18:13 +00:00
parent eb2959a560
commit 37cd6bc06c
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
servers/vm/region.c
View File

@ -65,8 +65,8 @@ struct vmproc *vmp;
printf("\t\tphysical: "); printf("\t\tphysical: ");
for(ph = vr->first; ph; ph = ph->next) { for(ph = vr->first; ph; ph = ph->next) {
printf("0x%lx-0x%lx (refs %d): phys 0x%lx ", printf("0x%lx-0x%lx (refs %d): phys 0x%lx ",
vr->vaddr + ph->ph->offset, vr->vaddr + ph->offset,
vr->vaddr + ph->ph->offset + ph->ph->length, vr->vaddr + ph->offset + ph->ph->length,
ph->ph->refcount, ph->ph->refcount,
ph->ph->phys); ph->ph->phys);
nph++; nph++;
@ -122,8 +122,8 @@ PUBLIC void map_sanitycheck(char *file, int line)
map_printmap(vmp); map_printmap(vmp);
printf("ph in vr 0x%lx: 0x%lx-0x%lx refcount %d " printf("ph in vr 0x%lx: 0x%lx-0x%lx refcount %d "
"but seencount %lu\n", "but seencount %lu\n",
vr, pr->ph->offset, vr, pr->offset,
pr->ph->offset + pr->ph->length, pr->offset + pr->ph->length,
pr->ph->refcount, pr->ph->seencount); pr->ph->refcount, pr->ph->seencount);
} }
{ {
@ -146,7 +146,7 @@ PUBLIC void map_sanitycheck(char *file, int line)
MYASSERT(pr->ph->refcount == n_others); MYASSERT(pr->ph->refcount == n_others);
} }
MYASSERT(pr->ph->refcount == pr->ph->seencount); MYASSERT(pr->ph->refcount == pr->ph->seencount);
MYASSERT(!(pr->ph->offset % VM_PAGE_SIZE)); MYASSERT(!(pr->offset % VM_PAGE_SIZE));
MYASSERT(!(pr->ph->length % VM_PAGE_SIZE));); MYASSERT(!(pr->ph->length % VM_PAGE_SIZE)););
} }
#endif #endif
@ -155,14 +155,15 @@ PUBLIC void map_sanitycheck(char *file, int line)
/*=========================================================================* /*=========================================================================*
* map_ph_writept * * map_ph_writept *
*=========================================================================*/ *=========================================================================*/
PUBLIC int map_ph_writept(struct vmproc *vmp, struct vir_region *vr, PRIVATE int map_ph_writept(struct vmproc *vmp, struct vir_region *vr,
struct phys_block *pb, int *ropages, int *rwpages) struct phys_region *pr, int *ropages, int *rwpages)
{ {
int rw; int rw;
struct phys_block *pb = pr->ph;
vm_assert(!(vr->vaddr % VM_PAGE_SIZE)); vm_assert(!(vr->vaddr % VM_PAGE_SIZE));
vm_assert(!(pb->length % VM_PAGE_SIZE)); vm_assert(!(pb->length % VM_PAGE_SIZE));
vm_assert(!(pb->offset % VM_PAGE_SIZE)); vm_assert(!(pr->offset % VM_PAGE_SIZE));
vm_assert(pb->refcount > 0); vm_assert(pb->refcount > 0);
if((vr->flags & VR_WRITABLE) if((vr->flags & VR_WRITABLE)
@ -182,7 +183,7 @@ PUBLIC int map_ph_writept(struct vmproc *vmp, struct vir_region *vr,
} }
#endif #endif
if(pt_writemap(&vmp->vm_pt, vr->vaddr + pb->offset, if(pt_writemap(&vmp->vm_pt, vr->vaddr + pr->offset,
pb->phys, pb->length, PTF_PRESENT | PTF_USER | rw, pb->phys, pb->length, PTF_PRESENT | PTF_USER | rw,
WMF_OVERWRITE) != OK) { WMF_OVERWRITE) != OK) {
printf("VM: map_writept: pt_writemap failed\n"); printf("VM: map_writept: pt_writemap failed\n");
@ -307,7 +308,7 @@ int mapflags;
} }
vm_assert(newregion->first); vm_assert(newregion->first);
vm_assert(!newregion->first->next); vm_assert(!newregion->first->next);
if(map_ph_writept(vmp, newregion, newregion->first->ph, NULL, NULL) != OK) { if(map_ph_writept(vmp, newregion, newregion->first, NULL, NULL) != OK) {
printf("VM: map_region_writept failed\n"); printf("VM: map_region_writept failed\n");
SLABFREE(newregion); SLABFREE(newregion);
return NULL; return NULL;
@ -408,7 +409,8 @@ void pb_unreferenced(struct vir_region *region, struct phys_region *pr)
SLABSANE(pb->firstregion); SLABSANE(pb->firstregion);
SLABSANE(pb->firstregion->parent); SLABSANE(pb->firstregion->parent);
if(map_ph_writept(pb->firstregion->parent->parent, if(map_ph_writept(pb->firstregion->parent->parent,
pb->firstregion->parent, pb, NULL, NULL) != OK) { pb->firstregion->parent, pb->firstregion,
NULL, NULL) != OK) {
vm_panic("pb_unreferenced: writept", NO_NUM); vm_panic("pb_unreferenced: writept", NO_NUM);
} }
} }
@ -558,12 +560,12 @@ struct phys_region *physhint;
/* New physical block. */ /* New physical block. */
newpb->phys = mem; newpb->phys = mem;
newpb->refcount = 1; newpb->refcount = 1;
newpb->offset = offset;
newpb->length = length; newpb->length = length;
newpb->firstregion = newphysr; newpb->firstregion = newphysr;
SLABSANE(newpb->firstregion); SLABSANE(newpb->firstregion);
/* New physical region. */ /* New physical region. */
newphysr->offset = offset;
newphysr->ph = newpb; newphysr->ph = newpb;
newphysr->parent = region; newphysr->parent = region;
newphysr->next_ph_list = NULL; /* No other references to this block. */ newphysr->next_ph_list = NULL; /* No other references to this block. */
@ -572,7 +574,7 @@ struct phys_region *physhint;
vm_assert(!(length % VM_PAGE_SIZE)); vm_assert(!(length % VM_PAGE_SIZE));
vm_assert(!(newpb->length % VM_PAGE_SIZE)); vm_assert(!(newpb->length % VM_PAGE_SIZE));
SANITYCHECK(SCL_DETAIL); SANITYCHECK(SCL_DETAIL);
if(map_ph_writept(vmp, region, newpb, NULL, NULL) != OK) { if(map_ph_writept(vmp, region, newphysr, NULL, NULL) != OK) {
if(what_mem == MAP_NONE) if(what_mem == MAP_NONE)
FREE_MEM(mem_clicks, clicks); FREE_MEM(mem_clicks, clicks);
SLABFREE(newpb); SLABFREE(newpb);
@ -580,17 +582,17 @@ struct phys_region *physhint;
return ENOMEM; return ENOMEM;
} }
if(!region->first || offset < region->first->ph->offset) { if(!region->first || offset < region->first->offset) {
/* Special case: offset is before start. */ /* Special case: offset is before start. */
if(region->first) { if(region->first) {
vm_assert(offset + length <= region->first->ph->offset); vm_assert(offset + length <= region->first->offset);
} }
newphysr->next = region->first; newphysr->next = region->first;
region->first = newphysr; region->first = newphysr;
} else { } else {
struct phys_region *physr; struct phys_region *physr;
for(physr = physhint; physr; physr = physr->next) { for(physr = physhint; physr; physr = physr->next) {
if(!physr->next || physr->next->ph->offset > offset) { if(!physr->next || physr->next->offset > offset) {
newphysr->next = physr->next; newphysr->next = physr->next;
physr->next = newphysr; physr->next = newphysr;
break; break;
@ -648,7 +650,6 @@ struct phys_region *ph;
SLABSANE(ph->ph); SLABSANE(ph->ph);
vm_assert(ph->ph->refcount > 0); vm_assert(ph->ph->refcount > 0);
newpb->length = ph->ph->length; newpb->length = ph->ph->length;
newpb->offset = ph->ph->offset;
newpb->refcount = 1; newpb->refcount = 1;
newpb->phys = newmem; newpb->phys = newmem;
newpb->firstregion = ph; newpb->firstregion = ph;
@ -674,7 +675,7 @@ struct phys_region *ph;
/* Update pagetable with new address. /* Update pagetable with new address.
* This will also make it writable. * This will also make it writable.
*/ */
r = map_ph_writept(vmp, region, ph->ph, NULL, NULL); r = map_ph_writept(vmp, region, ph, NULL, NULL);
if(r != OK) if(r != OK)
vm_panic("map_copy_ph_block: map_ph_writept failed", r); vm_panic("map_copy_ph_block: map_ph_writept failed", r);
@ -707,7 +708,7 @@ int write;
SANITYCHECK(SCL_FUNCTIONS); SANITYCHECK(SCL_FUNCTIONS);
for(ph = region->first; ph; ph = ph->next) for(ph = region->first; ph; ph = ph->next)
if(ph->ph->offset <= offset && offset < ph->ph->offset + ph->ph->length) if(ph->offset <= offset && offset < ph->offset + ph->ph->length)
break; break;
if(ph) { if(ph) {
@ -717,7 +718,7 @@ int write;
vm_assert(ph->ph->refcount > 0); vm_assert(ph->ph->refcount > 0);
if(ph->ph->refcount == 1) if(ph->ph->refcount == 1)
r = map_ph_writept(vmp, region, ph->ph, NULL, NULL); r = map_ph_writept(vmp, region, ph, NULL, NULL);
else { else {
r = map_copy_ph_block(vmp, region, ph); r = map_copy_ph_block(vmp, region, ph);
} }
@ -756,8 +757,8 @@ int write;
#define FREE_RANGE_HERE(er1, er2) { \ #define FREE_RANGE_HERE(er1, er2) { \
struct phys_region *r1 = (er1), *r2 = (er2); \ struct phys_region *r1 = (er1), *r2 = (er2); \
vir_bytes start = offset, end = offset + length; \ vir_bytes start = offset, end = offset + length; \
if(r1) { start = MAX(start, r1->ph->offset + r1->ph->length); } \ if(r1) { start = MAX(start, r1->offset + r1->ph->length); } \
if(r2) { end = MIN(end, r2->ph->offset); } \ if(r2) { end = MIN(end, r2->offset); } \
if(start < end) { \ if(start < end) { \
int r; \ int r; \
SANITYCHECK(SCL_DETAIL); \ SANITYCHECK(SCL_DETAIL); \
@ -797,7 +798,7 @@ int write;
SANITYCHECK(SCL_DETAIL); SANITYCHECK(SCL_DETAIL);
} else { } else {
SANITYCHECK(SCL_DETAIL); SANITYCHECK(SCL_DETAIL);
if((r=map_ph_writept(vmp, region, physr->ph, NULL, NULL)) != OK) { if((r=map_ph_writept(vmp, region, physr, NULL, NULL)) != OK) {
printf("VM: map_ph_writept failed\n"); printf("VM: map_ph_writept failed\n");
return r; return r;
} }
@ -870,6 +871,7 @@ PRIVATE struct vir_region *map_copy_region(struct vir_region *vr)
newph->ph = ph->ph; newph->ph = ph->ph;
newph->next_ph_list = NULL; newph->next_ph_list = NULL;
newph->parent = newvr; newph->parent = newvr;
newph->offset = ph->offset;
if(prevph) prevph->next = newph; if(prevph) prevph->next = newph;
else newvr->first = newph; else newvr->first = newph;
prevph = newph; prevph = newph;
@ -895,7 +897,7 @@ PUBLIC int map_writept(struct vmproc *vmp)
for(vr = vmp->vm_regions; vr; vr = vr->next) for(vr = vmp->vm_regions; vr; vr = vr->next)
for(ph = vr->first; ph; ph = ph->next) { for(ph = vr->first; ph; ph = ph->next) {
map_ph_writept(vmp, vr, ph->ph, &ropages, &rwpages); map_ph_writept(vmp, vr, ph, &ropages, &rwpages);
} }
return OK; return OK;

2
servers/vm/region.h
View File

@ -6,7 +6,6 @@ struct phys_block {
#if SANITYCHECKS #if SANITYCHECKS
u32_t seencount; u32_t seencount;
#endif #endif
vir_bytes offset; /* offset from start of vir region */
vir_bytes length; /* no. of contiguous bytes */ vir_bytes length; /* no. of contiguous bytes */
phys_bytes phys; /* physical memory */ phys_bytes phys; /* physical memory */
u8_t refcount; /* Refcount of these pages */ u8_t refcount; /* Refcount of these pages */
@ -19,6 +18,7 @@ struct phys_region {
struct phys_region *next; /* next contiguous block */ struct phys_region *next; /* next contiguous block */
struct phys_block *ph; struct phys_block *ph;
struct vir_region *parent; /* Region that owns this phys_region. */ struct vir_region *parent; /* Region that owns this phys_region. */
vir_bytes offset; /* offset from start of vir region */
/* list of phys_regions that reference the same phys_block */ /* list of phys_regions that reference the same phys_block */
struct phys_region *next_ph_list; struct phys_region *next_ph_list;