Always call LRU_set_hot() under hash bucket lock

set_hot() depends on cacheline metadata status to determine
on which list the element is located (dirty cs clean list).
Thus at least hash bucket lock is required when calling
set_hot().

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2021-03-25 18:46:11 -05:00
parent b12e124954
commit a3f2a214b6

View File

@ -607,8 +607,8 @@ 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); lock = lock_clines(req);
ocf_hb_req_prot_unlock_rd(req);
ocf_engine_set_hot(req); ocf_engine_set_hot(req);
ocf_hb_req_prot_unlock_rd(req);
return lock; return lock;
} }
@ -624,6 +624,8 @@ int ocf_engine_prepare_clines(struct ocf_request *req)
/* Mapping must be performed holding (at least) hash-bucket write lock */ /* Mapping must be performed holding (at least) hash-bucket write lock */
ocf_hb_req_prot_lock_upgrade(req); ocf_hb_req_prot_lock_upgrade(req);
result = ocf_prepare_clines_miss(req); result = ocf_prepare_clines_miss(req);
if (!ocf_req_test_mapping_error(req))
ocf_engine_set_hot(req);
ocf_hb_req_prot_unlock_wr(req); ocf_hb_req_prot_unlock_wr(req);
if (ocf_req_test_clean_eviction(req)) { if (ocf_req_test_clean_eviction(req)) {
@ -631,9 +633,6 @@ int ocf_engine_prepare_clines(struct ocf_request *req)
128); 128);
} }
if (!ocf_req_test_mapping_error(req))
ocf_engine_set_hot(req);
return result; return result;
} }