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

Don't allow core add, remove nor detach interruptions

Browse Source 
They are usually not time comsuming operations, so risk of hung task is low.
So it's easier to temporarily disable interrupts instead of properly handle
async completion.

This commit is part of patch that will handle interrupt of waiting for OCF
operations.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2019-12-18 07:03:05 -05:00
parent 2ac8214379
commit f7d88c4b3f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/cas_cache/layer_cache_management.c
View File

@ -686,7 +686,7 @@ static int _cache_mngt_core_device_loaded_visitor(ocf_core_t core, void *cntx)
} }
struct _cache_mngt_add_core_context { struct _cache_mngt_add_core_context {
struct completion compl; struct completion cmpl;
ocf_core_t *core; ocf_core_t *core;
int *result; int *result;
}; };
@ -702,7 +702,7 @@ static void _cache_mngt_add_core_complete(ocf_cache_t cache,
*context->core = core; *context->core = core;
*context->result = error; *context->result = error;
complete(&context->compl); complete(&context->cmpl);
} }
static void _cache_mngt_remove_core_complete(void *priv, int error); static void _cache_mngt_remove_core_complete(void *priv, int error);
@ -755,13 +755,13 @@ int cache_mngt_add_core_to_cache(const char *cache_name, size_t name_len,
cfg->seq_cutoff_threshold = seq_cut_off_mb * MiB; cfg->seq_cutoff_threshold = seq_cut_off_mb * MiB;
init_completion(&add_context.compl); init_completion(&add_context.cmpl);
add_context.core = &core; add_context.core = &core;
add_context.result = &result; add_context.result = &result;
ocf_mngt_cache_add_core(cache, cfg, _cache_mngt_add_core_complete, ocf_mngt_cache_add_core(cache, cfg, _cache_mngt_add_core_complete,
&add_context); &add_context);
wait_for_completion_interruptible(&add_context.compl); wait_for_completion(&add_context.cmpl);
if (result) if (result)
goto error_affter_lock; goto error_affter_lock;
@ -788,11 +788,11 @@ error_after_create_exported_object:
block_dev_destroy_exported_object(core); block_dev_destroy_exported_object(core);
error_after_add_core: error_after_add_core:
init_completion(&remove_context.compl); init_completion(&remove_context.cmpl);
remove_context.result = &remove_core_result; remove_context.result = &remove_core_result;
ocf_mngt_cache_remove_core(core, _cache_mngt_remove_core_complete, ocf_mngt_cache_remove_core(core, _cache_mngt_remove_core_complete,
&remove_context); &remove_context);
wait_for_completion_interruptible(&remove_context.compl); wait_for_completion(&remove_context.cmpl);
error_affter_lock: error_affter_lock:
ocf_mngt_cache_unlock(cache); ocf_mngt_cache_unlock(cache);
@ -856,7 +856,7 @@ static void _cache_mngt_remove_core_complete(void *priv, int error)
struct _cache_mngt_sync_context *context = priv; struct _cache_mngt_sync_context *context = priv;
*context->result = error; *context->result = error;
complete(&context->compl); complete(&context->cmpl);
} }
int cache_mngt_remove_core_from_cache(struct kcas_remove_core *cmd) int cache_mngt_remove_core_from_cache(struct kcas_remove_core *cmd)
@ -914,7 +914,7 @@ int cache_mngt_remove_core_from_cache(struct kcas_remove_core *cmd)
goto unlock; goto unlock;
} }
init_completion(&context.compl); init_completion(&context.cmpl);
context.result = &result; context.result = &result;
if (cmd->detach || flush_result) { if (cmd->detach || flush_result) {
@ -928,7 +928,7 @@ int cache_mngt_remove_core_from_cache(struct kcas_remove_core *cmd)
if (!cmd->force_no_flush && !flush_result) if (!cmd->force_no_flush && !flush_result)
BUG_ON(ocf_mngt_core_is_dirty(core)); BUG_ON(ocf_mngt_core_is_dirty(core));
wait_for_completion_interruptible(&context.compl); wait_for_completion(&context.cmpl);
if (!result && !cmd->detach) { if (!result && !cmd->detach) {
cache_priv = ocf_cache_get_priv(cache); cache_priv = ocf_cache_get_priv(cache);