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

Renaming hash bucket locking functions

Browse Source 
1. new abbreviated previx: ocf_hb (HB stands for hash bucket)
2. clear distinction between functions requiring caller to
   hold metadata shared global lock ("naked") vs the ones
   which acquire global lock on its own ("prot" for protected)
3. clear distinction between hash bucket locking functions
   accepting hash bucket id ("id"), core line and lba ("cline")
   and entire request ("req").

Resulting naming scheme:
ocf_hb_(id/cline/req)_(prot/naked)_(lock/unlock/trylock)_(rd/wr)

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-02-05 00:05:17 -06:00
parent c822c953ed
commit 10c3c3de36
18 changed files with 204 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cleaning/acp.c
View File

@ -386,7 +386,7 @@ static ocf_cache_line_t _acp_trylock_dirty(struct ocf_cache *cache,
struct ocf_map_info info; struct ocf_map_info info;
bool locked = false; bool locked = false;
ocf_metadata_hash_lock_rd(&cache->metadata.lock, core_id, core_line); ocf_hb_cline_prot_lock_rd(&cache->metadata.lock, core_id, core_line);
ocf_engine_lookup_map_entry(cache, &info, core_id, ocf_engine_lookup_map_entry(cache, &info, core_id,
core_line); core_line);
@ -397,7 +397,7 @@ static ocf_cache_line_t _acp_trylock_dirty(struct ocf_cache *cache,
locked = true; locked = true;
} }
ocf_metadata_hash_unlock_rd(&cache->metadata.lock, core_id, core_line); ocf_hb_cline_prot_unlock_rd(&cache->metadata.lock, core_id, core_line);
return locked ? info.coll_idx : cache->device->collision_table_entries; return locked ? info.coll_idx : cache->device->collision_table_entries;
} }

168
src/concurrency/ocf_metadata_concurrency.c
View File

@ -155,14 +155,12 @@ void ocf_metadata_end_exclusive_access(
env_rwsem_up_write(&metadata_lock->global); env_rwsem_up_write(&metadata_lock->global);
} }
void ocf_metadata_start_shared_access( void ocf_metadata_start_shared_access(struct ocf_metadata_lock *metadata_lock)
struct ocf_metadata_lock *metadata_lock)
{ {
env_rwsem_down_read(&metadata_lock->global); env_rwsem_down_read(&metadata_lock->global);
} }
int ocf_metadata_try_start_shared_access( int ocf_metadata_try_start_shared_access(struct ocf_metadata_lock *metadata_lock)
struct ocf_metadata_lock *metadata_lock)
{ {
return env_rwsem_down_read_trylock(&metadata_lock->global); return env_rwsem_down_read_trylock(&metadata_lock->global);
} }
@ -172,7 +170,15 @@ void ocf_metadata_end_shared_access(struct ocf_metadata_lock *metadata_lock)
env_rwsem_up_read(&metadata_lock->global); env_rwsem_up_read(&metadata_lock->global);
} }
void ocf_metadata_hash_lock(struct ocf_metadata_lock *metadata_lock, /* NOTE: Calling 'naked' lock/unlock requires caller to hold global metadata
shared (aka read) lock
NOTE: Using 'naked' variants to lock multiple hash buckets is prone to
deadlocks if not locking in the the order of increasing hash bucket
number. Preffered way to lock multiple hash buckets is to use
request lock rountines ocf_req_hash_(un)lock_(rd/wr).
*/
static inline void ocf_hb_id_naked_lock(
struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw) ocf_cache_line_t hash, int rw)
{ {
ENV_BUG_ON(hash >= metadata_lock->num_hash_entries); ENV_BUG_ON(hash >= metadata_lock->num_hash_entries);
@ -185,7 +191,8 @@ void ocf_metadata_hash_lock(struct ocf_metadata_lock *metadata_lock,
ENV_BUG(); ENV_BUG();
} }
void ocf_metadata_hash_unlock(struct ocf_metadata_lock *metadata_lock, static inline void ocf_hb_id_naked_unlock(
struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw) ocf_cache_line_t hash, int rw)
{ {
ENV_BUG_ON(hash >= metadata_lock->num_hash_entries); ENV_BUG_ON(hash >= metadata_lock->num_hash_entries);
@ -198,7 +205,7 @@ void ocf_metadata_hash_unlock(struct ocf_metadata_lock *metadata_lock,
ENV_BUG(); ENV_BUG();
} }
int ocf_metadata_hash_try_lock(struct ocf_metadata_lock *metadata_lock, static int ocf_hb_id_naked_trylock(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw) ocf_cache_line_t hash, int rw)
{ {
int result = -1; int result = -1;
@ -219,75 +226,116 @@ int ocf_metadata_hash_try_lock(struct ocf_metadata_lock *metadata_lock,
return result; return result;
} }
void ocf_metadata_lock_hash_rd(struct ocf_metadata_lock *metadata_lock, bool ocf_hb_cline_naked_trylock_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_metadata_start_shared_access(metadata_lock);
ocf_metadata_hash_lock(metadata_lock, hash, OCF_METADATA_RD);
}
void ocf_metadata_unlock_hash_rd(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_metadata_hash_unlock(metadata_lock, hash, OCF_METADATA_RD);
ocf_metadata_end_shared_access(metadata_lock);
}
void ocf_metadata_lock_hash_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_metadata_start_shared_access(metadata_lock);
ocf_metadata_hash_lock(metadata_lock, hash, OCF_METADATA_WR);
}
void ocf_metadata_unlock_hash_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_metadata_hash_unlock(metadata_lock, hash, OCF_METADATA_WR);
ocf_metadata_end_shared_access(metadata_lock);
}
/* NOTE: attempt to acquire hash lock for multiple core lines may end up
* in deadlock. In order to hash lock multiple core lines safely, use
* ocf_req_hash_lock_* functions */
void ocf_metadata_hash_lock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line) uint32_t core_id, uint64_t core_line)
{ {
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache, ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id); core_line, core_id);
ocf_metadata_start_shared_access(metadata_lock); return (0 == ocf_hb_id_naked_trylock(metadata_lock, hash,
ocf_metadata_hash_lock(metadata_lock, hash, OCF_METADATA_RD); OCF_METADATA_WR));
} }
void ocf_metadata_hash_unlock_rd(struct ocf_metadata_lock *metadata_lock, bool ocf_hb_cline_naked_trylock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line) uint32_t core_id, uint64_t core_line)
{ {
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache, ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id); core_line, core_id);
ocf_metadata_hash_unlock(metadata_lock, hash, OCF_METADATA_RD); return (0 == ocf_hb_id_naked_trylock(metadata_lock, hash,
OCF_METADATA_RD));
}
void ocf_hb_cline_naked_unlock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line)
{
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id);
ocf_hb_id_naked_unlock(metadata_lock, hash, OCF_METADATA_RD);
}
void ocf_hb_cline_naked_unlock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line)
{
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id);
ocf_hb_id_naked_unlock(metadata_lock, hash, OCF_METADATA_WR);
}
/* common part of protected hash bucket lock routines */
static inline void ocf_hb_id_prot_lock_common(
struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw)
{
ocf_metadata_start_shared_access(metadata_lock);
ocf_hb_id_naked_lock(metadata_lock, hash, rw);
}
/* common part of protected hash bucket unlock routines */
static inline void ocf_hb_id_prot_unlock_common(
struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw)
{
ocf_hb_id_naked_unlock(metadata_lock, hash, rw);
ocf_metadata_end_shared_access(metadata_lock); ocf_metadata_end_shared_access(metadata_lock);
} }
void ocf_metadata_hash_lock_wr(struct ocf_metadata_lock *metadata_lock, /* NOTE: caller can lock at most one hash bucket at a time using protected
variants of lock routines. */
void ocf_hb_cline_prot_lock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line) uint32_t core_id, uint64_t core_line)
{ {
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache, ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id); core_line, core_id);
ocf_metadata_start_shared_access(metadata_lock); ocf_hb_id_prot_lock_common(metadata_lock, hash,
ocf_metadata_hash_lock(metadata_lock, hash, OCF_METADATA_WR); OCF_METADATA_WR);
} }
void ocf_metadata_hash_unlock_wr(struct ocf_metadata_lock *metadata_lock, void ocf_hb_cline_prot_unlock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line) uint32_t core_id, uint64_t core_line)
{ {
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache, ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id); core_line, core_id);
ocf_metadata_hash_unlock(metadata_lock, hash, OCF_METADATA_WR); ocf_hb_id_prot_unlock_common(metadata_lock, hash,
ocf_metadata_end_shared_access(metadata_lock); OCF_METADATA_WR);
}
void ocf_hb_cline_prot_lock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line)
{
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id);
ocf_hb_id_prot_lock_common(metadata_lock, hash,
OCF_METADATA_RD);
}
void ocf_hb_cline_prot_unlock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line)
{
ocf_cache_line_t hash = ocf_metadata_hash_func(metadata_lock->cache,
core_line, core_id);
ocf_hb_id_prot_unlock_common(metadata_lock, hash,
OCF_METADATA_RD);
}
void ocf_hb_hash_prot_lock_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_hb_id_prot_lock_common(metadata_lock, hash,
OCF_METADATA_WR);
}
void ocf_hb_hash_prot_unlock_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash)
{
ocf_hb_id_prot_unlock_common(metadata_lock, hash,
OCF_METADATA_WR);
} }
/* number of hash entries */ /* number of hash entries */
@ -340,59 +388,59 @@ void ocf_metadata_hash_unlock_wr(struct ocf_metadata_lock *metadata_lock,
for (hash = _MIN_HASH(req); hash <= _MAX_HASH(req); \ for (hash = _MIN_HASH(req); hash <= _MAX_HASH(req); \
hash = _HASH_NEXT(req, hash)) hash = _HASH_NEXT(req, hash))
void ocf_req_hash_lock_rd(struct ocf_request *req) void ocf_hb_req_prot_lock_rd(struct ocf_request *req)
{ {
ocf_cache_line_t hash; ocf_cache_line_t hash;
ocf_metadata_start_shared_access(&req->cache->metadata.lock); ocf_metadata_start_shared_access(&req->cache->metadata.lock);
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_lock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_lock(&req->cache->metadata.lock, hash,
OCF_METADATA_RD); OCF_METADATA_RD);
} }
} }
void ocf_req_hash_unlock_rd(struct ocf_request *req) void ocf_hb_req_prot_unlock_rd(struct ocf_request *req)
{ {
ocf_cache_line_t hash; ocf_cache_line_t hash;
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_unlock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_unlock(&req->cache->metadata.lock, hash,
OCF_METADATA_RD); OCF_METADATA_RD);
} }
ocf_metadata_end_shared_access(&req->cache->metadata.lock); ocf_metadata_end_shared_access(&req->cache->metadata.lock);
} }
void ocf_req_hash_lock_wr(struct ocf_request *req) void ocf_hb_req_prot_lock_wr(struct ocf_request *req)
{ {
ocf_cache_line_t hash; ocf_cache_line_t hash;
ocf_metadata_start_shared_access(&req->cache->metadata.lock); ocf_metadata_start_shared_access(&req->cache->metadata.lock);
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_lock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_lock(&req->cache->metadata.lock, hash,
OCF_METADATA_WR); OCF_METADATA_WR);
} }
} }
void ocf_req_hash_lock_upgrade(struct ocf_request *req) void ocf_hb_req_prot_lock_upgrade(struct ocf_request *req)
{ {
ocf_cache_line_t hash; ocf_cache_line_t hash;
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_unlock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_unlock(&req->cache->metadata.lock, hash,
OCF_METADATA_RD); OCF_METADATA_RD);
} }
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_lock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_lock(&req->cache->metadata.lock, hash,
OCF_METADATA_WR); OCF_METADATA_WR);
} }
} }
void ocf_req_hash_unlock_wr(struct ocf_request *req) void ocf_hb_req_prot_unlock_wr(struct ocf_request *req)
{ {
ocf_cache_line_t hash; ocf_cache_line_t hash;
for_each_req_hash_asc(req, hash) { for_each_req_hash_asc(req, hash) {
ocf_metadata_hash_unlock(&req->cache->metadata.lock, hash, ocf_hb_id_naked_unlock(&req->cache->metadata.lock, hash,
OCF_METADATA_WR); OCF_METADATA_WR);
} }
ocf_metadata_end_shared_access(&req->cache->metadata.lock); ocf_metadata_end_shared_access(&req->cache->metadata.lock);

41
src/concurrency/ocf_metadata_concurrency.h
View File

@ -136,32 +136,39 @@ static inline void ocf_metadata_status_bits_unlock(
ocf_metadata_status_bits_unlock(&cache->metadata.lock, \ ocf_metadata_status_bits_unlock(&cache->metadata.lock, \
OCF_METADATA_WR) OCF_METADATA_WR)
/* lock/unlock single hash */ void ocf_hb_cline_prot_lock_rd(struct ocf_metadata_lock *metadata_lock,
void ocf_metadata_lock_hash_rd(struct ocf_metadata_lock *metadata_lock, uint32_t core_id, uint64_t core_line);
void ocf_hb_cline_prot_unlock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line);
void ocf_hb_id_prot_lock_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash); ocf_cache_line_t hash);
void ocf_metadata_unlock_hash_rd(struct ocf_metadata_lock *metadata_lock, void ocf_hb_id_prot_unlock_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash);
void ocf_metadata_lock_hash_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash);
void ocf_metadata_unlock_hash_wr(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash); ocf_cache_line_t hash);
/* lock/unlock single hash provided core id and core line */ /* caller must hold global metadata read lock */
void ocf_metadata_hash_lock_rd(struct ocf_metadata_lock *metadata_lock, bool ocf_hb_cline_naked_trylock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line); uint32_t core_id, uint64_t core_line);
void ocf_metadata_hash_unlock_rd(struct ocf_metadata_lock *metadata_lock, void ocf_hb_cline_naked_unlock_rd(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line); uint32_t core_id, uint64_t core_line);
void ocf_metadata_hash_lock_wr(struct ocf_metadata_lock *metadata_lock,
void ocf_hb_cline_prot_lock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line); uint32_t core_id, uint64_t core_line);
void ocf_metadata_hash_unlock_wr(struct ocf_metadata_lock *metadata_lock, void ocf_hb_cline_prot_unlock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line);
/* caller must hold global metadata read lock */
bool ocf_hb_cline_naked_trylock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line);
void ocf_hb_cline_naked_unlock_wr(struct ocf_metadata_lock *metadata_lock,
uint32_t core_id, uint64_t core_line); uint32_t core_id, uint64_t core_line);
/* lock entire request in deadlock-free manner */ /* lock entire request in deadlock-free manner */
void ocf_req_hash_lock_rd(struct ocf_request *req); void ocf_hb_req_prot_lock_rd(struct ocf_request *req);
void ocf_req_hash_unlock_rd(struct ocf_request *req); void ocf_hb_req_prot_unlock_rd(struct ocf_request *req);
void ocf_req_hash_lock_wr(struct ocf_request *req); void ocf_hb_req_prot_lock_wr(struct ocf_request *req);
void ocf_req_hash_unlock_wr(struct ocf_request *req); void ocf_hb_req_prot_unlock_wr(struct ocf_request *req);
void ocf_req_hash_lock_upgrade(struct ocf_request *req); void ocf_hb_req_prot_lock_upgrade(struct ocf_request *req);
/* collision table page lock interface */ /* collision table page lock interface */
void ocf_collision_start_shared_access(struct ocf_metadata_lock *metadata_lock, void ocf_collision_start_shared_access(struct ocf_metadata_lock *metadata_lock,

20
src/engine/engine_common.c
View File

@ -434,17 +434,17 @@ static inline int ocf_prepare_clines_miss(struct ocf_request *req,
/* requests to disabled partitions go in pass-through */ /* requests to disabled partitions go in pass-through */
if (!ocf_part_is_enabled(&req->cache->user_parts[req->part_id])) { if (!ocf_part_is_enabled(&req->cache->user_parts[req->part_id])) {
ocf_req_set_mapping_error(req); ocf_req_set_mapping_error(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
return lock_status; return lock_status;
} }
if (!ocf_part_has_space(req)) { if (!ocf_part_has_space(req)) {
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
goto eviction; goto eviction;
} }
/* Mapping must be performed holding (at least) hash-bucket write lock */ /* Mapping must be performed holding (at least) hash-bucket write lock */
ocf_req_hash_lock_upgrade(req); ocf_hb_req_prot_lock_upgrade(req);
ocf_engine_map(req); ocf_engine_map(req);
@ -455,11 +455,11 @@ static inline int ocf_prepare_clines_miss(struct ocf_request *req,
* Don't try to evict, just return error to caller */ * Don't try to evict, just return error to caller */
ocf_req_set_mapping_error(req); ocf_req_set_mapping_error(req);
} }
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
return lock_status; return lock_status;
} }
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
eviction: eviction:
ocf_metadata_start_exclusive_access(metadata_lock); ocf_metadata_start_exclusive_access(metadata_lock);
@ -505,7 +505,7 @@ int ocf_engine_prepare_clines(struct ocf_request *req,
/* Read-lock hash buckets associated with request target core & LBAs /* Read-lock hash buckets associated with request target core & LBAs
* (core lines) to assure that cache mapping for these core lines does * (core lines) to assure that cache mapping for these core lines does
* not change during traversation */ * not change during traversation */
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Traverse to check if request is mapped fully */ /* Traverse to check if request is mapped fully */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -513,7 +513,7 @@ int ocf_engine_prepare_clines(struct ocf_request *req,
mapped = ocf_engine_is_mapped(req); mapped = ocf_engine_is_mapped(req);
if (mapped) { if (mapped) {
lock = lock_clines(req, engine_cbs); lock = lock_clines(req, engine_cbs);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
return lock; return lock;
} }
@ -522,7 +522,7 @@ int ocf_engine_prepare_clines(struct ocf_request *req,
req->cache->promotion_policy, req); req->cache->promotion_policy, req);
if (!promote) { if (!promote) {
ocf_req_set_mapping_error(req); ocf_req_set_mapping_error(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
return lock; return lock;
} }
@ -676,11 +676,11 @@ static int _ocf_engine_refresh(struct ocf_request *req)
int result; int result;
/* Check under metadata RD lock */ /* Check under metadata RD lock */
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
result = ocf_engine_check(req); result = ocf_engine_check(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
if (result == 0) { if (result == 0) {

12
src/engine/engine_discard.c
View File

@ -170,7 +170,7 @@ int _ocf_discard_step_do(struct ocf_request *req)
if (ocf_engine_mapped_count(req)) { if (ocf_engine_mapped_count(req)) {
/* There are mapped cache line, need to remove them */ /* There are mapped cache line, need to remove them */
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Remove mapped cache lines from metadata */ /* Remove mapped cache lines from metadata */
ocf_purge_map_info(req); ocf_purge_map_info(req);
@ -181,16 +181,16 @@ int _ocf_discard_step_do(struct ocf_request *req)
_ocf_discard_step_complete); _ocf_discard_step_complete);
} }
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Even if no cachelines are mapped they could be tracked in promotion /* Even if no cachelines are mapped they could be tracked in promotion
* policy. RD lock suffices. */ * policy. RD lock suffices. */
ocf_promotion_req_purge(req->cache->promotion_policy, req); ocf_promotion_req_purge(req->cache->promotion_policy, req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
OCF_DEBUG_RQ(req, "Discard"); OCF_DEBUG_RQ(req, "Discard");
_ocf_discard_step_complete(req, 0); _ocf_discard_step_complete(req, 0);
@ -228,7 +228,7 @@ static int _ocf_discard_step(struct ocf_request *req)
0)); 0));
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Travers to check if request is mapped fully */ /* Travers to check if request is mapped fully */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -240,7 +240,7 @@ static int _ocf_discard_step(struct ocf_request *req)
lock = OCF_LOCK_ACQUIRED; lock = OCF_LOCK_ACQUIRED;
} }
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
if (lock >= 0) { if (lock >= 0) {
if (OCF_LOCK_ACQUIRED == lock) { if (OCF_LOCK_ACQUIRED == lock) {

12
src/engine/engine_fast.c
View File

@ -72,14 +72,14 @@ static int _ocf_read_fast_do(struct ocf_request *req)
if (ocf_engine_needs_repart(req)) { if (ocf_engine_needs_repart(req)) {
OCF_DEBUG_RQ(req, "Re-Part"); OCF_DEBUG_RQ(req, "Re-Part");
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Probably some cache lines are assigned into wrong /* Probably some cache lines are assigned into wrong
* partition. Need to move it to new one * partition. Need to move it to new one
*/ */
ocf_part_move(req); ocf_part_move(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
/* Submit IO */ /* Submit IO */
@ -119,7 +119,7 @@ int ocf_read_fast(struct ocf_request *req)
/*- Metadata RD access -----------------------------------------------*/ /*- Metadata RD access -----------------------------------------------*/
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Traverse request to cache if there is hit */ /* Traverse request to cache if there is hit */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -133,7 +133,7 @@ int ocf_read_fast(struct ocf_request *req)
lock = ocf_req_async_lock_rd(req, ocf_engine_on_resume); lock = ocf_req_async_lock_rd(req, ocf_engine_on_resume);
} }
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
if (hit && part_has_space) { if (hit && part_has_space) {
OCF_DEBUG_RQ(req, "Fast path success"); OCF_DEBUG_RQ(req, "Fast path success");
@ -189,7 +189,7 @@ int ocf_write_fast(struct ocf_request *req)
/*- Metadata RD access -----------------------------------------------*/ /*- Metadata RD access -----------------------------------------------*/
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Traverse request to cache if there is hit */ /* Traverse request to cache if there is hit */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -203,7 +203,7 @@ int ocf_write_fast(struct ocf_request *req)
lock = ocf_req_async_lock_wr(req, ocf_engine_on_resume); lock = ocf_req_async_lock_wr(req, ocf_engine_on_resume);
} }
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
if (mapped && part_has_space) { if (mapped && part_has_space) {
if (lock >= 0) { if (lock >= 0) {

4
src/engine/engine_inv.c
View File

@ -43,9 +43,9 @@ static int _ocf_invalidate_do(struct ocf_request *req)
ENV_BUG_ON(env_atomic_read(&req->req_remaining)); ENV_BUG_ON(env_atomic_read(&req->req_remaining));
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
ocf_purge_map_info(req); ocf_purge_map_info(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
env_atomic_inc(&req->req_remaining); env_atomic_inc(&req->req_remaining);

12
src/engine/engine_pt.c
View File

@ -56,10 +56,10 @@ int ocf_read_pt_do(struct ocf_request *req)
ocf_req_get(req); ocf_req_get(req);
if (req->info.dirty_any) { if (req->info.dirty_any) {
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Need to clean, start it */ /* Need to clean, start it */
ocf_engine_clean(req); ocf_engine_clean(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
/* Do not processing, because first we need to clean request */ /* Do not processing, because first we need to clean request */
ocf_req_put(req); ocf_req_put(req);
@ -70,14 +70,14 @@ int ocf_read_pt_do(struct ocf_request *req)
if (ocf_engine_needs_repart(req)) { if (ocf_engine_needs_repart(req)) {
OCF_DEBUG_RQ(req, "Re-Part"); OCF_DEBUG_RQ(req, "Re-Part");
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Probably some cache lines are assigned into wrong /* Probably some cache lines are assigned into wrong
* partition. Need to move it to new one * partition. Need to move it to new one
*/ */
ocf_part_move(req); ocf_part_move(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
/* Submit read IO to the core */ /* Submit read IO to the core */
@ -115,7 +115,7 @@ int ocf_read_pt(struct ocf_request *req)
req->io_if = &_io_if_pt_resume; req->io_if = &_io_if_pt_resume;
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Traverse request to check if there are mapped cache lines */ /* Traverse request to check if there are mapped cache lines */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -134,7 +134,7 @@ int ocf_read_pt(struct ocf_request *req)
} }
} }
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
if (use_cache) { if (use_cache) {
/* /*

12
src/engine/engine_rd.c
View File

@ -151,12 +151,12 @@ static int _ocf_read_generic_do(struct ocf_request *req)
if (ocf_engine_is_miss(req)) { if (ocf_engine_is_miss(req)) {
if (req->info.dirty_any) { if (req->info.dirty_any) {
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Request is dirty need to clean request */ /* Request is dirty need to clean request */
ocf_engine_clean(req); ocf_engine_clean(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
/* We need to clean request before processing, return */ /* We need to clean request before processing, return */
ocf_req_put(req); ocf_req_put(req);
@ -164,25 +164,25 @@ static int _ocf_read_generic_do(struct ocf_request *req)
return 0; return 0;
} }
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Set valid status bits map */ /* Set valid status bits map */
ocf_set_valid_map_info(req); ocf_set_valid_map_info(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
} }
if (ocf_engine_needs_repart(req)) { if (ocf_engine_needs_repart(req)) {
OCF_DEBUG_RQ(req, "Re-Part"); OCF_DEBUG_RQ(req, "Re-Part");
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Probably some cache lines are assigned into wrong /* Probably some cache lines are assigned into wrong
* partition. Need to move it to new one * partition. Need to move it to new one
*/ */
ocf_part_move(req); ocf_part_move(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
OCF_DEBUG_RQ(req, "Submit"); OCF_DEBUG_RQ(req, "Submit");

4
src/engine/engine_wa.c
View File

@ -23,12 +23,12 @@ int ocf_write_wa(struct ocf_request *req)
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); /*- Metadata RD access -----------------------*/ ocf_hb_req_prot_lock_rd(req); /*- Metadata RD access -----------------------*/
/* Traverse request to check if there are mapped cache lines */ /* Traverse request to check if there are mapped cache lines */
ocf_engine_traverse(req); ocf_engine_traverse(req);
ocf_req_hash_unlock_rd(req); /*- END Metadata RD access -----------------*/ ocf_hb_req_prot_unlock_rd(req); /*- END Metadata RD access -----------------*/
if (ocf_engine_is_hit(req)) { if (ocf_engine_is_hit(req)) {
ocf_req_clear(req); ocf_req_clear(req);

12
src/engine/engine_wb.c
View File

@ -28,20 +28,20 @@ static const struct ocf_io_if _io_if_wb_resume = {
static void _ocf_write_wb_update_bits(struct ocf_request *req) static void _ocf_write_wb_update_bits(struct ocf_request *req)
{ {
if (ocf_engine_is_miss(req)) { if (ocf_engine_is_miss(req)) {
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Update valid status bits */ /* Update valid status bits */
ocf_set_valid_map_info(req); ocf_set_valid_map_info(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
} }
if (!ocf_engine_is_dirty_all(req)) { if (!ocf_engine_is_dirty_all(req)) {
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* set dirty bits, and mark if metadata flushing is required */ /* set dirty bits, and mark if metadata flushing is required */
ocf_set_dirty_map_info(req); ocf_set_dirty_map_info(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
ocf_req_set_cleaning_hot(req); ocf_req_set_cleaning_hot(req);
@ -127,14 +127,14 @@ static inline void _ocf_write_wb_submit(struct ocf_request *req)
if (ocf_engine_needs_repart(req)) { if (ocf_engine_needs_repart(req)) {
OCF_DEBUG_RQ(req, "Re-Part"); OCF_DEBUG_RQ(req, "Re-Part");
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Probably some cache lines are assigned into wrong /* Probably some cache lines are assigned into wrong
* partition. Need to move it to new one * partition. Need to move it to new one
*/ */
ocf_part_move(req); ocf_part_move(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
OCF_DEBUG_RQ(req, "Submit Data"); OCF_DEBUG_RQ(req, "Submit Data");

8
src/engine/engine_wi.c
View File

@ -96,12 +96,12 @@ static int ocf_write_wi_update_and_flush_metadata(struct ocf_request *req)
env_atomic_set(&req->req_remaining, 1); /* One core IO */ env_atomic_set(&req->req_remaining, 1); /* One core IO */
ocf_req_hash_lock_wr(req); /*- Metadata WR access ---------------*/ ocf_hb_req_prot_lock_wr(req); /*- Metadata WR access ---------------*/
/* Remove mapped cache lines from metadata */ /* Remove mapped cache lines from metadata */
ocf_purge_map_info(req); ocf_purge_map_info(req);
ocf_req_hash_unlock_wr(req); /*- END Metadata WR access ---------*/ ocf_hb_req_prot_unlock_wr(req); /*- END Metadata WR access ---------*/
if (req->info.flush_metadata) { if (req->info.flush_metadata) {
/* Request was dirty and need to flush metadata */ /* Request was dirty and need to flush metadata */
@ -191,7 +191,7 @@ int ocf_write_wi(struct ocf_request *req)
&_io_if_wi_core_write; &_io_if_wi_core_write;
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); /*- Metadata READ access, No eviction --------*/ ocf_hb_req_prot_lock_rd(req); /*- Metadata READ access, No eviction --------*/
/* Travers to check if request is mapped fully */ /* Travers to check if request is mapped fully */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -203,7 +203,7 @@ int ocf_write_wi(struct ocf_request *req)
lock = OCF_LOCK_ACQUIRED; lock = OCF_LOCK_ACQUIRED;
} }
ocf_req_hash_unlock_rd(req); /*- END Metadata READ access----------------*/ ocf_hb_req_prot_unlock_rd(req); /*- END Metadata READ access----------------*/
if (lock >= 0) { if (lock >= 0) {
if (lock == OCF_LOCK_ACQUIRED) { if (lock == OCF_LOCK_ACQUIRED) {

4
src/engine/engine_wo.c
View File

@ -213,7 +213,7 @@ int ocf_read_wo(struct ocf_request *req)
req->io_if = &_io_if_wo_resume; req->io_if = &_io_if_wo_resume;
ocf_req_hash(req); ocf_req_hash(req);
ocf_req_hash_lock_rd(req); /*- Metadata RD access -----------------------*/ ocf_hb_req_prot_lock_rd(req); /*- Metadata RD access -----------------------*/
/* Traverse request to check if there are mapped cache lines */ /* Traverse request to check if there are mapped cache lines */
ocf_engine_traverse(req); ocf_engine_traverse(req);
@ -225,7 +225,7 @@ int ocf_read_wo(struct ocf_request *req)
lock = ocf_req_async_lock_rd(req, ocf_engine_on_resume); lock = ocf_req_async_lock_rd(req, ocf_engine_on_resume);
} }
ocf_req_hash_unlock_rd(req); /*- END Metadata RD access -----------------*/ ocf_hb_req_prot_unlock_rd(req); /*- END Metadata RD access -----------------*/
if (lock >= 0) { if (lock >= 0) {
if (lock != OCF_LOCK_ACQUIRED) { if (lock != OCF_LOCK_ACQUIRED) {

12
src/engine/engine_wt.c
View File

@ -98,16 +98,16 @@ static inline void _ocf_write_wt_submit(struct ocf_request *req)
static void _ocf_write_wt_update_bits(struct ocf_request *req) static void _ocf_write_wt_update_bits(struct ocf_request *req)
{ {
if (ocf_engine_is_miss(req)) { if (ocf_engine_is_miss(req)) {
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
/* Update valid status bits */ /* Update valid status bits */
ocf_set_valid_map_info(req); ocf_set_valid_map_info(req);
ocf_req_hash_unlock_rd(req); ocf_hb_req_prot_unlock_rd(req);
} }
if (req->info.dirty_any) { if (req->info.dirty_any) {
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Writes goes to SDD and HDD, need to update status bits from /* Writes goes to SDD and HDD, need to update status bits from
* dirty to clean * dirty to clean
@ -115,20 +115,20 @@ static void _ocf_write_wt_update_bits(struct ocf_request *req)
ocf_set_clean_map_info(req); ocf_set_clean_map_info(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
if (ocf_engine_needs_repart(req)) { if (ocf_engine_needs_repart(req)) {
OCF_DEBUG_RQ(req, "Re-Part"); OCF_DEBUG_RQ(req, "Re-Part");
ocf_req_hash_lock_wr(req); ocf_hb_req_prot_lock_wr(req);
/* Probably some cache lines are assigned into wrong /* Probably some cache lines are assigned into wrong
* partition. Need to move it to new one * partition. Need to move it to new one
*/ */
ocf_part_move(req); ocf_part_move(req);
ocf_req_hash_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
} }
} }

4
src/engine/engine_zero.c
View File

@ -23,12 +23,12 @@ static int ocf_zero_purge(struct ocf_request *req)
} else { } else {
/* There are mapped cache line, need to remove them */ /* There are mapped cache line, need to remove them */
ocf_req_hash_lock_wr(req); /*- Metadata WR access ---------------*/ ocf_hb_req_prot_lock_wr(req); /*- Metadata WR access ---------------*/
/* Remove mapped cache lines from metadata */ /* Remove mapped cache lines from metadata */
ocf_purge_map_info(req); ocf_purge_map_info(req);
ocf_req_hash_unlock_wr(req); /*- END Metadata WR access ---------*/ ocf_hb_req_prot_unlock_wr(req); /*- END Metadata WR access ---------*/
} }
ocf_req_unlock_wr(req); ocf_req_unlock_wr(req);

2
src/metadata/metadata_collision.c
View File

@ -304,6 +304,7 @@ void ocf_metadata_remove_from_collision(struct ocf_cache *cache,
OCF_CORE_MAX, ULLONG_MAX); OCF_CORE_MAX, ULLONG_MAX);
} }
/* must be called under global metadata read(shared) lock */
void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache, void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
ocf_cache_line_t line) ocf_cache_line_t line)
{ {
@ -316,6 +317,7 @@ void ocf_metadata_start_collision_shared_access(struct ocf_cache *cache,
ocf_collision_start_shared_access(&cache->metadata.lock, page); ocf_collision_start_shared_access(&cache->metadata.lock, page);
} }
/* must be called under global metadata read(shared) lock */
void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache, void ocf_metadata_end_collision_shared_access(struct ocf_cache *cache,
ocf_cache_line_t line) ocf_cache_line_t line)
{ {

4
src/mngt/ocf_mngt_common.c
View File

@ -62,7 +62,7 @@ void cache_mngt_core_deinit_attached_meta(ocf_core_t core)
for (hash = 0; hash < num_hash;) { for (hash = 0; hash < num_hash;) {
prev_cline = cache->device->collision_table_entries; prev_cline = cache->device->collision_table_entries;
ocf_metadata_lock_hash_wr(&cache->metadata.lock, hash); ocf_hb_id_prot_lock_wr(&cache->metadata.lock, hash);
curr_cline = ocf_metadata_get_hash(cache, hash); curr_cline = ocf_metadata_get_hash(cache, hash);
while (curr_cline != cache->device->collision_table_entries) { while (curr_cline != cache->device->collision_table_entries) {
@ -91,7 +91,7 @@ void cache_mngt_core_deinit_attached_meta(ocf_core_t core)
else else
curr_cline = ocf_metadata_get_hash(cache, hash); curr_cline = ocf_metadata_get_hash(cache, hash);
} }
ocf_metadata_unlock_hash_wr(&cache->metadata.lock, hash); ocf_hb_id_prot_unlock_wr(&cache->metadata.lock, hash);
/* Check whether all the cachelines from the hash bucket were sparsed */ /* Check whether all the cachelines from the hash bucket were sparsed */
if (curr_cline == cache->device->collision_table_entries) if (curr_cline == cache->device->collision_table_entries)

16
tests/unit/tests/concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency.c
View File

@ -1,6 +1,6 @@
/* /*
* <tested_file_path>src/concurrency/ocf_metadata_concurrency.c</tested_file_path> * <tested_file_path>src/concurrency/ocf_metadata_concurrency.c</tested_file_path>
* <tested_function>ocf_req_hash_lock_rd</tested_function> * <tested_function>ocf_hb_req_prot_lock_rd</tested_function>
* <functions_to_leave> * <functions_to_leave>
* INSERT HERE LIST OF FUNCTIONS YOU WANT TO LEAVE * INSERT HERE LIST OF FUNCTIONS YOU WANT TO LEAVE
* ONE FUNCTION PER LINE * ONE FUNCTION PER LINE
@ -23,7 +23,7 @@
#include "concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency_generated_wraps.c" #include "concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency_generated_wraps.c"
void __wrap_ocf_metadata_hash_lock(struct ocf_metadata_lock *metadata_lock, void __wrap_ocf_hb_id_naked_lock(struct ocf_metadata_lock *metadata_lock,
ocf_cache_line_t hash, int rw) ocf_cache_line_t hash, int rw)
{ {
check_expected(hash); check_expected(hash);
@ -62,15 +62,15 @@ static void _test_lock_order(struct ocf_request* req,
req->map[i].hash = hash[i]; req->map[i].hash = hash[i];
for (i = 0; i < expected_call_count; i++) { for (i = 0; i < expected_call_count; i++) {
expect_function_call(__wrap_ocf_metadata_hash_lock); expect_function_call(__wrap_ocf_hb_id_naked_lock);
expect_value(__wrap_ocf_metadata_hash_lock, hash, expected_call[i]); expect_value(__wrap_ocf_hb_id_naked_lock, hash, expected_call[i]);
} }
ocf_req_hash_lock_rd(req); ocf_hb_req_prot_lock_rd(req);
} }
static void ocf_req_hash_lock_rd_test01(void **state) static void ocf_hb_req_prot_lock_rd_test01(void **state)
{ {
struct ocf_request *req = alloc_req(); struct ocf_request *req = alloc_req();
struct { struct {
@ -126,10 +126,10 @@ static void ocf_req_hash_lock_rd_test01(void **state)
int main(void) int main(void)
{ {
const struct CMUnitTest tests[] = { const struct CMUnitTest tests[] = {
cmocka_unit_test(ocf_req_hash_lock_rd_test01) cmocka_unit_test(ocf_hb_req_prot_lock_rd_test01)
}; };
print_message("Unit test for ocf_req_hash_lock_rd\n"); print_message("Unit test for ocf_hb_req_prot_lock_rd\n");
return cmocka_run_group_tests(tests, NULL, NULL); return cmocka_run_group_tests(tests, NULL, NULL);
} }