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

__ihk_pagealloc_large(): fix 1GB page alignment bug

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-07 09:38:37 +09:00
parent 461881e46a
commit 011185e3f7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/page_alloc.c
View File

@@ -104,7 +104,7 @@ static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc,
int nblocks; int nblocks;
int nfrags; int nfrags;
unsigned long mask; unsigned long mask;
int mialign; unsigned long align_mask = ((PAGE_SIZE << p2align) - 1);
nblocks = (npages / 64); nblocks = (npages / 64);
mask = -1; mask = -1;
@@ -113,14 +113,13 @@ static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc,
++nblocks; ++nblocks;
mask = (1UL << nfrags) - 1; mask = (1UL << nfrags) - 1;
} }
mialign = (p2align <= 6)? 1: (1 << (p2align - 6));
flags = ihk_mc_spinlock_lock(&desc->lock); flags = ihk_mc_spinlock_lock(&desc->lock);
for (i = 0, mi = desc->last; i < desc->count; i++, mi++) { for (i = 0, mi = desc->last; i < desc->count; i++, mi++) {
if (mi >= desc->count) { if (mi >= desc->count) {
mi = 0; mi = 0;
} }
if ((mi + nblocks >= desc->count) || (mi % mialign)) { if ((mi + nblocks >= desc->count) || (ADDRESS(desc, mi, 0) & align_mask)) {
continue; continue;
} }
for (j = mi; j < mi + nblocks - 1; j++) { for (j = mi; j < mi + nblocks - 1; j++) {