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

__mckernel_free_pages_in_allocator(): fix deallocation of invalid physical range

Browse Source
This commit is contained in:
Balazs Gerofi
2017-07-04 12:15:40 +09:00
parent 2189c55d99
commit f81722c63b
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/mem.c
View File

@ -693,24 +693,34 @@ static void __mckernel_free_pages_in_allocator(void *va, int npages)
unsigned long pa_start = virt_to_phys(va); unsigned long pa_start = virt_to_phys(va);
unsigned long pa_end = pa_start + (npages * PAGE_SIZE); unsigned long pa_end = pa_start + (npages * PAGE_SIZE);
#ifdef IHK_RBTREE_ALLOCATOR
for (i = 0; i < ihk_mc_get_nr_memory_chunks(); ++i) {
unsigned long start, end;
int numa_id;
ihk_mc_get_memory_chunk(i, &start, &end, &numa_id);
if (start > pa_start || end < pa_end) {
continue;
}
ihk_numa_free_pages(&memory_nodes[numa_id], pa_start, npages);
#ifdef ENABLE_RUSAGE
rusage_numa_sub(numa_id, npages * PAGE_SIZE);
#endif
break;
}
#else
struct ihk_page_allocator_desc *pa_allocator;
/* Find corresponding memory allocator */ /* Find corresponding memory allocator */
for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) { for (i = 0; i < ihk_mc_get_nr_numa_nodes(); ++i) {
#ifdef IHK_RBTREE_ALLOCATOR
{
if (pa_start >= memory_nodes[i].min_addr &&
pa_end <= memory_nodes[i].max_addr) {
ihk_numa_free_pages(&memory_nodes[i], pa_start, npages);
#else
struct ihk_page_allocator_desc *pa_allocator;
list_for_each_entry(pa_allocator, list_for_each_entry(pa_allocator,
&memory_nodes[i].allocators, list) { &memory_nodes[i].allocators, list) {
if (pa_start >= pa_allocator->start && if (pa_start >= pa_allocator->start &&
pa_end <= pa_allocator->end) { pa_end <= pa_allocator->end) {
ihk_pagealloc_free(pa_allocator, pa_start, npages); ihk_pagealloc_free(pa_allocator, pa_start, npages);
#endif
#ifdef ENABLE_RUSAGE #ifdef ENABLE_RUSAGE
rusage_numa_sub(i, npages * PAGE_SIZE); rusage_numa_sub(i, npages * PAGE_SIZE);
#endif #endif
@ -718,6 +728,7 @@ static void __mckernel_free_pages_in_allocator(void *va, int npages)
} }
} }
} }
#endif
} }