github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #368 from arutk/rpool_debug

Browse Source 
Runtime checks for allocator rpool consistency
This commit is contained in:
Robert Baldyga 2020-03-25 15:09:20 +01:00 committed by GitHub
commit af6d3e9d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/cas_cache/ocf_env.c
View File

@ -34,8 +34,9 @@ static inline size_t env_allocator_align(size_t size)
} }
struct _env_allocator_item { struct _env_allocator_item {
uint32_t from_rpool;
uint32_t cpu; uint32_t cpu;
uint8_t from_rpool : 1;
uint8_t used : 1;
char data[]; char data[];
}; };
@ -48,12 +49,14 @@ void *env_allocator_new(env_allocator *allocator)
if (item) { if (item) {
memset(item->data, 0, allocator->item_size - memset(item->data, 0, allocator->item_size -
sizeof(struct _env_allocator_item)); sizeof(struct _env_allocator_item));
BUG_ON(item->used);
} else { } else {
item = kmem_cache_zalloc(allocator->kmem_cache, GFP_NOIO); item = kmem_cache_zalloc(allocator->kmem_cache, GFP_NOIO);
} }
if (item) { if (item) {
item->cpu = cpu; item->cpu = cpu;
item->used = 1;
atomic_inc(&allocator->count); atomic_inc(&allocator->count);
return &item->data; return &item->data;
} else { } else {
@ -61,7 +64,7 @@ void *env_allocator_new(env_allocator *allocator)
} }
} }
void *env_allocator_new_rpool(void *allocator_ctx, int cpu) static void *env_allocator_new_rpool(void *allocator_ctx, int cpu)
{ {
env_allocator *allocator = (env_allocator*) allocator_ctx; env_allocator *allocator = (env_allocator*) allocator_ctx;
struct _env_allocator_item *item; struct _env_allocator_item *item;
@ -76,10 +79,13 @@ void *env_allocator_new_rpool(void *allocator_ctx, int cpu)
return item; return item;
} }
void env_allocator_del_rpool(void *allocator_ctx, void *item) static void env_allocator_del_rpool(void *allocator_ctx, void *_item)
{ {
struct _env_allocator_item *item = _item;
env_allocator *allocator = (env_allocator* ) allocator_ctx; env_allocator *allocator = (env_allocator* ) allocator_ctx;
BUG_ON(item->used);
kmem_cache_free(allocator->kmem_cache, item); kmem_cache_free(allocator->kmem_cache, item);
} }
@ -175,6 +181,9 @@ void env_allocator_del(env_allocator *allocator, void *obj)
atomic_dec(&allocator->count); atomic_dec(&allocator->count);
BUG_ON(!item->used);
item->used = 0;
if (item->from_rpool && !cas_rpool_try_put(allocator->rpool, item, if (item->from_rpool && !cas_rpool_try_put(allocator->rpool, item,
item->cpu)) { item->cpu)) {
return; return;