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

Merge pull request #1240 from robertbaldyga/fix-mem-check-fallback

Browse Source 
Fix required memory check in the fallback path
This commit is contained in:
Jan Musiał 2022-06-23 10:28:01 +02:00 committed by GitHub
commit bead2af4f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/cas_cache/layer_cache_management.c
View File

@ -609,6 +609,7 @@ struct _cache_mngt_attach_context {
char cache_elevator[MAX_ELEVATOR_NAME]; char cache_elevator[MAX_ELEVATOR_NAME];
uint64_t min_free_ram; uint64_t min_free_ram;
struct ocf_mngt_cache_device_config *device_cfg; struct ocf_mngt_cache_device_config *device_cfg;
char cache_path[MAX_STR_LEN];
ocf_cache_t cache; ocf_cache_t cache;
int ocf_start_error; int ocf_start_error;
struct cas_lazy_thread *rollback_thread; struct cas_lazy_thread *rollback_thread;
@ -1873,11 +1874,10 @@ static int cache_mngt_create_cache_device_cfg(
return 0; return 0;
} }
void cache_mngt_destroy_cache_cfg(struct ocf_mngt_cache_config *cfg, static void cache_mngt_destroy_cache_device_cfg(
struct ocf_mngt_cache_attach_config *attach_cfg) struct ocf_mngt_cache_device_config *cfg)
{ {
ocf_volume_destroy(attach_cfg->device.volume); ocf_volume_destroy(cfg->volume);
} }
int cache_mngt_create_cache_cfg(struct ocf_mngt_cache_config *cfg, int cache_mngt_create_cache_cfg(struct ocf_mngt_cache_config *cfg,
@ -2057,10 +2057,22 @@ static void _cache_mngt_start_complete(ocf_cache_t cache, void *priv, int error)
{ {
struct _cache_mngt_attach_context *ctx = priv; struct _cache_mngt_attach_context *ctx = priv;
int caller_status; int caller_status;
int result;
cache_mngt_destroy_cache_device_cfg(ctx->device_cfg);
if (error == -OCF_ERR_NO_FREE_RAM) { if (error == -OCF_ERR_NO_FREE_RAM) {
ocf_mngt_get_ram_needed(cache, ctx->device_cfg, result = cache_mngt_create_cache_device_cfg(ctx->device_cfg,
&ctx->min_free_ram); ctx->cache_path);
if (result) {
printk(KERN_WARNING "Cannot calculate amount of DRAM "
"needed\n");
ctx->min_free_ram = 0;
} else {
ocf_mngt_get_ram_needed(cache, ctx->device_cfg,
&ctx->min_free_ram);
cache_mngt_destroy_cache_device_cfg(ctx->device_cfg);
}
} }
caller_status =_cache_mngt_async_callee_set_result(&ctx->async, error); caller_status =_cache_mngt_async_callee_set_result(&ctx->async, error);
@ -2310,12 +2322,6 @@ out_module_put:
return result; return result;
} }
void cache_mngt_destroy_cache_standby_activate_cfg(
struct ocf_mngt_cache_standby_activate_config *cfg)
{
ocf_volume_destroy(cfg->device.volume);
}
int cache_mngt_create_cache_standby_activate_cfg( int cache_mngt_create_cache_standby_activate_cfg(
struct ocf_mngt_cache_standby_activate_config *cfg, struct ocf_mngt_cache_standby_activate_config *cfg,
struct kcas_standby_activate *cmd) struct kcas_standby_activate *cmd)
@ -2384,6 +2390,7 @@ int cache_mngt_activate(struct ocf_mngt_cache_standby_activate_config *cfg,
/* TODO: doesn't this need to be copied to avoid use-after-free /* TODO: doesn't this need to be copied to avoid use-after-free
* in case where calle is interrupted and returns??? * in case where calle is interrupted and returns???
*/ */
strncpy(context->cache_path, cmd->cache_path, MAX_STR_LEN);
context->device_cfg = &cfg->device; context->device_cfg = &cfg->device;
context->cache = cache; context->cache = cache;
@ -2523,6 +2530,7 @@ int cache_mngt_init_instance(struct ocf_mngt_cache_config *cfg,
return result; return result;
} }
strncpy(context->cache_path, cmd->cache_path_name, MAX_STR_LEN);
context->device_cfg = &attach_cfg->device; context->device_cfg = &attach_cfg->device;
_cache_mngt_async_context_init(&context->async); _cache_mngt_async_context_init(&context->async);

6
modules/cas_cache/layer_cache_management.h
View File

@ -45,9 +45,6 @@ int cache_mngt_set_partitions(const char *cache_name, size_t name_len,
int cache_mngt_exit_instance(const char *cache_name, size_t name_len, int cache_mngt_exit_instance(const char *cache_name, size_t name_len,
int flush); int flush);
void cache_mngt_destroy_cache_cfg(struct ocf_mngt_cache_config *cfg,
struct ocf_mngt_cache_attach_config *attach_cfg);
int cache_mngt_create_cache_cfg(struct ocf_mngt_cache_config *cfg, int cache_mngt_create_cache_cfg(struct ocf_mngt_cache_config *cfg,
struct ocf_mngt_cache_attach_config *attach_cfg, struct ocf_mngt_cache_attach_config *attach_cfg,
struct kcas_start_cache *cmd); struct kcas_start_cache *cmd);
@ -113,9 +110,6 @@ int cache_mngt_get_cache_params(struct kcas_get_cache_param *info);
int cache_mngt_standby_detach(struct kcas_standby_detach *cmd); int cache_mngt_standby_detach(struct kcas_standby_detach *cmd);
void cache_mngt_destroy_cache_standby_activate_cfg(
struct ocf_mngt_cache_standby_activate_config *cfg);
int cache_mngt_create_cache_standby_activate_cfg( int cache_mngt_create_cache_standby_activate_cfg(
struct ocf_mngt_cache_standby_activate_config *cfg, struct ocf_mngt_cache_standby_activate_config *cfg,
struct kcas_standby_activate *cmd); struct kcas_standby_activate *cmd);

4
modules/cas_cache/service_ui_ioctl.c
View File

@ -60,8 +60,6 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
retval = cache_mngt_init_instance(&cfg, &attach_cfg, cmd_info); retval = cache_mngt_init_instance(&cfg, &attach_cfg, cmd_info);
cache_mngt_destroy_cache_cfg(&cfg, &attach_cfg);
RETURN_CMD_RESULT(cmd_info, arg, retval); RETURN_CMD_RESULT(cmd_info, arg, retval);
} }
@ -402,8 +400,6 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
retval = cache_mngt_activate(&cfg, cmd_info); retval = cache_mngt_activate(&cfg, cmd_info);
cache_mngt_destroy_cache_standby_activate_cfg(&cfg);
RETURN_CMD_RESULT(cmd_info, arg, retval); RETURN_CMD_RESULT(cmd_info, arg, retval);
} }
default: default: