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

use MCS locks in physical memory allocator

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-17 14:21:44 +09:00
parent 9635a628a9
commit 701cdcdab1
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ struct ihk_page_allocator_desc {
unsigned int count; unsigned int count;
unsigned int flag; unsigned int flag;
unsigned int shift; unsigned int shift;
ihk_spinlock_t lock; mcs_lock_node_t lock;
struct list_head list; struct list_head list;
unsigned long map[0]; unsigned long map[0];

51
lib/page_alloc.c
View File

@ -73,7 +73,7 @@ void *__ihk_pagealloc_init(unsigned long start, unsigned long size,
//kprintf("page allocator @ %lx - %lx (%d)\n", start, start + size, //kprintf("page allocator @ %lx - %lx (%d)\n", start, start + size,
// page_shift); // page_shift);
ihk_mc_spinlock_init(&desc->lock); mcs_lock_init(&desc->lock);
/* Reserve align padding area */ /* Reserve align padding area */
for (i = mapsize; i < mapaligned * 8; i++) { for (i = mapsize; i < mapaligned * 8; i++) {
@ -99,12 +99,12 @@ void ihk_pagealloc_destroy(void *__desc)
static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc, static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc,
int npages, int p2align) int npages, int p2align)
{ {
unsigned long flags;
unsigned int i, j, mi; unsigned int i, j, mi;
int nblocks; int nblocks;
int nfrags; int nfrags;
unsigned long mask; unsigned long mask;
unsigned long align_mask = ((PAGE_SIZE << p2align) - 1); unsigned long align_mask = ((PAGE_SIZE << p2align) - 1);
mcs_lock_node_t node;
nblocks = (npages / 64); nblocks = (npages / 64);
mask = -1; mask = -1;
@ -114,7 +114,7 @@ static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc,
mask = (1UL << nfrags) - 1; mask = (1UL << nfrags) - 1;
} }
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
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;
@ -132,11 +132,11 @@ static unsigned long __ihk_pagealloc_large(struct ihk_page_allocator_desc *desc,
desc->map[j] = (unsigned long)-1; desc->map[j] = (unsigned long)-1;
} }
desc->map[j] |= mask; desc->map[j] |= mask;
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
return ADDRESS(desc, mi, 0); return ADDRESS(desc, mi, 0);
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
return 0; return 0;
} }
@ -146,8 +146,9 @@ unsigned long ihk_pagealloc_alloc(void *__desc, int npages, int p2align)
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
unsigned int i, mi; unsigned int i, mi;
int j; int j;
unsigned long v, mask, flags; unsigned long v, mask;
int jalign; int jalign;
mcs_lock_node_t node;
if ((npages >= 32) || (p2align >= 5)) { if ((npages >= 32) || (p2align >= 5)) {
return __ihk_pagealloc_large(desc, npages, p2align); return __ihk_pagealloc_large(desc, npages, p2align);
@ -156,7 +157,7 @@ unsigned long ihk_pagealloc_alloc(void *__desc, int npages, int p2align)
mask = (1UL << npages) - 1; mask = (1UL << npages) - 1;
jalign = (p2align <= 0)? 1: (1 << p2align); jalign = (p2align <= 0)? 1: (1 << p2align);
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
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;
@ -173,12 +174,12 @@ unsigned long ihk_pagealloc_alloc(void *__desc, int npages, int p2align)
if (!(v & (mask << j))) { /* free */ if (!(v & (mask << j))) { /* free */
desc->map[mi] |= (mask << j); desc->map[mi] |= (mask << j);
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
return ADDRESS(desc, mi, j); return ADDRESS(desc, mi, j);
} }
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
/* We use null pointer for failure */ /* We use null pointer for failure */
return 0; return 0;
@ -188,7 +189,7 @@ void ihk_pagealloc_reserve(void *__desc, unsigned long start, unsigned long end)
{ {
int i, n; int i, n;
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
unsigned long flags; mcs_lock_node_t node;
n = (end + (1 << desc->shift) - 1 - desc->start) >> desc->shift; n = (end + (1 << desc->shift) - 1 - desc->start) >> desc->shift;
i = ((start - desc->start) >> desc->shift); i = ((start - desc->start) >> desc->shift);
@ -196,7 +197,7 @@ void ihk_pagealloc_reserve(void *__desc, unsigned long start, unsigned long end)
return; return;
} }
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
for (; i < n; i++) { for (; i < n; i++) {
if (!(i & 63) && i + 63 < n) { if (!(i & 63) && i + 63 < n) {
desc->map[MAP_INDEX(i)] = (unsigned long)-1L; desc->map[MAP_INDEX(i)] = (unsigned long)-1L;
@ -205,7 +206,7 @@ void ihk_pagealloc_reserve(void *__desc, unsigned long start, unsigned long end)
desc->map[MAP_INDEX(i)] |= (1UL << MAP_BIT(i)); desc->map[MAP_INDEX(i)] |= (1UL << MAP_BIT(i));
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
} }
void ihk_pagealloc_free(void *__desc, unsigned long address, int npages) void ihk_pagealloc_free(void *__desc, unsigned long address, int npages)
@ -213,24 +214,24 @@ void ihk_pagealloc_free(void *__desc, unsigned long address, int npages)
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
int i; int i;
unsigned mi; unsigned mi;
unsigned long flags; mcs_lock_node_t node;
/* XXX: Parameter check */ /* XXX: Parameter check */
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
mi = (address - desc->start) >> desc->shift; mi = (address - desc->start) >> desc->shift;
for (i = 0; i < npages; i++, mi++) { for (i = 0; i < npages; i++, mi++) {
desc->map[MAP_INDEX(mi)] &= ~(1UL << MAP_BIT(mi)); desc->map[MAP_INDEX(mi)] &= ~(1UL << MAP_BIT(mi));
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
} }
unsigned long ihk_pagealloc_count(void *__desc) unsigned long ihk_pagealloc_count(void *__desc)
{ {
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
unsigned long i, j, n = 0; unsigned long i, j, n = 0;
unsigned long flags; mcs_lock_node_t node;
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
/* XXX: Very silly counting */ /* XXX: Very silly counting */
for (i = 0; i < desc->count; i++) { for (i = 0; i < desc->count; i++) {
for (j = 0; j < 64; j++) { for (j = 0; j < 64; j++) {
@ -239,7 +240,7 @@ unsigned long ihk_pagealloc_count(void *__desc)
} }
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
return n; return n;
} }
@ -249,10 +250,11 @@ int ihk_pagealloc_query_free(void *__desc)
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
unsigned int mi; unsigned int mi;
int j; int j;
unsigned long v, flags; unsigned long v;
int npages = 0; int npages = 0;
mcs_lock_node_t node;
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
for (mi = 0; mi < desc->count; mi++) { for (mi = 0; mi < desc->count; mi++) {
v = desc->map[mi]; v = desc->map[mi];
@ -265,7 +267,7 @@ int ihk_pagealloc_query_free(void *__desc)
} }
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
return npages; return npages;
} }
@ -275,11 +277,12 @@ void __ihk_pagealloc_zero_free_pages(void *__desc)
struct ihk_page_allocator_desc *desc = __desc; struct ihk_page_allocator_desc *desc = __desc;
unsigned int mi; unsigned int mi;
int j; int j;
unsigned long v, flags; unsigned long v;
mcs_lock_node_t node;
kprintf("zeroing free memory... "); kprintf("zeroing free memory... ");
flags = ihk_mc_spinlock_lock(&desc->lock); mcs_lock_lock(&desc->lock, &node);
for (mi = 0; mi < desc->count; mi++) { for (mi = 0; mi < desc->count; mi++) {
v = desc->map[mi]; v = desc->map[mi];
@ -293,7 +296,7 @@ kprintf("zeroing free memory... ");
} }
} }
} }
ihk_mc_spinlock_unlock(&desc->lock, flags); mcs_lock_unlock(&desc->lock, &node);
kprintf("\nzeroing done\n"); kprintf("\nzeroing done\n");
} }