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

cacheline concurrency: move allocation outside critical section

Browse Source 
Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2019-10-18 18:33:32 -04:00
parent 07b1f0c064
commit 6423c48dfe
1 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/concurrency/ocf_cache_line_concurrency.c
View File

@ -407,6 +407,14 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
return true; return true;
} }
waiter = NULL;
if (cb) {
/* Need to create waiter */
waiter = env_allocator_new(c->allocator);
if (!waiter)
return false;
}
__lock_waiters_list(c, line, flags); __lock_waiters_list(c, line, flags);
/* At the moment list is protected, double check if the cache line is /* At the moment list is protected, double check if the cache line is
@ -415,13 +423,7 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
if (__try_lock_wr(c, line)) { if (__try_lock_wr(c, line)) {
/* Look get */ /* Look get */
locked = true; locked = true;
} else { } else if (cb) {
waiter = NULL;
if (cb != NULL) {
/* Need to create waiters and add it into list */
waiter = env_allocator_new(c->allocator);
}
if (waiter) {
/* Setup waiters filed */ /* Setup waiters filed */
waiter->line = line; waiter->line = line;
waiter->ctx = ctx; waiter->ctx = ctx;
@ -434,12 +436,13 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
__add_waiter(c, line, waiter); __add_waiter(c, line, waiter);
waiting = true; waiting = true;
} }
}
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
if (locked && cb) if (locked && cb)
_req_on_lock(ctx, cb, ctx_id, line, OCF_WRITE); _req_on_lock(ctx, cb, ctx_id, line, OCF_WRITE);
if (!waiting && waiter)
env_allocator_del(c->allocator, waiter);
return locked || waiting; return locked || waiting;
} }
@ -464,6 +467,9 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
return true; return true;
} }
waiter = NULL;
repeat:
/* Lock waiters list */ /* Lock waiters list */
__lock_waiters_list(c, line, flags); __lock_waiters_list(c, line, flags);
@ -474,16 +480,22 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
if (__try_lock_rd(c, line)) { if (__try_lock_rd(c, line)) {
/* Cache line locked */ /* Cache line locked */
locked = true; locked = true;
goto unlock;
} }
} }
if (!locked) { if (!cb)
waiter = NULL; goto unlock;
if (cb) {
if (!waiter) {
/* Need to create waiters and add it into list */ /* Need to create waiters and add it into list */
__unlock_waiters_list(c, line, flags);
waiter = env_allocator_new(c->allocator); waiter = env_allocator_new(c->allocator);
if (!waiter)
goto end;
goto repeat;
} }
if (waiter) {
/* Setup waiters field */ /* Setup waiters field */
waiter->line = line; waiter->line = line;
waiter->ctx = ctx; waiter->ctx = ctx;
@ -495,13 +507,15 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
/* Add to waiters list */ /* Add to waiters list */
__add_waiter(c, line, waiter); __add_waiter(c, line, waiter);
waiting = true; waiting = true;
}
}
unlock:
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
end:
if (locked && cb) if (locked && cb)
_req_on_lock(ctx, cb, ctx_id, line, OCF_READ); _req_on_lock(ctx, cb, ctx_id, line, OCF_READ);
if (!waiting && waiter)
env_allocator_del(c->allocator, waiter);
return locked || waiting; return locked || waiting;
} }