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

NUMA: receive CPU info in array format

Browse Source
This commit is contained in:
Balazs Gerofi
2016-10-12 19:38:33 +09:00
parent f33d85a27a
commit 167ea67dee
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/mem.c
View File

@@ -918,7 +918,6 @@ static struct ihk_page_allocator_desc *page_allocator_init(uint64_t start,
static void numa_init(void) static void numa_init(void)
{ {
int i, j; int i, j;
struct ihk_mc_numa_node *node;
memory_nodes = early_alloc_pages((sizeof(*memory_nodes) * memory_nodes = early_alloc_pages((sizeof(*memory_nodes) *
ihk_mc_get_nr_numa_nodes() + PAGE_SIZE - 1) ihk_mc_get_nr_numa_nodes() + PAGE_SIZE - 1)
>> PAGE_SHIFT); >> PAGE_SHIFT);
@@ -926,7 +925,7 @@ static void numa_init(void)
for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) { for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) {
int linux_numa_id, type; int linux_numa_id, type;
ihk_mc_get_numa_node(i, &linux_numa_id, &type, NULL); ihk_mc_get_numa_node(i, &linux_numa_id, &type);
memory_nodes[i].id = i; memory_nodes[i].id = i;
memory_nodes[i].linux_numa_id = linux_numa_id; memory_nodes[i].linux_numa_id = linux_numa_id;
memory_nodes[i].type = type; memory_nodes[i].type = type;
@@ -936,29 +935,21 @@ static void numa_init(void)
i, linux_numa_id, type); i, linux_numa_id, type);
} }
node = memory_nodes;
for (j = 0; j < ihk_mc_get_nr_memory_chunks(); ++j) { for (j = 0; j < ihk_mc_get_nr_memory_chunks(); ++j) {
unsigned long start, end; unsigned long start, end;
int linux_numa_id; int numa_id;
struct ihk_page_allocator_desc *allocator; struct ihk_page_allocator_desc *allocator;
ihk_mc_get_memory_chunk(j, &start, &end, &linux_numa_id); ihk_mc_get_memory_chunk(j, &start, &end, &numa_id);
allocator = page_allocator_init(start, end, (j == 0)); allocator = page_allocator_init(start, end, (j == 0));
while (node->linux_numa_id != linux_numa_id && list_add_tail(&allocator->list, &memory_nodes[numa_id].allocators);
node < (memory_nodes + ihk_mc_get_nr_numa_nodes())) ++node;
if (node == (memory_nodes + ihk_mc_get_nr_numa_nodes())) {
panic("invalid memory chunk: no corresponding NUMA node found\n");
}
list_add_tail(&allocator->list, &node->allocators);
kprintf("Physical memory: 0x%lx - 0x%lx, %lu bytes, %d pages available @ NUMA: %d\n", kprintf("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),
node->id); numa_id);
} }
} }

5
lib/include/ihk/mm.h
View File

@@ -170,13 +170,12 @@ uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt);
int ihk_mc_get_nr_numa_nodes(void); int ihk_mc_get_nr_numa_nodes(void);
struct smp_coreset; struct smp_coreset;
int ihk_mc_get_numa_node(int id, int *linux_numa_id, int *type, int ihk_mc_get_numa_node(int id, int *linux_numa_id, int *type);
struct smp_coreset **cpu_hw_ids);
int ihk_mc_get_nr_memory_chunks(void); int ihk_mc_get_nr_memory_chunks(void);
int ihk_mc_get_memory_chunk(int id, int ihk_mc_get_memory_chunk(int id,
unsigned long *start, unsigned long *start,
unsigned long *end, unsigned long *end,
int *linux_numa_id); int *numa_id);
void remote_flush_tlb_cpumask(struct process_vm *vm, void remote_flush_tlb_cpumask(struct process_vm *vm,
unsigned long addr, int cpu_id); unsigned long addr, int cpu_id);