github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Acquire read lock for flushing cache

Browse Source 
Read lock allows to retrieve informations about flushing progress and printing
progress bar during changing cache mode.

Flushing dirty data during changing cache mode is done twice - first flush might
be interrupted by user and the second one, called with write lock acquired, is
uninterruptable.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2020-03-23 06:29:15 -04:00
parent de296dd89f
commit dca9769298
2 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/cas_cache/layer_cache_management.c
View File

@ -2026,6 +2026,26 @@ int cache_mngt_get_seq_cutoff_policy(ocf_core_t core,
return result; return result;
} }
static int _cache_flush_with_lock(ocf_cache_t cache)
{
int result = 0;
result = ocf_mngt_cache_get(cache);
if (result)
return result;
result = _cache_mngt_read_lock_sync(cache);
if (result) {
ocf_mngt_cache_put(cache);
return result;
}
result = _cache_mngt_cache_flush_sync(cache, true,
_cache_read_unlock_put_cmpl);
return result;
}
/** /**
* @brief routine implementing dynamic cache mode switching * @brief routine implementing dynamic cache mode switching
* @param cache_name name of cache to which operation applies * @param cache_name name of cache to which operation applies
@ -2045,32 +2065,49 @@ int cache_mngt_set_cache_mode(const char *cache_name, size_t name_len,
if (result) if (result)
return result; return result;
result = _cache_mngt_lock_sync(cache); old_mode = ocf_cache_get_mode(cache);
if (result) { if (old_mode == mode) {
ocf_mngt_cache_put(cache); printk(KERN_INFO "%s is in requested cache mode already\n", cache_name);
return result; result = 0;
goto put;
} }
old_mode = ocf_cache_get_mode(cache); if (flush) {
result = _cache_flush_with_lock(cache);
if (result)
goto put;
}
result = _cache_mngt_lock_sync(cache);
if (result)
goto put;
if (old_mode != ocf_cache_get_mode(cache)) {
printk(KERN_WARNING "%s cache mode changed during flush\n",
ocf_cache_get_name(cache));
goto unlock;
}
if (flush) {
result = _cache_mngt_cache_flush_uninterruptible(cache);
if (result)
goto unlock;
}
result = ocf_mngt_cache_set_mode(cache, mode); result = ocf_mngt_cache_set_mode(cache, mode);
if (result) if (result)
goto out; goto unlock;
if (flush) {
result = _cache_mngt_cache_flush_sync(cache, true, NULL);
if (result) {
ocf_mngt_cache_set_mode(cache, old_mode);
goto out;
}
}
result = _cache_mngt_save_sync(cache); result = _cache_mngt_save_sync(cache);
if (result) if (result) {
printk(KERN_ERR "%s: Failed to save new cache mode. "
"Restoring old one!\n", cache_name);
ocf_mngt_cache_set_mode(cache, old_mode); ocf_mngt_cache_set_mode(cache, old_mode);
}
out: unlock:
ocf_mngt_cache_unlock(cache); ocf_mngt_cache_unlock(cache);
put:
ocf_mngt_cache_put(cache); ocf_mngt_cache_put(cache);
return result; return result;
} }

2
ocf

@ -1 +1 @@
Subproject commit ed91895f705ed2a034e96d9a577c07a2e86f1b4a Subproject commit 86d7212217d2ed2a5d5be55d4995a1f02cc4eb94