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

Merge pull request #470 from arutk/lru_fix

Browse Source 
Parallel eviction fixes
This commit is contained in:
Michał Mielewczyk 2021-03-17 11:41:07 +01:00 committed by GitHub
commit df969cde16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/engine/engine_common.c
View File

@ -203,11 +203,16 @@ static void ocf_engine_set_hot(struct ocf_request *req)
uint8_t status; uint8_t status;
unsigned i; unsigned i;
if (req->info.hit_no == 0 && req->info.invalid_no == 0) {
/* no previously mapped clines */
return;
}
for (i = 0; i < req->core_line_count; i++) { for (i = 0; i < req->core_line_count; i++) {
entry = &(req->map[i]); entry = &(req->map[i]);
status = entry->status; status = entry->status;
if (status == LOOKUP_HIT || status == LOOKUP_INSERTED) { if (status == LOOKUP_HIT) {
/* Update eviction (LRU) */ /* Update eviction (LRU) */
ocf_eviction_set_hot_cache_line(cache, entry->coll_idx); ocf_eviction_set_hot_cache_line(cache, entry->coll_idx);
} }
@ -347,6 +352,7 @@ static void ocf_engine_map_cache_line(struct ocf_request *req,
/* Update LRU:: Move this node to head of lru list. */ /* Update LRU:: Move this node to head of lru list. */
ocf_eviction_init_cache_line(cache, cache_line); ocf_eviction_init_cache_line(cache, cache_line);
ocf_eviction_set_hot_cache_line(cache, cache_line);
} }
static void ocf_engine_map_hndl_error(struct ocf_cache *cache, static void ocf_engine_map_hndl_error(struct ocf_cache *cache,
@ -396,11 +402,11 @@ static void ocf_engine_map(struct ocf_request *req)
uint64_t core_line; uint64_t core_line;
ocf_core_id_t core_id = ocf_core_get_id(req->core); ocf_core_id_t core_id = ocf_core_get_id(req->core);
if (!ocf_engine_unmapped_count(req)) /* NOTE: request not refreshed after upgrading hash bucket lock.
return; * ocf_engine_unmapped_count() is potentially not accurate. */
if (ocf_engine_unmapped_count(req) > if (ocf_engine_unmapped_count(req) >
ocf_freelist_num_free(cache->freelist)) { ocf_freelist_num_free(cache->freelist)) {
ocf_engine_lookup(req);
ocf_req_set_mapping_error(req); ocf_req_set_mapping_error(req);
return; return;
} }
@ -551,6 +557,10 @@ static inline int ocf_prepare_clines_miss(struct ocf_request *req)
return lock_status; return lock_status;
} }
/* NOTE: ocf_part_has_space() below uses potentially stale request
* statistics (collected before hash bucket lock had been upgraded).
* It is ok since this check is opportunistic, as partition occupancy
* is also subject to change. */
if (!ocf_part_has_space(req)) { if (!ocf_part_has_space(req)) {
ocf_engine_lookup(req); ocf_engine_lookup(req);
return ocf_prepare_clines_evict(req); return ocf_prepare_clines_evict(req);