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

Add LOOKUP_REMAPPED status to allow iterative cacheline lock

Browse Source 
Allowing request cacheline lock to be called on partially
locked request. This is going to be usefull for upcomming
eviction improvements, where request will first have evicted
(LOOKUP_REMAPPED) cachelines assigned to it in a locked state,
followed by standard request cacheline lock call in order to
lock previously inserted (LOOKUP_HIT) or mapped from freelist
(LOOKUP_INSERTED) cachelines.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-03-05 11:20:46 +01:00
parent b34f5fd721
commit 07d1079baa
3 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/concurrency/ocf_cache_line_concurrency.c
View File

@ -710,9 +710,19 @@ static inline void __remove_line_from_waiters_list(struct ocf_cache_line_concurr
__unlock_waiters_list(c, line, flags);
}
static inline bool _ocf_req_needs_cl_lock(struct ocf_request *req, unsigned entry)
{
/* Remapped cachelines are assigned cacheline lock individually
* during eviction
*/
return req->map[entry].status != LOOKUP_MISS &&
req->map[entry].status != LOOKUP_REMAPPED;
}
/* Try to read-lock request without adding waiters. Function should be called
* under read lock, multiple threads may attempt to acquire the lock
* concurrently. */
* concurrently.
*/
static int _ocf_req_trylock_rd(struct ocf_cache_line_concurrency *c,
struct ocf_request *req)
{
@ -725,8 +735,8 @@ static int _ocf_req_trylock_rd(struct ocf_cache_line_concurrency *c,
ENV_BUG_ON(env_atomic_read(&req->lock_remaining));
for (i = 0; i < req->core_line_count; i++) {
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (!_ocf_req_needs_cl_lock(req, i)) {
/* nothing to lock */
continue;
}
@ -750,6 +760,11 @@ static int _ocf_req_trylock_rd(struct ocf_cache_line_concurrency *c,
if (ret == OCF_LOCK_NOT_ACQUIRED) {
/* Request is not locked, discard acquired locks */
for (; i >= 0; i--) {
if (!_ocf_req_needs_cl_lock(req, i)) {
/* nothing to discard */
continue;
}
line = req->map[i].coll_idx;
if (req->map[i].rd_locked) {
@ -781,8 +796,8 @@ static int _ocf_req_lock_rd(struct ocf_cache_line_concurrency *c,
for (i = 0; i < req->core_line_count; i++) {
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (!_ocf_req_needs_cl_lock(req, i)) {
/* nothing to lock */
env_atomic_dec(&req->lock_remaining);
continue;
}
@ -808,6 +823,9 @@ static int _ocf_req_lock_rd(struct ocf_cache_line_concurrency *c,
err:
for (; i >= 0; i--) {
if (!_ocf_req_needs_cl_lock(req, i))
continue;
__remove_line_from_waiters_list(c, req, i, req,
OCF_READ);
}
@ -847,8 +865,8 @@ static int _ocf_req_trylock_wr(struct ocf_cache_line_concurrency *c,
ENV_BUG_ON(env_atomic_read(&req->lock_remaining));
for (i = 0; i < req->core_line_count; i++) {
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (!_ocf_req_needs_cl_lock(req, i)) {
/* nothing to lock */
continue;
}
@ -872,6 +890,9 @@ static int _ocf_req_trylock_wr(struct ocf_cache_line_concurrency *c,
if (ret == OCF_LOCK_NOT_ACQUIRED) {
/* Request is not locked, discard acquired locks */
for (; i >= 0; i--) {
if (!_ocf_req_needs_cl_lock(req, i))
continue;
line = req->map[i].coll_idx;
if (req->map[i].wr_locked) {
@ -904,8 +925,8 @@ static int _ocf_req_lock_wr(struct ocf_cache_line_concurrency *c,
for (i = 0; i < req->core_line_count; i++) {
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (!_ocf_req_needs_cl_lock(req, i)) {
/* nothing to lock */
env_atomic_dec(&req->lock_remaining);
continue;
}
@ -931,6 +952,9 @@ static int _ocf_req_lock_wr(struct ocf_cache_line_concurrency *c,
err:
for (; i >= 0; i--) {
if (!_ocf_req_needs_cl_lock(req, i))
continue;
__remove_line_from_waiters_list(c, req, i, req,
OCF_WRITE);
}
@ -968,13 +992,10 @@ void ocf_req_unlock_rd(struct ocf_cache_line_concurrency *c, struct ocf_request
OCF_DEBUG_RQ(req, "Unlock");
for (i = 0; i < req->core_line_count; i++) {
ENV_BUG_ON(req->map[i].wr_locked);
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (req->map[i].status == LOOKUP_MISS)
continue;
}
if (!req->map[i].rd_locked)
continue;
@ -1001,10 +1022,8 @@ void ocf_req_unlock_wr(struct ocf_cache_line_concurrency *c, struct ocf_request
for (i = 0; i < req->core_line_count; i++) {
ENV_BUG_ON(req->map[i].rd_locked);
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (req->map[i].status == LOOKUP_MISS)
continue;
}
if (!req->map[i].wr_locked)
continue;
@ -1029,11 +1048,8 @@ void ocf_req_unlock(struct ocf_cache_line_concurrency *c, struct ocf_request *re
OCF_DEBUG_RQ(req, "Unlock");
for (i = 0; i < req->core_line_count; i++) {
if (req->map[i].status == LOOKUP_MISS) {
/* MISS nothing to lock */
if (req->map[i].status == LOOKUP_MISS)
continue;
}
line = req->map[i].coll_idx;
ENV_BUG_ON(line >= c->num_clines);

1
src/engine/cache_engine.h
View File

@ -12,6 +12,7 @@ struct ocf_request;
#define LOOKUP_HIT 5
#define LOOKUP_MISS 6
#define LOOKUP_INSERTED 8
#define LOOKUP_REMAPPED 9
typedef enum {
/* modes inherited from user API */

2
src/engine/engine_common.c
View File

@ -137,6 +137,7 @@ void ocf_engine_update_req_info(struct ocf_cache *cache,
req->info.seq_req = false;
break;
case LOOKUP_INSERTED:
case LOOKUP_REMAPPED:
break;
default:
ENV_BUG();
@ -298,6 +299,7 @@ static void ocf_engine_map_hndl_error(struct ocf_cache *cache,
break;
case LOOKUP_INSERTED:
case LOOKUP_REMAPPED:
OCF_DEBUG_RQ(req, "Canceling cache line %u",
entry->coll_idx);