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

Relax allocations requirements

Browse Source 
CAS does not need atomic alocations virtually anywhere. GFP_NOIO
should be sufficient in IO path. When allocation buffers during
module initialization use GFP_KERNEL.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2019-10-18 19:16:20 -04:00
parent f9f00df576
commit 9b8fdde201
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cas_cache/context.c
View File

@ -55,7 +55,7 @@ void *_cas_alloc_page_rpool(void *allocator_ctx, int cpu)
{ {
struct page *page; struct page *page;
page = alloc_page(GFP_NOIO | __GFP_NORETRY); page = alloc_page(GFP_KERNEL);
if (!page) if (!page)
return NULL; return NULL;

14
modules/cas_cache/ocf_env.c
View File

@ -34,7 +34,7 @@ static inline size_t env_allocator_align(size_t size)
} }
struct _env_allocator_item { struct _env_allocator_item {
uint32_t flags; uint32_t from_rpool;
uint32_t cpu; uint32_t cpu;
char data[]; char data[];
}; };
@ -49,7 +49,7 @@ void *env_allocator_new(env_allocator *allocator)
memset(item->data, 0, allocator->item_size - memset(item->data, 0, allocator->item_size -
sizeof(struct _env_allocator_item)); sizeof(struct _env_allocator_item));
} else { } else {
item = kmem_cache_zalloc(allocator->kmem_cache, GFP_ATOMIC); item = kmem_cache_zalloc(allocator->kmem_cache, GFP_NOIO);
} }
if (item) { if (item) {
@ -66,11 +66,10 @@ 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;
item = kmem_cache_zalloc(allocator->kmem_cache, GFP_NOIO | item = kmem_cache_zalloc(allocator->kmem_cache, GFP_KERNEL);
__GFP_NORETRY);
if (item) { if (item) {
item->flags = (GFP_NOIO | __GFP_NORETRY); item->from_rpool = 1;
item->cpu = cpu; item->cpu = cpu;
} }
@ -176,9 +175,10 @@ void env_allocator_del(env_allocator *allocator, void *obj)
atomic_dec(&allocator->count); atomic_dec(&allocator->count);
if (item->flags == (GFP_NOIO | __GFP_NORETRY) && if (item->from_rpool && !cas_rpool_try_put(allocator->rpool, item,
!cas_rpool_try_put(allocator->rpool, item, item->cpu)) item->cpu)) {
return; return;
}
kmem_cache_free(allocator->kmem_cache, item); kmem_cache_free(allocator->kmem_cache, item);
} }

1
modules/cas_cache/ocf_env.h
View File

@ -18,7 +18,6 @@
#define ENV_MEM_NORMAL GFP_KERNEL #define ENV_MEM_NORMAL GFP_KERNEL
#define ENV_MEM_NOIO GFP_NOIO #define ENV_MEM_NOIO GFP_NOIO
#define ENV_MEM_ATOMIC GFP_ATOMIC
static inline uint64_t env_get_free_memory(void) static inline uint64_t env_get_free_memory(void)
{ {

2
modules/cas_cache/volume/vol_atomic_dev_bottom.c
View File

@ -721,7 +721,7 @@ static int cas_atomic_submit_discard_bio(struct cas_atomic_io *atom)
int offset; int offset;
unsigned long *cmd_addr = blk_mq_rq_to_pdu(req); unsigned long *cmd_addr = blk_mq_rq_to_pdu(req);
nvm_discard = kmalloc(sizeof(*nvm_discard), GFP_ATOMIC); nvm_discard = kmalloc(sizeof(*nvm_discard), GFP_NOIO);
if (!nvm_discard) { if (!nvm_discard) {
return -ENOMEM; return -ENOMEM;
} }

8
modules/cas_cache/volume/vol_block_dev_top.c
View File

@ -187,7 +187,7 @@ static int _blockdev_alloc_many_requests(ocf_core_t core,
flags = 0; flags = 0;
} }
data = cas_alloc_blk_data(bio_segments(bio), GFP_ATOMIC); data = cas_alloc_blk_data(bio_segments(bio), GFP_NOIO);
if (!data) { if (!data) {
CAS_PRINT_RL(KERN_CRIT "BIO data vector allocation error\n"); CAS_PRINT_RL(KERN_CRIT "BIO data vector allocation error\n");
error = -ENOMEM; error = -ENOMEM;
@ -420,7 +420,7 @@ static int __block_dev_queue_rq(struct request *rq, ocf_core_t core)
} }
if (single_io) { if (single_io) {
data = cas_alloc_blk_data(size, GFP_ATOMIC); data = cas_alloc_blk_data(size, GFP_NOIO);
if (data == NULL) { if (data == NULL) {
CAS_PRINT_RL(KERN_CRIT CAS_PRINT_RL(KERN_CRIT
"Out of memory. Ending IO processing.\n"); "Out of memory. Ending IO processing.\n");
@ -445,7 +445,7 @@ static int __block_dev_queue_rq(struct request *rq, ocf_core_t core)
} else { } else {
struct list_head list = LIST_HEAD_INIT(list); struct list_head list = LIST_HEAD_INIT(list);
data = cas_alloc_blk_data(0, GFP_ATOMIC); data = cas_alloc_blk_data(0, GFP_NOIO);
if (data == NULL) { if (data == NULL) {
printk(KERN_CRIT printk(KERN_CRIT
"Out of memory. Ending IO processing.\n"); "Out of memory. Ending IO processing.\n");
@ -753,7 +753,7 @@ static int _blockdev_make_request_fast(struct casdsk_disk *dsk,
return CASDSK_BIO_HANDLED; return CASDSK_BIO_HANDLED;
} }
data = cas_alloc_blk_data(bio_segments(bio), GFP_ATOMIC); data = cas_alloc_blk_data(bio_segments(bio), GFP_NOIO);
if (!data) { if (!data) {
CAS_PRINT_RL(KERN_CRIT "BIO data vector allocation error\n"); CAS_PRINT_RL(KERN_CRIT "BIO data vector allocation error\n");
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM)); CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM));

4
modules/cas_disk/exp_obj.c
View File

@ -108,13 +108,13 @@ static inline void _casdsk_exp_obj_handle_bio_pt(struct casdsk_disk *dsk,
struct bio *cloned_bio; struct bio *cloned_bio;
struct casdsk_exp_obj_pt_io_ctx *io; struct casdsk_exp_obj_pt_io_ctx *io;
io = kmem_cache_zalloc(casdsk_module->pt_io_ctx_cache, GFP_ATOMIC); io = kmem_cache_zalloc(casdsk_module->pt_io_ctx_cache, GFP_NOIO);
if (!io) { if (!io) {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM)); CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM));
return; return;
} }
cloned_bio = cas_bio_clone(bio, GFP_ATOMIC); cloned_bio = cas_bio_clone(bio, GFP_NOIO);
if (!cloned_bio) { if (!cloned_bio) {
kmem_cache_free(casdsk_module->pt_io_ctx_cache, io); kmem_cache_free(casdsk_module->pt_io_ctx_cache, io);
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM)); CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(-ENOMEM));