github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error handling in cacheline concurrency init

Browse Source 
Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-02-24 17:29:36 -06:00
parent d8f25d2742
commit 0f34e46375
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/concurrency/ocf_cache_line_concurrency.c
View File

@ -79,17 +79,16 @@ int ocf_cache_line_concurrency_init(struct ocf_cache *cache)
OCF_DEBUG_TRACE(cache); OCF_DEBUG_TRACE(cache);
c = env_vmalloc(sizeof(*c)); c = env_vzalloc(sizeof(*c));
if (!c) { if (!c) {
error = __LINE__; error = __LINE__;
goto ocf_cache_line_concurrency_init; goto exit_err;
} }
error = env_mutex_init(&c->lock); error = env_mutex_init(&c->lock);
if (error) { if (error) {
env_vfree(c);
error = __LINE__; error = __LINE__;
goto ocf_cache_line_concurrency_init; goto rwsem_err;
} }
cache->device->concurrency.cache_line = c; cache->device->concurrency.cache_line = c;
@ -100,41 +99,54 @@ int ocf_cache_line_concurrency_init(struct ocf_cache *cache)
if (!c->access) { if (!c->access) {
error = __LINE__; error = __LINE__;
goto ocf_cache_line_concurrency_init; goto allocation_err;
} }
if (snprintf(name, sizeof(name), ALLOCATOR_NAME_FMT, if (snprintf(name, sizeof(name), ALLOCATOR_NAME_FMT,
ocf_cache_get_name(cache)) < 0) { ocf_cache_get_name(cache)) < 0) {
error = __LINE__; error = __LINE__;
goto ocf_cache_line_concurrency_init; goto allocation_err;
} }
c->allocator = env_allocator_create(sizeof(struct __waiter), name); c->allocator = env_allocator_create(sizeof(struct __waiter), name);
if (!c->allocator) { if (!c->allocator) {
error = __LINE__; error = __LINE__;
goto ocf_cache_line_concurrency_init; goto allocation_err;
} }
/* Init concurrency control table */ /* Init concurrency control table */
for (i = 0; i < _WAITERS_LIST_ENTRIES; i++) { for (i = 0; i < _WAITERS_LIST_ENTRIES; i++) {
INIT_LIST_HEAD(&c->waiters_lsts[i].head); INIT_LIST_HEAD(&c->waiters_lsts[i].head);
error = env_spinlock_init(&c->waiters_lsts[i].lock); error = env_spinlock_init(&c->waiters_lsts[i].lock);
if (error) if (error) {
error = __LINE__;
goto spinlock_err; goto spinlock_err;
} }
}
return 0; return 0;
spinlock_err: spinlock_err:
while (i--) while (i--)
env_spinlock_destroy(&c->waiters_lsts[i].lock); env_spinlock_destroy(&c->waiters_lsts[i].lock);
ocf_cache_line_concurrency_init:
allocation_err:
if (c->allocator)
env_allocator_destroy(c->allocator);
if (c->access)
OCF_REALLOC_DEINIT(&c->access, &c->access_limit);
rwsem_err:
env_mutex_destroy(&c->lock);
exit_err:
ocf_cache_log(cache, log_err, "Cannot initialize cache concurrency, " ocf_cache_log(cache, log_err, "Cannot initialize cache concurrency, "
"ERROR %d", error); "ERROR %d", error);
if (c)
env_vfree(c);
if (cache->device->concurrency.cache_line) cache->device->concurrency.cache_line = NULL;
ocf_cache_line_concurrency_deinit(cache);
return -1; return -1;
} }