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

NUMA: only print a short summary at boot time

Browse Source
This commit is contained in:
Balazs Gerofi
2017-07-19 09:11:44 +09:00
parent 51ed8dce06
commit dd9675d65e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/memory.c
View File

@ -2067,7 +2067,8 @@ void *map_fixed_area(unsigned long phys, unsigned long size, int uncachable)
attr |= PTATTR_UNCACHABLE; attr |= PTATTR_UNCACHABLE;
} }
kprintf("map_fixed: %lx => %p (%d pages)\n", paligned, v, npages); kprintf("map_fixed: phys: 0x%lx => 0x%lx (%d pages)\n",
paligned, v, npages);
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
if(__set_pt_page(init_pt, (void *)fixed_virt, paligned, attr)){ if(__set_pt_page(init_pt, (void *)fixed_virt, paligned, attr)){

20
kernel/mem.c
View File

@ -1150,9 +1150,6 @@ static void numa_init(void)
memory_nodes[i].nr_pages = 0; memory_nodes[i].nr_pages = 0;
memory_nodes[i].nr_free_pages = 0; memory_nodes[i].nr_free_pages = 0;
#endif #endif
kprintf("NUMA: %d, Linux NUMA: %d, type: %d\n",
i, linux_numa_id, type);
} }
for (j = 0; j < ihk_mc_get_nr_memory_chunks(); ++j) { for (j = 0; j < ihk_mc_get_nr_memory_chunks(); ++j) {
@ -1179,13 +1176,13 @@ static void numa_init(void)
#endif #endif
#ifdef IHK_RBTREE_ALLOCATOR #ifdef IHK_RBTREE_ALLOCATOR
kprintf("Physical memory: 0x%lx - 0x%lx, %lu bytes, %d pages available @ NUMA: %d\n", dkprintf("Physical memory: 0x%lx - 0x%lx, %lu bytes, %d pages available @ NUMA: %d\n",
start, end, start, end,
end - start, end - start,
(end - start) >> PAGE_SHIFT, (end - start) >> PAGE_SHIFT,
numa_id); numa_id);
#else #else
kprintf("Physical memory: 0x%lx - 0x%lx, %lu bytes, %d pages available @ NUMA: %d\n", dkprintf("Physical memory: 0x%lx - 0x%lx, %lu bytes, %d pages available @ NUMA: %d\n",
start, end, start, end,
ihk_pagealloc_count(allocator) * PAGE_SIZE, ihk_pagealloc_count(allocator) * PAGE_SIZE,
ihk_pagealloc_count(allocator), ihk_pagealloc_count(allocator),
@ -1196,6 +1193,19 @@ static void numa_init(void)
#else #else
rusage_total_memory_add(ihk_pagealloc_count(allocator) * rusage_total_memory_add(ihk_pagealloc_count(allocator) *
PAGE_SIZE); PAGE_SIZE);
#endif
}
for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) {
#ifdef IHK_RBTREE_ALLOCATOR
kprintf("NUMA: %d, Linux NUMA: %d, type: %d, "
"available bytes: %lu, pages: %d\n",
i, memory_nodes[i].linux_numa_id, memory_nodes[i].type,
memory_nodes[i].nr_free_pages * PAGE_SIZE,
memory_nodes[i].nr_free_pages);
#else
kprintf("NUMA: %d, Linux NUMA: %d, type: %d\n",
i, memory_nodes[i].linux_numa_id, memory_nodes[i].type);
#endif #endif
} }
} }