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

mckernel_allocate_aligned_pages_node(): support explicit NUMA node designation

Browse Source
This commit is contained in:
Balazs Gerofi
2017-03-09 23:08:45 +09:00
parent 746b459e7f
commit c5079898c2
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/mem.c
View File

@ -506,9 +506,9 @@ static void *mckernel_allocate_aligned_pages_node(int npages, int p2align,
!cpu_local_var(current)->vm) !cpu_local_var(current)->vm)
goto distance_based; goto distance_based;
/* User requested policy? */ /* No explicitly requested NUMA or user policy? */
if (!(flag & IHK_MC_AP_USER) || if ((pref_node == -1) && (!(flag & IHK_MC_AP_USER) ||
cpu_local_var(current)->vm->numa_mem_policy == MPOL_DEFAULT) { cpu_local_var(current)->vm->numa_mem_policy == MPOL_DEFAULT)) {
goto distance_based; goto distance_based;
} }
@ -516,6 +516,32 @@ static void *mckernel_allocate_aligned_pages_node(int npages, int p2align,
if (!memory_nodes[node].nodes_by_distance) if (!memory_nodes[node].nodes_by_distance)
goto order_based; goto order_based;
/* Explicit valid node? */
if (pref_node > -1 && pref_node < ihk_mc_get_nr_numa_nodes()) {
list_for_each_entry(pa_allocator,
&memory_nodes[pref_node].allocators, list) {
pa = ihk_pagealloc_alloc(pa_allocator, npages, p2align);
if (pa) {
dkprintf("%s: explicit (node: %d) CPU @ node %d allocated "
"%d pages from node %d\n",
__FUNCTION__,
pref_node,
ihk_mc_get_numa_id(),
npages, node);
return phys_to_virt(pa);
}
else {
#ifdef PROFILE_ENABLE
//profile_event_add(PROFILE_numa_alloc_missed, npages * 4096);
#endif
dkprintf("%s: couldn't fulfill explicit NUMA request for %d pages\n",
__FUNCTION__, npages);
}
}
}
switch (cpu_local_var(current)->vm->numa_mem_policy) { switch (cpu_local_var(current)->vm->numa_mem_policy) {
case MPOL_BIND: case MPOL_BIND:
case MPOL_PREFERRED: case MPOL_PREFERRED:
@ -564,7 +590,9 @@ static void *mckernel_allocate_aligned_pages_node(int npages, int p2align,
return phys_to_virt(pa); return phys_to_virt(pa);
} }
else { else {
#ifdef PROFILE_ENABLE
profile_event_add(PROFILE_mpol_alloc_missed, npages * 4096); profile_event_add(PROFILE_mpol_alloc_missed, npages * 4096);
#endif
dkprintf("%s: couldn't fulfill user policy for %d pages\n", dkprintf("%s: couldn't fulfill user policy for %d pages\n",
__FUNCTION__, npages); __FUNCTION__, npages);
} }