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

NUMA: order nodes based on distances

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-13 10:46:17 +09:00
parent 052b3f44ca
commit 551999ff6b
2 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
kernel/mem.c
View File

@ -931,6 +931,7 @@ static void numa_init(void)
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;
INIT_LIST_HEAD(&memory_nodes[i].allocators); INIT_LIST_HEAD(&memory_nodes[i].allocators);
memory_nodes[i].nodes_by_distance = 0;
kprintf("NUMA: %d, Linux NUMA: %d, type: %d\n", kprintf("NUMA: %d, Linux NUMA: %d, type: %d\n",
i, linux_numa_id, type); i, linux_numa_id, type);
@ -954,6 +955,72 @@ static void numa_init(void)
} }
} }
static void numa_distances_init()
{
int i, j, swapped;
for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) {
/* TODO: allocate on target node */
memory_nodes[i].nodes_by_distance =
ihk_mc_alloc_pages((sizeof(struct node_distance) *
ihk_mc_get_nr_numa_nodes() + PAGE_SIZE - 1)
>> PAGE_SHIFT, IHK_MC_AP_NOWAIT);
if (!memory_nodes[i].nodes_by_distance) {
kprintf("%s: error: allocating nodes_by_distance\n",
__FUNCTION__);
continue;
}
for (j = 0; j < ihk_mc_get_nr_numa_nodes(); ++j) {
memory_nodes[i].nodes_by_distance[j].node = j;
memory_nodes[i].nodes_by_distance[j].distance =
ihk_mc_get_numa_distance(i, j);
}
/* Sort by distance and node ID */
swapped = 1;
while (swapped) {
swapped = 0;
for (j = 1; j < ihk_mc_get_nr_numa_nodes(); ++j) {
if ((memory_nodes[i].nodes_by_distance[j - 1].distance >
memory_nodes[i].nodes_by_distance[j].distance) ||
((memory_nodes[i].nodes_by_distance[j - 1].distance ==
memory_nodes[i].nodes_by_distance[j].distance) &&
(memory_nodes[i].nodes_by_distance[j - 1].node >
memory_nodes[i].nodes_by_distance[j].node))) {
memory_nodes[i].nodes_by_distance[j - 1].node ^=
memory_nodes[i].nodes_by_distance[j].node;
memory_nodes[i].nodes_by_distance[j].node ^=
memory_nodes[i].nodes_by_distance[j - 1].node;
memory_nodes[i].nodes_by_distance[j - 1].node ^=
memory_nodes[i].nodes_by_distance[j].node;
memory_nodes[i].nodes_by_distance[j - 1].distance ^=
memory_nodes[i].nodes_by_distance[j].distance;
memory_nodes[i].nodes_by_distance[j].distance ^=
memory_nodes[i].nodes_by_distance[j - 1].distance;
memory_nodes[i].nodes_by_distance[j - 1].distance ^=
memory_nodes[i].nodes_by_distance[j].distance;
swapped = 1;
}
}
}
{
char buf[1024];
char *pbuf = buf;
pbuf += sprintf(pbuf, "NUMA %d distances: ", i);
for (j = 0; j < ihk_mc_get_nr_numa_nodes(); ++j) {
pbuf += sprintf(pbuf, "%d (%d), ",
memory_nodes[i].nodes_by_distance[j].node,
memory_nodes[i].nodes_by_distance[j].distance);
}
kprintf("%s\n", buf);
}
}
}
#define PHYS_PAGE_HASH_SHIFT (10) #define PHYS_PAGE_HASH_SHIFT (10)
#define PHYS_PAGE_HASH_SIZE (1 << PHYS_PAGE_HASH_SHIFT) #define PHYS_PAGE_HASH_SIZE (1 << PHYS_PAGE_HASH_SHIFT)
#define PHYS_PAGE_HASH_MASK (PHYS_PAGE_HASH_SIZE - 1) #define PHYS_PAGE_HASH_MASK (PHYS_PAGE_HASH_SIZE - 1)
@ -1235,6 +1302,9 @@ void mem_init(void)
kprintf("Demand paging on ANONYMOUS mappings enabled.\n"); kprintf("Demand paging on ANONYMOUS mappings enabled.\n");
anon_on_demand = 1; anon_on_demand = 1;
} }
/* Init distance vectors */
numa_distances_init();
} }
#define KMALLOC_TRACK_HASH_SHIFT (8) #define KMALLOC_TRACK_HASH_SHIFT (8)

6
lib/include/ihk/page_alloc.h
View File

@ -17,11 +17,17 @@
#include <list.h> #include <list.h>
/* XXX: Physical memory management shouldn't be part of IHK */ /* XXX: Physical memory management shouldn't be part of IHK */
struct node_distance {
int node;
int distance;
};
struct ihk_mc_numa_node { struct ihk_mc_numa_node {
int id; int id;
int linux_numa_id; int linux_numa_id;
int type; int type;
struct list_head allocators; struct list_head allocators;
struct node_distance *nodes_by_distance;
}; };
struct ihk_page_allocator_desc { struct ihk_page_allocator_desc {