gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileobj_create(): fix --mpol-shm-premap for Quadrant mode

Browse Source
This commit is contained in:
Balazs Gerofi
2017-05-31 08:33:29 +09:00
parent 0c3b705f98
commit e306b1e838
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/fileobj.c
View File

@@ -239,7 +239,9 @@ int fileobj_create(int fd, struct memobj **objp, int *maxprotp)
int nr_pages = (result.size + (PAGE_SIZE - 1)) int nr_pages = (result.size + (PAGE_SIZE - 1))
>> PAGE_SHIFT; >> PAGE_SHIFT;
int j = 0; int j = 0;
int node = 4; int node = ihk_mc_get_nr_numa_nodes() / 2;
dkprintf("%s: MF_PREMAP, start node: %d\n",
__FUNCTION__, node);
mo->pages = kmalloc(nr_pages * sizeof(void *), IHK_MC_AP_NOWAIT); mo->pages = kmalloc(nr_pages * sizeof(void *), IHK_MC_AP_NOWAIT);
if (!mo->pages) { if (!mo->pages) {
@@ -266,7 +268,7 @@ int fileobj_create(int fd, struct memobj **objp, int *maxprotp)
++node; ++node;
if (node == ihk_mc_get_nr_numa_nodes()) { if (node == ihk_mc_get_nr_numa_nodes()) {
node = 4; node = ihk_mc_get_nr_numa_nodes() / 2;
} }
} }
dkprintf("%s: allocated %d pages interleaved\n", dkprintf("%s: allocated %d pages interleaved\n",
@@ -365,11 +367,13 @@ static void fileobj_release(struct memobj *memobj)
page_va = phys_to_virt(page_to_phys(page)); page_va = phys_to_virt(page_to_phys(page));
if (ihk_atomic_read(&page->count) != 1) { if (ihk_atomic_read(&page->count) != 1) {
kprintf("%s: WARNING: page count for phys 0x%lx is invalid\n", kprintf("%s: WARNING: page count %d for phys 0x%lx is invalid, flags: 0x%lx\n",
__FUNCTION__, page->phys); __FUNCTION__,
ihk_atomic_read(&page->count),
page->phys,
to_memobj(free_obj)->flags);
} }
else if (page_unmap(page)) {
if (page_unmap(page)) {
ihk_mc_free_pages(page_va, 1); ihk_mc_free_pages(page_va, 1);
} }
#if 0 #if 0