vm: remove secondary cache code
This commit removes the secondary cache code implementation from VM and its usage from libminixfs. It is to be replaced by a new implementation. Change-Id: I8fa3af06330e7604c7e0dd4cbe39d3ce353a05b1
This commit is contained in:
Ben Gras
parent
20e6c9329f
commit
adf2032bc0
18 changed files with 26 additions and 775 deletions
|
|
@ -4634,14 +4634,14 @@
|
|||
./usr/tests/minix-posix/test70 minix-sys
|
||||
./usr/tests/minix-posix/test71 minix-sys
|
||||
./usr/tests/minix-posix/test72 minix-sys
|
||||
./usr/tests/minix-posix/test73 minix-sys
|
||||
./usr/tests/minix-posix/test73 minix-sys obsolete
|
||||
./usr/tests/minix-posix/test7 minix-sys
|
||||
./usr/tests/minix-posix/test8 minix-sys
|
||||
./usr/tests/minix-posix/test9 minix-sys
|
||||
./usr/tests/minix-posix/testinterp minix-sys
|
||||
./usr/tests/minix-posix/testsh1 minix-sys
|
||||
./usr/tests/minix-posix/testsh2 minix-sys
|
||||
./usr/tests/minix-posix/testvm minix-sys
|
||||
./usr/tests/minix-posix/testvm minix-sys obsolete
|
||||
./usr/tests/minix-posix/testvm.conf minix-sys
|
||||
./usr/tmp minix-sys
|
||||
./usr/var minix-sys
|
||||
|
|
|
|||
|
|
@ -989,22 +989,8 @@
|
|||
# define VMUM_ADDR m1_p1
|
||||
# define VMUM_LEN m1_i1
|
||||
|
||||
/* To VM: forget all my yielded blocks. */
|
||||
#define VM_FORGETBLOCKS (VM_RQ_BASE+22)
|
||||
|
||||
/* To VM: forget this block. */
|
||||
#define VM_FORGETBLOCK (VM_RQ_BASE+23)
|
||||
#define VMFB_IDHI m1_i1
|
||||
#define VMFB_IDLO m1_i2
|
||||
|
||||
/* To VM: combined yield+get call. */
|
||||
#define VM_YIELDBLOCKGETBLOCK (VM_RQ_BASE+25)
|
||||
#define VMYBGB_VADDR m2_p1
|
||||
#define VMYBGB_GETIDHI m2_i1
|
||||
#define VMYBGB_GETIDLO m2_i2
|
||||
#define VMYBGB_LEN m2_i3
|
||||
#define VMYBGB_YIELDIDHI m2_l1
|
||||
#define VMYBGB_YIELDIDLO m2_l2
|
||||
/* To VM: map in cache block by FS */
|
||||
#define VM_MAPCACHEPAGE (VM_RQ_BASE+26)
|
||||
|
||||
/* Calls from VFS. */
|
||||
# define VMV_ENDPOINT m1_i1 /* for all VM_VFS_REPLY_* */
|
||||
|
|
@ -1094,7 +1080,7 @@
|
|||
/* Basic vm calls allowed to every process. */
|
||||
#define VM_BASIC_CALLS \
|
||||
VM_MMAP, VM_MUNMAP, VM_MAP_PHYS, VM_UNMAP_PHYS, \
|
||||
VM_FORGETBLOCKS, VM_FORGETBLOCK, VM_YIELDBLOCKGETBLOCK, VM_INFO
|
||||
VM_INFO, VM_MAPCACHEPAGE
|
||||
|
||||
/*===========================================================================*
|
||||
* Messages for IPC server *
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ struct buf *lmfs_get_block(
|
|||
|
||||
int b;
|
||||
static struct buf *bp, *prev_ptr;
|
||||
u64_t yieldid = VM_BLOCKID_NONE, getid = make64(dev, block);
|
||||
u64_t yieldid = VM_BLOCKID_NONE /*, getid = make64(dev, block) */;
|
||||
|
||||
assert(buf_hash);
|
||||
assert(buf);
|
||||
|
|
@ -263,10 +263,12 @@ struct buf *lmfs_get_block(
|
|||
/* If we can satisfy the PREFETCH or NORMAL request
|
||||
* from the vm cache, work is done.
|
||||
*/
|
||||
#if 0
|
||||
if(vm_yield_block_get_block(yieldid, getid,
|
||||
bp->data, fs_block_size) == OK) {
|
||||
return bp;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -280,9 +282,11 @@ struct buf *lmfs_get_block(
|
|||
* will be overwritten. VM has to forget
|
||||
* about it.
|
||||
*/
|
||||
#if 0
|
||||
if(vmcache) {
|
||||
vm_forgetblock(getid);
|
||||
}
|
||||
#endif
|
||||
} else
|
||||
panic("unexpected only_search value: %d", only_search);
|
||||
|
||||
|
|
@ -393,7 +397,7 @@ void lmfs_invalidate(
|
|||
for (bp = &buf[0]; bp < &buf[nr_bufs]; bp++)
|
||||
if (bp->lmfs_dev == device) bp->lmfs_dev = NO_DEV;
|
||||
|
||||
vm_forgetblocks();
|
||||
/* vm_forgetblocks(); */
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
|
|
@ -496,7 +500,7 @@ void lmfs_rw_scattered(
|
|||
/* Transfer failed. */
|
||||
if (i == 0) {
|
||||
bp->lmfs_dev = NO_DEV; /* Invalidate block */
|
||||
vm_forgetblocks();
|
||||
/* vm_forgetblocks(); */
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -595,11 +599,13 @@ void lmfs_set_blocksize(int new_block_size, int major)
|
|||
* - our main FS device isn't a memory device
|
||||
*/
|
||||
|
||||
#if 0
|
||||
vmcache = 0;
|
||||
if(vm_forgetblock(VM_BLOCKID_NONE) != ENOSYS &&
|
||||
may_use_vmcache && major != MEMORY_MAJOR) {
|
||||
vmcache = 1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
|
|
@ -654,7 +660,7 @@ void lmfs_buf_pool(int new_nr_bufs)
|
|||
for (bp = &buf[0]; bp < &buf[nr_bufs]; bp++) bp->lmfs_hash = bp->lmfs_next;
|
||||
buf_hash[0] = front;
|
||||
|
||||
vm_forgetblocks();
|
||||
/* vm_forgetblocks(); */
|
||||
}
|
||||
|
||||
int lmfs_bufs_in_use(void)
|
||||
|
|
|
|||
|
|
@ -85,7 +85,6 @@ SRCS+= \
|
|||
vm_map_phys.c \
|
||||
vm_notify_sig.c \
|
||||
vm_umap.c \
|
||||
vm_yield_get_block.c \
|
||||
vm_procctl.c \
|
||||
vprintf.c
|
||||
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
|
||||
#include "syslib.h"
|
||||
|
||||
#include <minix/vm.h>
|
||||
#include <minix/u64.h>
|
||||
|
||||
/*===========================================================================*
|
||||
* vm_forgetblocks *
|
||||
*===========================================================================*/
|
||||
void vm_forgetblocks(void)
|
||||
{
|
||||
message m;
|
||||
_taskcall(VM_PROC_NR, VM_FORGETBLOCKS, &m);
|
||||
return;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* vm_forgetblock *
|
||||
*===========================================================================*/
|
||||
int vm_forgetblock(u64_t id)
|
||||
{
|
||||
message m;
|
||||
|
||||
m.VMFB_IDHI = ex64hi(id);
|
||||
m.VMFB_IDLO = ex64lo(id);
|
||||
|
||||
return _taskcall(VM_PROC_NR, VM_FORGETBLOCK, &m);
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* vm_yield_block_get_block *
|
||||
*===========================================================================*/
|
||||
int vm_yield_block_get_block(u64_t yieldid, u64_t getid,
|
||||
void *mem, vir_bytes len)
|
||||
{
|
||||
message m;
|
||||
|
||||
m.VMYBGB_VADDR = mem;
|
||||
m.VMYBGB_GETIDHI = ex64hi(getid);
|
||||
m.VMYBGB_GETIDLO = ex64lo(getid);
|
||||
m.VMYBGB_LEN = len;
|
||||
m.VMYBGB_YIELDIDHI = ex64hi(yieldid);
|
||||
m.VMYBGB_YIELDIDLO = ex64lo(yieldid);
|
||||
|
||||
return _taskcall(VM_PROC_NR, VM_YIELDBLOCKGETBLOCK, &m);
|
||||
}
|
||||
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
PROG= vm
|
||||
SRCS= main.c alloc.c utility.c exit.c fork.c break.c \
|
||||
mmap.c slaballoc.c region.c pagefaults.c \
|
||||
rs.c queryexit.c yieldedavl.c regionavl.c pb.c \
|
||||
rs.c queryexit.c pb.c regionavl.c \
|
||||
mem_anon.c mem_directphys.c mem_anon_contig.c mem_shared.c
|
||||
|
||||
.if ${MACHINE_ARCH} == "earm"
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ phys_clicks alloc_mem(phys_clicks clicks, u32_t memflags)
|
|||
|
||||
mem = alloc_pages(clicks, memflags);
|
||||
if(mem == NO_MEM) {
|
||||
free_yielded(clicks * CLICK_SIZE);
|
||||
/* free_yielded(clicks * CLICK_SIZE); */
|
||||
mem = alloc_pages(clicks, memflags);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ void clear_proc(struct vmproc *vmp)
|
|||
vmp->vm_region_top = 0;
|
||||
vmp->vm_callback = NULL; /* No pending vfs callback. */
|
||||
vmp->vm_flags = 0; /* Clear INUSE, so slot is free. */
|
||||
vmp->vm_yielded = 0;
|
||||
#if VMSTATS
|
||||
vmp->vm_bytecopies = 0;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -430,9 +430,6 @@ void init_vm(void)
|
|||
CALLMAP(VM_INFO, do_info);
|
||||
CALLMAP(VM_QUERY_EXIT, do_query_exit);
|
||||
CALLMAP(VM_WATCH_EXIT, do_watch_exit);
|
||||
CALLMAP(VM_FORGETBLOCKS, do_forgetblocks);
|
||||
CALLMAP(VM_FORGETBLOCK, do_forgetblock);
|
||||
CALLMAP(VM_YIELDBLOCKGETBLOCK, do_yieldblockgetblock);
|
||||
|
||||
/* Initialize the structures for queryexit */
|
||||
init_query_exit();
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ struct phys_region;
|
|||
|
||||
#include "pt.h"
|
||||
#include "vm.h"
|
||||
#include "yielded.h"
|
||||
|
||||
/* alloc.c */
|
||||
void *reservedqueue_new(int, int, int, int);
|
||||
|
|
@ -149,9 +148,6 @@ void map_printmap(struct vmproc *vmp);
|
|||
int map_writept(struct vmproc *vmp);
|
||||
void printregionstats(struct vmproc *vmp);
|
||||
void map_setparent(struct vmproc *vmp);
|
||||
int yielded_block_cmp(struct block_id *, struct block_id *);
|
||||
struct phys_region *map_clone_ph_block(struct vmproc *vmp,
|
||||
struct vir_region *region, struct phys_region *ph);
|
||||
u32_t vrallocflags(u32_t flags);
|
||||
int map_free(struct vir_region *region);
|
||||
struct phys_region *physblock_get(struct vir_region *region, vir_bytes offset);
|
||||
|
|
@ -175,12 +171,7 @@ int copy_abs2region(phys_bytes abs, struct vir_region *destregion,
|
|||
phys_bytes offset, phys_bytes len);
|
||||
#if SANITYCHECKS
|
||||
void map_sanitycheck(char *file, int line);
|
||||
void blockstats(void);
|
||||
#endif
|
||||
int do_forgetblocks(message *m);
|
||||
int do_forgetblock(message *m);
|
||||
int do_yieldblockgetblock(message *m);
|
||||
vir_bytes free_yielded(vir_bytes bytes);
|
||||
|
||||
/* rs.c */
|
||||
int do_rs_set_priv(message *m);
|
||||
|
|
|
|||
|
|
@ -26,53 +26,18 @@
|
|||
#include "glo.h"
|
||||
#include "region.h"
|
||||
#include "sanitycheck.h"
|
||||
#include "yieldedavl.h"
|
||||
#include "memlist.h"
|
||||
#include "memtype.h"
|
||||
|
||||
/* LRU list. */
|
||||
static yielded_t *lru_youngest = NULL, *lru_oldest = NULL;
|
||||
#include "regionavl.h"
|
||||
|
||||
static int map_ph_writept(struct vmproc *vmp, struct vir_region *vr,
|
||||
struct phys_region *pr);
|
||||
|
||||
static phys_bytes freeyieldednode(yielded_t *node, int freemem);
|
||||
|
||||
static struct vir_region *map_copy_region(struct vmproc *vmp, struct
|
||||
vir_region *vr);
|
||||
|
||||
#if SANITYCHECKS
|
||||
static void lrucheck(void);
|
||||
#endif
|
||||
|
||||
/* hash table of yielded blocks */
|
||||
#define YIELD_HASHSIZE 65536
|
||||
static yielded_avl vm_yielded_blocks[YIELD_HASHSIZE];
|
||||
|
||||
static int avl_inited = 0;
|
||||
|
||||
void map_region_init(void)
|
||||
{
|
||||
int h;
|
||||
assert(!avl_inited);
|
||||
for(h = 0; h < YIELD_HASHSIZE; h++)
|
||||
yielded_init(&vm_yielded_blocks[h]);
|
||||
avl_inited = 1;
|
||||
}
|
||||
|
||||
static yielded_avl *get_yielded_avl(block_id_t id)
|
||||
{
|
||||
u32_t h;
|
||||
|
||||
assert(avl_inited);
|
||||
|
||||
hash_i_64(id.owner, id.id, h);
|
||||
h = h % YIELD_HASHSIZE;
|
||||
|
||||
assert(h >= 0);
|
||||
assert(h < YIELD_HASHSIZE);
|
||||
|
||||
return &vm_yielded_blocks[h];
|
||||
}
|
||||
|
||||
void map_printregion(struct vir_region *vr)
|
||||
|
|
@ -197,8 +162,6 @@ void map_sanitycheck(char *file, int line)
|
|||
{
|
||||
struct vmproc *vmp;
|
||||
|
||||
lrucheck();
|
||||
|
||||
/* Macro for looping over all physical blocks of all regions of
|
||||
* all processes.
|
||||
*/
|
||||
|
|
@ -277,65 +240,8 @@ void map_sanitycheck(char *file, int line)
|
|||
ALLREGIONS(,MYASSERT(map_sanitycheck_pt(vmp, vr, pr) == OK));
|
||||
}
|
||||
|
||||
#define LRUCHECK lrucheck()
|
||||
|
||||
static void lrucheck(void)
|
||||
{
|
||||
yielded_t *list;
|
||||
|
||||
/* list is empty and ok if both ends point to null. */
|
||||
if(!lru_youngest && !lru_oldest)
|
||||
return;
|
||||
|
||||
/* if not, both should point to something. */
|
||||
SLABSANE(lru_youngest);
|
||||
SLABSANE(lru_oldest);
|
||||
|
||||
assert(!lru_youngest->younger);
|
||||
assert(!lru_oldest->older);
|
||||
|
||||
for(list = lru_youngest; list; list = list->older) {
|
||||
SLABSANE(list);
|
||||
if(list->younger) {
|
||||
SLABSANE(list->younger);
|
||||
assert(list->younger->older == list);
|
||||
} else assert(list == lru_youngest);
|
||||
if(list->older) {
|
||||
SLABSANE(list->older);
|
||||
assert(list->older->younger == list);
|
||||
} else assert(list == lru_oldest);
|
||||
}
|
||||
}
|
||||
|
||||
void blockstats(void)
|
||||
{
|
||||
yielded_t *list;
|
||||
int blocks = 0;
|
||||
phys_bytes mem = 0;
|
||||
clock_t ticks;
|
||||
int s;
|
||||
|
||||
s = getticks(&ticks);
|
||||
|
||||
assert(s == OK);
|
||||
|
||||
LRUCHECK;
|
||||
|
||||
for(list = lru_youngest; list; list = list->older) {
|
||||
mem += VM_PAGE_SIZE;
|
||||
blocks++;
|
||||
}
|
||||
|
||||
if(blocks > 0)
|
||||
printf("%d blocks, %lukB; ", blocks, mem/1024);
|
||||
|
||||
printmemstats();
|
||||
}
|
||||
#else
|
||||
#define LRUCHECK
|
||||
#endif
|
||||
|
||||
|
||||
/*=========================================================================*
|
||||
* map_ph_writept *
|
||||
*=========================================================================*/
|
||||
|
|
@ -679,132 +585,6 @@ int map_free(struct vir_region *region)
|
|||
return OK;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* yielded_block_cmp *
|
||||
*===========================================================================*/
|
||||
int yielded_block_cmp(struct block_id *id1, struct block_id *id2)
|
||||
{
|
||||
if(id1->owner < id2->owner)
|
||||
return -1;
|
||||
if(id1->owner > id2->owner)
|
||||
return 1;
|
||||
return cmp64(id1->id, id2->id);
|
||||
}
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* free_yielded_proc *
|
||||
*===========================================================================*/
|
||||
static vir_bytes free_yielded_proc(struct vmproc *vmp)
|
||||
{
|
||||
vir_bytes total = 0;
|
||||
int h;
|
||||
|
||||
SANITYCHECK(SCL_FUNCTIONS);
|
||||
|
||||
/* Free associated regions. */
|
||||
for(h = 0; h < YIELD_HASHSIZE && vmp->vm_yielded > 0; h++) {
|
||||
yielded_t *yb;
|
||||
yielded_iter iter;
|
||||
yielded_avl *avl = &vm_yielded_blocks[h];
|
||||
yielded_start_iter_least(avl, &iter);
|
||||
while((yb = yielded_get_iter(&iter))) {
|
||||
yielded_t *next_yb;
|
||||
SLABSANE(yb);
|
||||
yielded_incr_iter(&iter);
|
||||
if(yb->id.owner != vmp->vm_endpoint)
|
||||
continue;
|
||||
next_yb = yielded_get_iter(&iter);
|
||||
total += freeyieldednode(yb, 1);
|
||||
/* the above removal invalidated our iter; restart it
|
||||
* for the node we want to start at.
|
||||
*/
|
||||
if(!next_yb) break;
|
||||
yielded_start_iter(avl, &iter, next_yb->id, AVL_EQUAL);
|
||||
assert(yielded_get_iter(&iter) == next_yb);
|
||||
}
|
||||
}
|
||||
|
||||
return total;
|
||||
}
|
||||
|
||||
|
||||
static phys_bytes freeyieldednode(yielded_t *node, int freemem)
|
||||
{
|
||||
yielded_t *older, *younger, *removed;
|
||||
yielded_avl *avl;
|
||||
int p;
|
||||
|
||||
SLABSANE(node);
|
||||
|
||||
LRUCHECK;
|
||||
|
||||
/* Update LRU. */
|
||||
|
||||
younger = node->younger;
|
||||
older = node->older;
|
||||
|
||||
if(younger) {
|
||||
SLABSANE(younger);
|
||||
assert(younger->older == node);
|
||||
USE(younger, younger->older = node->older;);
|
||||
} else {
|
||||
assert(node == lru_youngest);
|
||||
lru_youngest = node->older;
|
||||
}
|
||||
|
||||
if(older) {
|
||||
SLABSANE(older);
|
||||
assert(older->younger == node);
|
||||
USE(older, older->younger = node->younger;);
|
||||
} else {
|
||||
assert(node == lru_oldest);
|
||||
lru_oldest = node->younger;
|
||||
}
|
||||
|
||||
LRUCHECK;
|
||||
|
||||
/* Update AVL. */
|
||||
|
||||
if(vm_isokendpt(node->id.owner, &p) != OK)
|
||||
panic("out of date owner of yielded block %d", node->id.owner);
|
||||
avl = get_yielded_avl(node->id);
|
||||
removed = yielded_remove(avl, node->id);
|
||||
assert(removed == node);
|
||||
assert(vmproc[p].vm_yielded > 0);
|
||||
vmproc[p].vm_yielded--;
|
||||
|
||||
/* Free associated memory if requested. */
|
||||
|
||||
if(freemem) {
|
||||
free_mem(ABS2CLICK(node->physaddr), node->pages);
|
||||
}
|
||||
|
||||
/* Free node. */
|
||||
SLABFREE(node);
|
||||
|
||||
return VM_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/*========================================================================*
|
||||
* free_yielded *
|
||||
*========================================================================*/
|
||||
vir_bytes free_yielded(vir_bytes max_bytes)
|
||||
{
|
||||
|
||||
/* PRIVATE yielded_t *lru_youngest = NULL, *lru_oldest = NULL; */
|
||||
vir_bytes freed = 0;
|
||||
int blocks = 0;
|
||||
|
||||
while(freed < max_bytes && lru_oldest) {
|
||||
SLABSANE(lru_oldest);
|
||||
freed += freeyieldednode(lru_oldest, 1);
|
||||
blocks++;
|
||||
}
|
||||
|
||||
return freed;
|
||||
}
|
||||
|
||||
/*========================================================================*
|
||||
* map_free_proc *
|
||||
*========================================================================*/
|
||||
|
|
@ -828,9 +608,6 @@ struct vmproc *vmp;
|
|||
|
||||
region_init(&vmp->vm_regions_avl);
|
||||
|
||||
/* Free associated yielded blocks. */
|
||||
free_yielded_proc(vmp);
|
||||
|
||||
SANITYCHECK(SCL_FUNCTIONS);
|
||||
|
||||
return OK;
|
||||
|
|
@ -888,83 +665,6 @@ u32_t vrallocflags(u32_t flags)
|
|||
return allocflags;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* map_clone_ph_block *
|
||||
*===========================================================================*/
|
||||
struct phys_region *map_clone_ph_block(vmp, region, ph)
|
||||
struct vmproc *vmp;
|
||||
struct vir_region *region;
|
||||
struct phys_region *ph;
|
||||
{
|
||||
vir_bytes offset;
|
||||
u32_t allocflags;
|
||||
phys_bytes physaddr;
|
||||
struct phys_region *newpr;
|
||||
int region_has_single_block;
|
||||
SANITYCHECK(SCL_FUNCTIONS);
|
||||
|
||||
/* Warning: this function will free the passed
|
||||
* phys_region *ph and replace it (in the same offset)
|
||||
* with another! So both the pointer to it
|
||||
* and any iterators over the phys_regions in the vir_region
|
||||
* will be invalid on successful return. (Iterators over
|
||||
* the vir_region could be invalid on unsuccessful return too.)
|
||||
*/
|
||||
|
||||
/* This is only to be done if there is more than one copy. */
|
||||
assert(ph->ph->refcount > 1);
|
||||
|
||||
/* This function takes a physical block, copies its contents
|
||||
* into newly allocated memory, and replaces the single physical
|
||||
* block by one or more physical blocks with refcount 1 with the
|
||||
* same contents as the original. In other words, a fragmentable
|
||||
* version of map_copy_ph_block().
|
||||
*/
|
||||
|
||||
/* Remember where and how much. */
|
||||
offset = ph->offset;
|
||||
physaddr = ph->ph->phys;
|
||||
|
||||
/* Now unlink the original physical block so we can replace
|
||||
* it with new ones.
|
||||
*/
|
||||
|
||||
SLABSANE(ph);
|
||||
SLABSANE(ph->ph);
|
||||
assert(ph->ph->refcount > 1);
|
||||
pb_unreferenced(region, ph, 1);
|
||||
SLABFREE(ph);
|
||||
|
||||
SANITYCHECK(SCL_DETAIL);
|
||||
|
||||
/* Put new free memory in. */
|
||||
allocflags = vrallocflags(region->flags | VR_UNINITIALIZED);
|
||||
region_has_single_block = (offset == 0 && region->length == VM_PAGE_SIZE);
|
||||
assert(region_has_single_block || !(allocflags & PAF_CONTIG));
|
||||
assert(!(allocflags & PAF_CLEAR));
|
||||
|
||||
if(map_pf(vmp, region, offset, 1) != OK) {
|
||||
/* XXX original range now gone. */
|
||||
printf("VM: map_clone_ph_block: map_pf failed.\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Copy the block to the new memory.
|
||||
* Can only fail if map_new_physblock didn't do what we asked.
|
||||
*/
|
||||
if(copy_abs2region(physaddr, region, offset, VM_PAGE_SIZE) != OK)
|
||||
panic("copy_abs2region failed, no good reason for that");
|
||||
|
||||
newpr = physblock_get(region, offset);
|
||||
assert(newpr);
|
||||
assert(newpr->offset == offset);
|
||||
|
||||
SANITYCHECK(SCL_FUNCTIONS);
|
||||
|
||||
return newpr;
|
||||
}
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* map_pf *
|
||||
*===========================================================================*/
|
||||
|
|
@ -1460,12 +1160,7 @@ int map_get_ref(struct vmproc *vmp, vir_bytes addr, u8_t *cnt)
|
|||
*========================================================================*/
|
||||
void get_stats_info(struct vm_stats_info *vsi)
|
||||
{
|
||||
yielded_t *yb;
|
||||
|
||||
vsi->vsi_cached = 0L;
|
||||
|
||||
for(yb = lru_youngest; yb; yb = yb->older)
|
||||
vsi->vsi_cached++;
|
||||
}
|
||||
|
||||
void get_usage_info_kernel(struct vm_usage_info *vui)
|
||||
|
|
@ -1604,315 +1299,6 @@ void printregionstats(struct vmproc *vmp)
|
|||
return;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* get_clean_phys_region *
|
||||
*===========================================================================*/
|
||||
static struct phys_region *
|
||||
get_clean_phys_region(struct vmproc *vmp, vir_bytes vaddr, struct vir_region **ret_region)
|
||||
{
|
||||
struct vir_region *region;
|
||||
vir_bytes mapaddr;
|
||||
struct phys_region *ph;
|
||||
|
||||
mapaddr = vaddr;
|
||||
|
||||
if(!(region = map_lookup(vmp, mapaddr, &ph)) || !ph) {
|
||||
printf("VM: get_clean_phys_region: 0x%lx not found\n", vaddr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
assert(mapaddr >= region->vaddr);
|
||||
assert(mapaddr < region->vaddr + region->length);
|
||||
|
||||
/* If it's mapped more than once, make a copy. */
|
||||
assert(ph->ph->refcount > 0);
|
||||
if(ph->ph->refcount > 1) {
|
||||
if(!(ph = map_clone_ph_block(vmp, region,
|
||||
ph))) {
|
||||
printf("VM: get_clean_phys_region: ph copy failed\n");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
assert(ph->ph->refcount == 1);
|
||||
|
||||
*ret_region = region;
|
||||
|
||||
return ph;
|
||||
}
|
||||
|
||||
static int getblock(struct vmproc *vmp, u64_t id, vir_bytes vaddr, int pages)
|
||||
{
|
||||
yielded_t *yb;
|
||||
struct phys_region *ph;
|
||||
struct vir_region *region;
|
||||
yielded_avl *avl;
|
||||
block_id_t blockid;
|
||||
phys_bytes phaddr;
|
||||
int p;
|
||||
|
||||
/* Try to get the yielded block */
|
||||
blockid.owner = vmp->vm_endpoint;
|
||||
blockid.id = id;
|
||||
avl = get_yielded_avl(blockid);
|
||||
if(!(yb = yielded_search(avl, blockid, AVL_EQUAL))) {
|
||||
return ESRCH;
|
||||
}
|
||||
|
||||
if(yb->pages != pages) {
|
||||
printf("VM: getblock: length mismatch (%d != %d)\n",
|
||||
pages, yb->pages);
|
||||
return EFAULT;
|
||||
}
|
||||
|
||||
phaddr = yb->physaddr;
|
||||
|
||||
for(p = 0; p < pages; p++) {
|
||||
/* Get the intended phys region, make sure refcount is 1. */
|
||||
if(!(ph = get_clean_phys_region(vmp, vaddr, ®ion))) {
|
||||
printf("VM: getblock: not found for %d\n", vmp->vm_endpoint);
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
assert(ph->ph->refcount == 1);
|
||||
|
||||
/* Free the block that is currently there. */
|
||||
free_mem(ABS2CLICK(ph->ph->phys), 1);
|
||||
|
||||
/* Set the phys block to new addr and update pagetable. */
|
||||
USE(ph->ph, ph->ph->phys = phaddr;);
|
||||
if(map_ph_writept(vmp, region, ph) != OK) {
|
||||
/* Presumably it was mapped, so there is no reason
|
||||
* updating should fail.
|
||||
*/
|
||||
panic("do_get_block: couldn't write pt");
|
||||
}
|
||||
|
||||
vaddr += VM_PAGE_SIZE;
|
||||
phaddr += VM_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* Forget about the yielded block and free the struct. */
|
||||
freeyieldednode(yb, 0);
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
static int yieldblock(struct vmproc *vmp, u64_t id,
|
||||
vir_bytes vaddr, yielded_t **retyb, int pages)
|
||||
{
|
||||
yielded_t *newyb;
|
||||
vir_bytes mem_clicks, v, p, new_phaddr;
|
||||
struct vir_region *region;
|
||||
struct phys_region *ph = NULL, *prev_ph = NULL, *first_ph = NULL;
|
||||
yielded_avl *avl;
|
||||
block_id_t blockid;
|
||||
|
||||
/* Makes no sense if yielded block ID already exists, and
|
||||
* is likely a serious bug in the caller.
|
||||
*/
|
||||
blockid.id = id;
|
||||
blockid.owner = vmp->vm_endpoint;
|
||||
avl = get_yielded_avl(blockid);
|
||||
if(yielded_search(avl, blockid, AVL_EQUAL)) {
|
||||
printf("!");
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
if((vaddr % VM_PAGE_SIZE) || pages < 1) return EFAULT;
|
||||
|
||||
v = vaddr;
|
||||
for(p = 0; p < pages; p++) {
|
||||
if(!(region = map_lookup(vmp, v, &ph)) || !ph) {
|
||||
printf("VM: do_yield_block: not found for %d\n",
|
||||
vmp->vm_endpoint);
|
||||
return EINVAL;
|
||||
}
|
||||
if(!(region->flags & VR_ANON)) {
|
||||
printf("VM: yieldblock: non-anon 0x%lx\n", v);
|
||||
return EFAULT;
|
||||
}
|
||||
if(ph->ph->refcount != 1) {
|
||||
printf("VM: do_yield_block: mapped not once for %d\n",
|
||||
vmp->vm_endpoint);
|
||||
return EFAULT;
|
||||
}
|
||||
if(prev_ph) {
|
||||
if(ph->ph->phys != prev_ph->ph->phys + VM_PAGE_SIZE) {
|
||||
printf("VM: physically discontiguous yield\n");
|
||||
return EINVAL;
|
||||
}
|
||||
}
|
||||
prev_ph = ph;
|
||||
if(!first_ph) first_ph = ph;
|
||||
v += VM_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* Make a new block to record the yielding in. */
|
||||
if(!SLABALLOC(newyb)) {
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
assert(!(ph->ph->phys % VM_PAGE_SIZE));
|
||||
|
||||
if((mem_clicks = alloc_mem(pages, PAF_CLEAR)) == NO_MEM) {
|
||||
SLABFREE(newyb);
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
/* Update yielded block info. */
|
||||
USE(newyb,
|
||||
newyb->id = blockid;
|
||||
newyb->physaddr = first_ph->ph->phys;
|
||||
newyb->pages = pages;
|
||||
newyb->younger = NULL;);
|
||||
|
||||
new_phaddr = CLICK2ABS(mem_clicks);
|
||||
|
||||
/* Set new phys block to new addr and update pagetable. */
|
||||
v = vaddr;
|
||||
for(p = 0; p < pages; p++) {
|
||||
region = map_lookup(vmp, v, &ph);
|
||||
assert(region && ph);
|
||||
assert(ph->ph->refcount == 1);
|
||||
USE(ph->ph,
|
||||
ph->ph->phys = new_phaddr;);
|
||||
if(map_ph_writept(vmp, region, ph) != OK) {
|
||||
/* Presumably it was mapped, so there is no reason
|
||||
* updating should fail.
|
||||
*/
|
||||
panic("yield_block: couldn't write pt");
|
||||
}
|
||||
v += VM_PAGE_SIZE;
|
||||
new_phaddr += VM_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* Remember yielded block. */
|
||||
|
||||
yielded_insert(avl, newyb);
|
||||
vmp->vm_yielded++;
|
||||
|
||||
/* Add to LRU list too. It's the youngest block. */
|
||||
LRUCHECK;
|
||||
|
||||
if(lru_youngest) {
|
||||
USE(lru_youngest,
|
||||
lru_youngest->younger = newyb;);
|
||||
} else {
|
||||
lru_oldest = newyb;
|
||||
}
|
||||
|
||||
USE(newyb,
|
||||
newyb->older = lru_youngest;);
|
||||
|
||||
lru_youngest = newyb;
|
||||
|
||||
LRUCHECK;
|
||||
|
||||
if(retyb)
|
||||
*retyb = newyb;
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* do_forgetblocks *
|
||||
*===========================================================================*/
|
||||
int do_forgetblocks(message *m)
|
||||
{
|
||||
int n;
|
||||
struct vmproc *vmp;
|
||||
endpoint_t caller = m->m_source;
|
||||
|
||||
if(vm_isokendpt(caller, &n) != OK)
|
||||
panic("do_yield_block: message from strange source: %d",
|
||||
m->m_source);
|
||||
|
||||
vmp = &vmproc[n];
|
||||
|
||||
free_yielded_proc(vmp);
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* do_forgetblock *
|
||||
*===========================================================================*/
|
||||
int do_forgetblock(message *m)
|
||||
{
|
||||
int n;
|
||||
struct vmproc *vmp;
|
||||
endpoint_t caller = m->m_source;
|
||||
yielded_t *yb;
|
||||
u64_t id;
|
||||
block_id_t blockid;
|
||||
yielded_avl *avl;
|
||||
|
||||
if(vm_isokendpt(caller, &n) != OK)
|
||||
panic("do_yield_block: message from strange source: %d",
|
||||
m->m_source);
|
||||
|
||||
vmp = &vmproc[n];
|
||||
|
||||
id = make64(m->VMFB_IDLO, m->VMFB_IDHI);
|
||||
|
||||
blockid.id = id;
|
||||
blockid.owner = vmp->vm_endpoint;
|
||||
avl = get_yielded_avl(blockid);
|
||||
if((yb = yielded_search(avl, blockid, AVL_EQUAL))) {
|
||||
freeyieldednode(yb, 1);
|
||||
}
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
/*===========================================================================*
|
||||
* do_yieldblockgetblock *
|
||||
*===========================================================================*/
|
||||
int do_yieldblockgetblock(message *m)
|
||||
{
|
||||
u64_t yieldid, getid;
|
||||
int n;
|
||||
endpoint_t caller = m->m_source;
|
||||
struct vmproc *vmp;
|
||||
yielded_t *yb = NULL;
|
||||
int r = OK;
|
||||
int pages;
|
||||
|
||||
if(vm_isokendpt(caller, &n) != OK)
|
||||
panic("do_yieldblockgetblock: message from strange source: %d",
|
||||
m->m_source);
|
||||
|
||||
vmp = &vmproc[n];
|
||||
|
||||
pages = m->VMYBGB_LEN / VM_PAGE_SIZE;
|
||||
|
||||
if((m->VMYBGB_LEN % VM_PAGE_SIZE) || pages < 1) {
|
||||
static int printed;
|
||||
if(!printed) {
|
||||
printed = 1;
|
||||
printf("vm: non-page-aligned or short block length\n");
|
||||
}
|
||||
return EFAULT;
|
||||
}
|
||||
|
||||
yieldid = make64(m->VMYBGB_YIELDIDLO, m->VMYBGB_YIELDIDHI);
|
||||
getid = make64(m->VMYBGB_GETIDLO, m->VMYBGB_GETIDHI);
|
||||
|
||||
if(cmp64(yieldid, VM_BLOCKID_NONE) != 0) {
|
||||
/* A block was given to yield. */
|
||||
r = yieldblock(vmp, yieldid, (vir_bytes) m->VMYBGB_VADDR, &yb,
|
||||
pages);
|
||||
}
|
||||
|
||||
if(r == OK && cmp64(getid, VM_BLOCKID_NONE) != 0) {
|
||||
/* A block was given to get. */
|
||||
r = getblock(vmp, getid, (vir_bytes) m->VMYBGB_VADDR, pages);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void map_setparent(struct vmproc *vmp)
|
||||
{
|
||||
region_iter iter;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ struct vmproc {
|
|||
int vm_callback_type; /* expected message type */
|
||||
|
||||
int vm_slot; /* process table slot */
|
||||
int vm_yielded; /* yielded regions */
|
||||
|
||||
union {
|
||||
struct {
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
#ifndef _YIELDED_H
|
||||
#define _YIELDED_H 1
|
||||
|
||||
#include <minix/type.h>
|
||||
|
||||
typedef struct block_id {
|
||||
u64_t id;
|
||||
endpoint_t owner;
|
||||
} block_id_t;
|
||||
|
||||
typedef struct yielded {
|
||||
/* the owner-given id and owner together
|
||||
* uniquely identify a yielded block.
|
||||
*/
|
||||
block_id_t id;
|
||||
phys_bytes physaddr;
|
||||
int pages;
|
||||
|
||||
/* LRU fields */
|
||||
struct yielded *younger, *older;
|
||||
|
||||
/* AVL fields */
|
||||
struct yielded *less, *greater;
|
||||
int factor;
|
||||
} yielded_t;
|
||||
|
||||
#endif
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
#include <stddef.h>
|
||||
#include <minix/u64.h>
|
||||
|
||||
#include "proto.h"
|
||||
#include "sanitycheck.h"
|
||||
#include "yielded.h"
|
||||
#include "yieldedavl_defs.h"
|
||||
#include "cavl_if.h"
|
||||
#include "cavl_impl.h"
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
|
||||
#ifndef _YIELDEDAVL_H
|
||||
#define _YIELDEDAVL_H
|
||||
|
||||
#include "yielded.h"
|
||||
#include "yieldedavl_defs.h"
|
||||
#include "cavl_if.h"
|
||||
#include "unavl.h"
|
||||
|
||||
#endif
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#include <minix/u64.h>
|
||||
|
||||
#define AVL_UNIQUE(id) yielded_ ## id
|
||||
#define AVL_HANDLE yielded_t *
|
||||
#define AVL_KEY block_id_t
|
||||
#define AVL_MAX_DEPTH 30 /* good for 2 million nodes */
|
||||
#define AVL_NULL NULL
|
||||
#define AVL_GET_LESS(h, a) (h)->less
|
||||
#define AVL_GET_GREATER(h, a) (h)->greater
|
||||
#define AVL_SET_LESS(h1, h2) USE((h1), (h1)->less = h2;);
|
||||
#define AVL_SET_GREATER(h1, h2) USE((h1), (h1)->greater = h2;);
|
||||
#define AVL_GET_BALANCE_FACTOR(h) (h)->factor
|
||||
#define AVL_SET_BALANCE_FACTOR(h, f) USE((h), (h)->factor = f;);
|
||||
#define AVL_SET_ROOT(h, v) (h)->root = v;
|
||||
#define AVL_COMPARE_KEY_KEY(k1, k2) yielded_block_cmp(&(k1), &(k2))
|
||||
#define AVL_COMPARE_KEY_NODE(k, h) AVL_COMPARE_KEY_KEY((k), (h)->id)
|
||||
#define AVL_COMPARE_NODE_NODE(h1, h2) AVL_COMPARE_KEY_KEY((h1)->id, (h2)->id)
|
||||
#define AVL_INSIDE_STRUCT char pad[4];
|
||||
|
|
@ -35,9 +35,11 @@ OBJS.test57= test57loop.o
|
|||
OBJS.test71+= testcache.o
|
||||
OBJS.test72+= testcache.o
|
||||
LDADD.test72+= -lminixfs
|
||||
PROGS += testvm
|
||||
OBJS.testvm+= testcache.o
|
||||
LDADD.testvm+= -lsys -ltimers -lminlib -static
|
||||
|
||||
# temporarily disabled until 2ndary cache is back
|
||||
#PROGS += testvm
|
||||
#OBJS.testvm+= testcache.o
|
||||
#LDADD.testvm+= -lsys -ltimers -lminlib -static
|
||||
|
||||
FILES += testvm.conf
|
||||
|
||||
|
|
@ -46,7 +48,7 @@ MINIX_TESTS= \
|
|||
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 \
|
||||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 \
|
||||
41 42 43 44 45 46 48 49 50 52 53 54 55 56 58 59 60 \
|
||||
61 64 65 66 67 68 69 70 71 72 73
|
||||
61 64 65 66 67 68 69 70 71 72 # 73 (2ndary cache)
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
MINIX_TESTS+= \
|
||||
|
|
|
|||
4
test/run
4
test/run
|
|
@ -19,12 +19,12 @@ badones= # list of tests that failed
|
|||
|
||||
# Tests which require setuid
|
||||
setuids="test11 test33 test43 test44 test46 test56 test60 test61 test65 \
|
||||
test69 test73"
|
||||
test69" # test73"
|
||||
|
||||
alltests=" 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 \
|
||||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 \
|
||||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 \
|
||||
61 62 63 64 65 66 67 68 69 70 71 72 73 \
|
||||
61 62 63 64 65 66 67 68 69 70 71 72 \
|
||||
sh1.sh sh2.sh interp.sh"
|
||||
tests_no=`expr 0`
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue