ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocf: Added zeroing memory returned from mempool

Browse Source 
OCF requires memory retrived from mempool to be filled with zeros.

When mempool is created, information about element size is stored to be used
when new memory is retrived.

This is fix for issue #671

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
Change-Id: Ieb533e3bdae0665dae18e7b3a379da0ed843c35a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449155
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Michal Mielewczyk 2019-03-25 08:24:32 -04:00 committed by Jim Harris
parent b6abc16b05
commit b949f1318e
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/bdev/ocf/env/ocf_env.c vendored
View File

@ -52,7 +52,13 @@ static env_atomic g_env_allocator_index = 0;
void *
env_allocator_new(env_allocator *allocator)
{
return spdk_mempool_get(allocator);
void *mem = spdk_mempool_get(allocator->mempool);
if (spdk_likely(mem)) {
memset(mem, 0, allocator->element_size);
}
return mem;
}
env_allocator *
@ -63,10 +69,22 @@ env_allocator_create(uint32_t size, const char *name)
snprintf(qualified_name, 128, "ocf_env_%d", env_atomic_inc_return(&g_env_allocator_index));
allocator = spdk_mempool_create(qualified_name,
ENV_ALLOCATOR_NBUFS, size,
SPDK_MEMPOOL_DEFAULT_CACHE_SIZE,
SPDK_ENV_SOCKET_ID_ANY);
allocator = calloc(1, sizeof(*allocator));
if (!allocator) {
return NULL;
}
allocator->mempool = spdk_mempool_create(qualified_name,
ENV_ALLOCATOR_NBUFS, size,
SPDK_MEMPOOL_DEFAULT_CACHE_SIZE,
SPDK_ENV_SOCKET_ID_ANY);
if (!allocator->mempool) {
free(allocator);
return NULL;
}
allocator->element_size = size;
return allocator;
}
@ -74,19 +92,20 @@ env_allocator_create(uint32_t size, const char *name)
void
env_allocator_del(env_allocator *allocator, void *item)
{
spdk_mempool_put(allocator, item);
spdk_mempool_put(allocator->mempool, item);
}
void
env_allocator_destroy(env_allocator *allocator)
{
if (allocator) {
if (ENV_ALLOCATOR_NBUFS - spdk_mempool_count(allocator)) {
if (ENV_ALLOCATOR_NBUFS - spdk_mempool_count(allocator->mempool)) {
SPDK_ERRLOG("Not all objects deallocated\n");
assert(false);
}
spdk_mempool_free(allocator);
spdk_mempool_free(allocator->mempool);
free(allocator);
}
}

5
lib/bdev/ocf/env/ocf_env.h vendored
View File

@ -155,7 +155,10 @@ static inline uint64_t env_get_free_memory(void)
#define OCF_ALLOCATOR_NAME_MAX 128
typedef struct spdk_mempool env_allocator;
typedef struct {
struct spdk_mempool *mempool;
size_t element_size;
} env_allocator;
env_allocator *env_allocator_create(uint32_t size, const char *name);