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

Use request in instead of opaque ctx in cacheline concurrency

Browse Source 
Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-03-31 19:52:33 -05:00 committed by Kozlowski Mateusz
parent bd91b5b4ce
commit 4634885111
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/concurrency/ocf_cache_line_concurrency.c
View File

@ -37,8 +37,8 @@
struct __waiter { struct __waiter {
ocf_cache_line_t line; ocf_cache_line_t line;
uint32_t ctx_id; uint32_t entry_idx;
void *ctx; struct ocf_request *req;
ocf_req_async_lock_cb cb; ocf_req_async_lock_cb cb;
struct list_head item; struct list_head item;
int rw; int rw;
@ -378,15 +378,13 @@ static inline bool __try_lock_rd2rd(struct ocf_cache_line_concurrency *c,
* *
*/ */
static void _req_on_lock(struct ocf_cache_line_concurrency *c, static void _req_on_lock(struct ocf_cache_line_concurrency *c,
void *ctx, ocf_req_async_lock_cb cb, struct ocf_request *req, ocf_req_async_lock_cb cb,
uint32_t ctx_id, ocf_cache_line_t line, int rw) uint32_t entry_idx, ocf_cache_line_t line, int rw)
{ {
struct ocf_request *req = ctx;
if (rw == OCF_READ) if (rw == OCF_READ)
req->map[ctx_id].rd_locked = true; req->map[entry_idx].rd_locked = true;
else if (rw == OCF_WRITE) else if (rw == OCF_WRITE)
req->map[ctx_id].wr_locked = true; req->map[entry_idx].wr_locked = true;
else else
ENV_BUG(); ENV_BUG();
@ -404,7 +402,7 @@ static void _req_on_lock(struct ocf_cache_line_concurrency *c,
*/ */
static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c, static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
const ocf_cache_line_t line, ocf_req_async_lock_cb cb, const ocf_cache_line_t line, ocf_req_async_lock_cb cb,
void *ctx, uint32_t ctx_id) void *req, uint32_t entry_idx)
{ {
struct __waiter *waiter; struct __waiter *waiter;
bool waiting = false; bool waiting = false;
@ -414,7 +412,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)) {
/* lock was not owned by anyone */ /* lock was not owned by anyone */
_req_on_lock(c, ctx, cb, ctx_id, line, OCF_WRITE); _req_on_lock(c, req, cb, entry_idx, line, OCF_WRITE);
return true; return true;
} }
@ -432,8 +430,8 @@ static inline bool __lock_cache_line_wr(struct ocf_cache_line_concurrency *c,
/* Setup waiters filed */ /* Setup waiters filed */
waiter->line = line; waiter->line = line;
waiter->ctx = ctx; waiter->req = req;
waiter->ctx_id = ctx_id; waiter->entry_idx = entry_idx;
waiter->cb = cb; waiter->cb = cb;
waiter->rw = OCF_WRITE; waiter->rw = OCF_WRITE;
INIT_LIST_HEAD(&waiter->item); INIT_LIST_HEAD(&waiter->item);
@ -446,7 +444,7 @@ unlock:
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
if (!waiting) { if (!waiting) {
_req_on_lock(c, ctx, cb, ctx_id, line, OCF_WRITE); _req_on_lock(c, req, cb, entry_idx, line, OCF_WRITE);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
} }
@ -459,7 +457,7 @@ unlock:
*/ */
static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c, static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
const ocf_cache_line_t line, ocf_req_async_lock_cb cb, const ocf_cache_line_t line, ocf_req_async_lock_cb cb,
void *ctx, uint32_t ctx_id) void *req, uint32_t entry_idx)
{ {
struct __waiter *waiter; struct __waiter *waiter;
bool waiting = false; bool waiting = false;
@ -469,7 +467,7 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
if( __try_lock_rd_idle(c, line)) { if( __try_lock_rd_idle(c, line)) {
/* lock was not owned by anyone */ /* lock was not owned by anyone */
_req_on_lock(c, ctx, cb, ctx_id, line, OCF_READ); _req_on_lock(c, req, cb, entry_idx, line, OCF_READ);
return true; return true;
} }
@ -492,8 +490,8 @@ static inline bool __lock_cache_line_rd(struct ocf_cache_line_concurrency *c,
/* Setup waiters field */ /* Setup waiters field */
waiter->line = line; waiter->line = line;
waiter->ctx = ctx; waiter->req = req;
waiter->ctx_id = ctx_id; waiter->entry_idx = entry_idx;
waiter->cb = cb; waiter->cb = cb;
waiter->rw = OCF_READ; waiter->rw = OCF_READ;
INIT_LIST_HEAD(&waiter->item); INIT_LIST_HEAD(&waiter->item);
@ -506,7 +504,7 @@ unlock:
__unlock_waiters_list(c, line, flags); __unlock_waiters_list(c, line, flags);
if (!waiting) { if (!waiting) {
_req_on_lock(c, ctx, cb, ctx_id, line, OCF_READ); _req_on_lock(c, req, cb, entry_idx, line, OCF_READ);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
} }
@ -562,7 +560,7 @@ static inline void __unlock_cache_line_rd_common(struct ocf_cache_line_concurren
exchanged = false; exchanged = false;
list_del(iter); list_del(iter);
_req_on_lock(c, waiter->ctx, waiter->cb, waiter->ctx_id, _req_on_lock(c, waiter->req, waiter->cb, waiter->entry_idx,
line, waiter->rw); line, waiter->rw);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
@ -643,7 +641,7 @@ static inline void __unlock_cache_line_wr_common(struct ocf_cache_line_concurren
exchanged = false; exchanged = false;
list_del(iter); list_del(iter);
_req_on_lock(c, waiter->ctx, waiter->cb, waiter->ctx_id, line, _req_on_lock(c, waiter->req, waiter->cb, waiter->entry_idx, line,
waiter->rw); waiter->rw);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
@ -680,7 +678,7 @@ static inline void __unlock_cache_line_wr(struct ocf_cache_line_concurrency *c,
* so need to check lock state under a common lock. * so need to check lock state under a common lock.
*/ */
static inline void __remove_line_from_waiters_list(struct ocf_cache_line_concurrency *c, static inline void __remove_line_from_waiters_list(struct ocf_cache_line_concurrency *c,
struct ocf_request *req, int i, void *ctx, int rw) struct ocf_request *req, int i, int rw)
{ {
ocf_cache_line_t line = req->map[i].coll_idx; ocf_cache_line_t line = req->map[i].coll_idx;
uint32_t idx = _WAITERS_LIST_ITEM(line); uint32_t idx = _WAITERS_LIST_ITEM(line);
@ -700,7 +698,7 @@ static inline void __remove_line_from_waiters_list(struct ocf_cache_line_concurr
} else { } else {
list_for_each_safe(iter, next, &lst->head) { list_for_each_safe(iter, next, &lst->head) {
waiter = list_entry(iter, struct __waiter, item); waiter = list_entry(iter, struct __waiter, item);
if (waiter->ctx == ctx) { if (waiter->req == req) {
list_del(iter); list_del(iter);
env_allocator_del(c->allocator, waiter); env_allocator_del(c->allocator, waiter);
} }
@ -826,8 +824,7 @@ err:
if (!_ocf_req_needs_cl_lock(req, i)) if (!_ocf_req_needs_cl_lock(req, i))
continue; continue;
__remove_line_from_waiters_list(c, req, i, req, __remove_line_from_waiters_list(c, req, i ,OCF_READ);
OCF_READ);
} }
env_atomic_set(&req->lock_remaining, 0); env_atomic_set(&req->lock_remaining, 0);
env_atomic_dec(&c->waiting); env_atomic_dec(&c->waiting);
@ -955,8 +952,7 @@ err:
if (!_ocf_req_needs_cl_lock(req, i)) if (!_ocf_req_needs_cl_lock(req, i))
continue; continue;
__remove_line_from_waiters_list(c, req, i, req, __remove_line_from_waiters_list(c, req, i, OCF_WRITE);
OCF_WRITE);
} }
env_atomic_set(&req->lock_remaining, 0); env_atomic_set(&req->lock_remaining, 0);
env_atomic_dec(&c->waiting); env_atomic_dec(&c->waiting);