OpenXiangShan
/
nexus-am
mirror of https://github.com/OpenXiangShan/nexus-am.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

native,vme: fix bug of malloc() across cpus 

* malloc() will get memory from heap, which is private across cpus. This
  will cause wrong memory accessing when a piece of memory is allocated
  by one cpu but accessed by another.
* using pgalloc() from OS solves this issue
This commit is contained in:
Zihao Yu 2020-02-04 22:50:33 +08:00
parent f90842395e
commit e4d95b8566
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
am/src/native/vme.c
View File

@ -17,11 +17,13 @@ typedef struct PageMap {
static _AddressSpace empty_as = { .ptr = NULL };
static int vme_enable = 0;
static void* (*pgalloc)(size_t) = NULL;
static void (*pgfree)(void *) = NULL;
int _vme_init(void* (*pgalloc_f)(size_t), void (*pgfree_f)(void*)) {
// we do not need to ask MM to get a page from OS,
// since we can call malloc() in native
thiscpu->cur_as = &empty_as;
pgalloc = pgalloc_f;
pgfree = pgfree_f;
vme_enable = 1;
return 0;
}
@ -62,6 +64,7 @@ void __am_switch(_Context *c) {
// mmap all mappings
list_foreach(pp, as->ptr) {
assert(USER_SPACE.start <= pp->va && pp->va < USER_SPACE.end);
__am_shm_mmap(pp->va, pp->pa, pp->prot);
pp->is_mapped = true;
}
@ -70,6 +73,9 @@ void __am_switch(_Context *c) {
}
void _map(_AddressSpace *as, void *va, void *pa, int prot) {
assert(USER_SPACE.start <= va && va < USER_SPACE.end);
assert((uintptr_t)va % PGSIZE == 0);
assert((uintptr_t)pa % PGSIZE == 0);
PageMap *pp;
list_foreach(pp, as->ptr) {
// can not remap
@ -82,7 +88,7 @@ void _map(_AddressSpace *as, void *va, void *pa, int prot) {
}
}
pp = malloc(sizeof(PageMap));
pp = pgalloc(PGSIZE); // this will waste memory, any better idea?
pp->va = va;
pp->pa = pa;
pp->prot = prot;