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

Unified management functions prefix

Browse Source 
Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2019-06-05 06:06:16 -04:00
parent 7025cab6cc
commit 0208375202
6 changed files with 262 additions and 1684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

366
modules/cas_cache/layer_cache_management.c
View File

File diff suppressed because it is too large Load Diff

66
modules/cas_cache/layer_cache_management.h
View File

@ -10,86 +10,86 @@
struct atomic_dev_params;
int cache_mng_set_cleaning_policy(ocf_cache_id_t cache_id, uint32_t type);
int cache_mngt_set_cleaning_policy(ocf_cache_id_t cache_id, uint32_t type);
int cache_mng_get_cleaning_policy(ocf_cache_id_t cache_id, uint32_t *type);
int cache_mngt_get_cleaning_policy(ocf_cache_id_t cache_id, uint32_t *type);
int cache_mng_set_cleaning_param(ocf_cache_id_t cache_id, ocf_cleaning_t type,
int cache_mngt_set_cleaning_param(ocf_cache_id_t cache_id, ocf_cleaning_t type,
uint32_t param_id, uint32_t param_value);
int cache_mng_get_cleaning_param(ocf_cache_id_t cache_id, ocf_cleaning_t type,
int cache_mngt_get_cleaning_param(ocf_cache_id_t cache_id, ocf_cleaning_t type,
uint32_t param_id, uint32_t *param_value);
int cache_mng_add_core_to_cache(struct ocf_mngt_core_config *cfg,
int cache_mngt_add_core_to_cache(struct ocf_mngt_core_config *cfg,
ocf_cache_id_t cache_id, struct kcas_insert_core *cmd_info);
int cache_mng_remove_core_from_cache(struct kcas_remove_core *cmd);
int cache_mngt_remove_core_from_cache(struct kcas_remove_core *cmd);
int cache_mng_reset_stats(ocf_cache_id_t cache_id,
int cache_mngt_reset_stats(ocf_cache_id_t cache_id,
ocf_core_id_t core_id);
int cache_mng_set_partitions(struct kcas_io_classes *cfg);
int cache_mngt_set_partitions(struct kcas_io_classes *cfg);
int cache_mng_exit_instance(ocf_cache_id_t id, int flush);
int cache_mngt_exit_instance(ocf_cache_id_t id, int flush);
int cache_mng_prepare_cache_cfg(struct ocf_mngt_cache_config *cfg,
int cache_mngt_prepare_cache_cfg(struct ocf_mngt_cache_config *cfg,
struct ocf_mngt_cache_device_config *device_cfg,
struct atomic_dev_params *atomic_params,
struct kcas_start_cache *cmd);
int cache_mng_core_pool_get_paths(struct kcas_core_pool_path *cmd_info);
int cache_mngt_core_pool_get_paths(struct kcas_core_pool_path *cmd_info);
int cache_mng_core_pool_remove(struct kcas_core_pool_remove *cmd_info);
int cache_mngt_core_pool_remove(struct kcas_core_pool_remove *cmd_info);
int cache_mng_cache_check_device(struct kcas_cache_check_device *cmd_info);
int cache_mngt_cache_check_device(struct kcas_cache_check_device *cmd_info);
int cache_mng_prepare_core_cfg(struct ocf_mngt_core_config *cfg,
int cache_mngt_prepare_core_cfg(struct ocf_mngt_core_config *cfg,
struct kcas_insert_core *cmd_info);
int cache_mng_init_instance(struct ocf_mngt_cache_config *cfg,
int cache_mngt_init_instance(struct ocf_mngt_cache_config *cfg,
struct ocf_mngt_cache_device_config *device_cfg,
struct kcas_start_cache *cmd);
int cache_mng_set_seq_cutoff_threshold(ocf_cache_id_t id, ocf_core_id_t core_id,
int cache_mngt_set_seq_cutoff_threshold(ocf_cache_id_t id, ocf_core_id_t core_id,
uint32_t thresh);
int cache_mng_set_seq_cutoff_policy(ocf_cache_id_t id, ocf_core_id_t core_id,
int cache_mngt_set_seq_cutoff_policy(ocf_cache_id_t id, ocf_core_id_t core_id,
ocf_seq_cutoff_policy policy);
int cache_mng_get_seq_cutoff_threshold(ocf_cache_id_t id, ocf_core_id_t core_id,
int cache_mngt_get_seq_cutoff_threshold(ocf_cache_id_t id, ocf_core_id_t core_id,
uint32_t *thresh);
int cache_mng_get_seq_cutoff_policy(ocf_cache_id_t id, ocf_core_id_t core_id,
int cache_mngt_get_seq_cutoff_policy(ocf_cache_id_t id, ocf_core_id_t core_id,
ocf_seq_cutoff_policy *policy);
int cache_mng_set_cache_mode(ocf_cache_id_t id, ocf_cache_mode_t mode,
int cache_mngt_set_cache_mode(ocf_cache_id_t id, ocf_cache_mode_t mode,
uint8_t flush);
int cache_mng_flush_object(ocf_cache_id_t cache_id, ocf_core_id_t core_id);
int cache_mngt_flush_object(ocf_cache_id_t cache_id, ocf_core_id_t core_id);
int cache_mng_flush_device(ocf_cache_id_t id);
int cache_mngt_flush_device(ocf_cache_id_t id);
ocf_cache_line_t cache_mng_lookup(ocf_cache_t cache,
ocf_cache_line_t cache_mngt_lookup(ocf_cache_t cache,
ocf_core_id_t core_id, uint64_t core_cacheline);
int cache_mng_list_caches(struct kcas_cache_list *list);
int cache_mngt_list_caches(struct kcas_cache_list *list);
int cache_mng_interrupt_flushing(ocf_cache_id_t id);
int cache_mngt_interrupt_flushing(ocf_cache_id_t id);
int cache_mng_get_info(struct kcas_cache_info *info);
int cache_mngt_get_info(struct kcas_cache_info *info);
int cache_mng_get_io_class_info(struct kcas_io_class *part);
int cache_mngt_get_io_class_info(struct kcas_io_class *part);
int cache_mng_get_core_info(struct kcas_core_info *info);
int cache_mngt_get_core_info(struct kcas_core_info *info);
void cache_mng_wait_for_rq_finish(ocf_cache_t cache);
void cache_mngt_wait_for_rq_finish(ocf_cache_t cache);
int cache_mng_set_core_params(struct kcas_set_core_param *info);
int cache_mngt_set_core_params(struct kcas_set_core_param *info);
int cache_mng_get_core_params(struct kcas_get_core_param *info);
int cache_mngt_get_core_params(struct kcas_get_core_param *info);
int cache_mng_set_cache_params(struct kcas_set_cache_param *info);
int cache_mngt_set_cache_params(struct kcas_set_cache_param *info);
int cache_mng_get_cache_params(struct kcas_get_cache_param *info);
int cache_mngt_get_cache_params(struct kcas_get_cache_param *info);
#endif

44
modules/cas_cache/layer_upgrade.c
View File

@ -321,18 +321,18 @@ static int _cas_upgrade_dump_cache_conf_flush(ocf_cache_t cache,
CAS_DEBUG_TRACE();
result |= cache_mng_get_cleaning_policy(cache_id, &cleaning_type);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_get_cleaning_policy(cache_id, &cleaning_type);
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_wake_up_time, &alru_thread_wakeup_time);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_stale_buffer_time, &alru_stale_buffer_time);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_flush_max_buffers, &alru_flush_max_buffers);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_activity_threshold, &alru_activity_threshold);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_acp,
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_acp,
ocf_acp_wake_up_time, &acp_thread_wakeup_time);
result |= cache_mng_get_cleaning_param(cache_id, ocf_cleaning_acp,
result |= cache_mngt_get_cleaning_param(cache_id, ocf_cleaning_acp,
ocf_acp_flush_max_buffers, &acp_flush_max_buffers);
if (result) {
printk(KERN_ERR OCF_PREFIX_SHORT
@ -749,11 +749,11 @@ int _cas_upgrade_set_pt_and_flush_visitor_cache(ocf_cache_t cache, void *cntx)
int *result = (int*) cntx;
int cache_id = ocf_cache_get_id(cache);
*result = cache_mng_set_cache_mode(cache_id, ocf_cache_mode_pt, false);
*result = cache_mngt_set_cache_mode(cache_id, ocf_cache_mode_pt, false);
if (*result)
return *result;
*result = cache_mng_flush_device(cache_id);
*result = cache_mngt_flush_device(cache_id);
if (*result)
return *result;
@ -778,7 +778,7 @@ static int _cas_upgrade_set_pt_and_flush(void)
int _cas_upgrade_stop_devices_visitor_wait(ocf_cache_t cache, void *cntx)
{
cache_mng_wait_for_rq_finish(cache);
cache_mngt_wait_for_rq_finish(cache);
return 0;
}
@ -787,7 +787,7 @@ int _cas_upgrade_stop_devices_visitor_exit(ocf_cache_t cache, void *cntx)
{
int *result = (int*) cntx;
*result = cache_mng_exit_instance(ocf_cache_get_id(cache), true);
*result = cache_mngt_exit_instance(ocf_cache_get_id(cache), true);
return *result;
}
@ -893,7 +893,7 @@ static int _cas_upgrade_restore_conf_main(struct cas_properties *cache_props,
device_cfg.volume_params = &atomic_params;
}
result = cache_mng_init_instance(&cfg, &device_cfg, NULL);
result = cache_mngt_init_instance(&cfg, &device_cfg, NULL);
error:
kfree(cache_path);
@ -962,7 +962,7 @@ static int _cas_upgrade_restore_conf_core(struct cas_properties *cache_props,
cfg.uuid.data = core_path;
cfg.uuid.size = strnlen(core_path, MAX_STR_LEN) + 1;
result = cache_mng_add_core_to_cache(&cfg,
result = cache_mngt_add_core_to_cache(&cfg,
ocf_cache_get_id(cache), NULL);
if (result)
goto error;
@ -1063,18 +1063,18 @@ static int _cas_upgrade_restore_conf_flush(struct cas_properties *cache_props,
if (result)
return result;
result |= cache_mng_set_cleaning_policy(cache_id, cleaning_type);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_set_cleaning_policy(cache_id, cleaning_type);
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_wake_up_time, alru_thread_wakeup_time);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_stale_buffer_time, alru_stale_buffer_time);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_flush_max_buffers, alru_flush_max_buffers);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_alru,
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_alru,
ocf_alru_activity_threshold, alru_activity_threshold);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_acp,
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_acp,
ocf_acp_wake_up_time, acp_thread_wakeup_time);
result |= cache_mng_set_cleaning_param(cache_id, ocf_cleaning_acp,
result |= cache_mngt_set_cleaning_param(cache_id, ocf_cleaning_acp,
ocf_acp_flush_max_buffers, acp_flush_max_buffers);
return result;
@ -1181,7 +1181,7 @@ static int _cas_upgrade_restore_conf_io_class(
cfg->info[part_id].min_size = (uint32_t)min_size;
}
result = cache_mng_set_partitions(cfg);
result = cache_mngt_set_partitions(cfg);
error_after_alloc_buffers:
kfree(key);
@ -1256,7 +1256,7 @@ static int _cas_upgrade_restore_cache_mode(struct cas_properties *cache_props)
goto error;
if (ocf_cache_get_mode(cache) != cache_mode) {
result = cache_mng_set_cache_mode(ocf_cache_get_id(cache),
result = cache_mngt_set_cache_mode(ocf_cache_get_id(cache),
cache_mode, false);
if (result)
goto error;

46
modules/cas_cache/service_ui_ioctl.c
View File

@ -65,12 +65,12 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_prepare_cache_cfg(&cfg, &device_cfg,
retval = cache_mngt_prepare_cache_cfg(&cfg, &device_cfg,
&atomic_params, cmd_info);
if (retval)
RETURN_CMD_RESULT(cmd_info, arg, retval);
retval = cache_mng_init_instance(&cfg, &device_cfg, cmd_info);
retval = cache_mngt_init_instance(&cfg, &device_cfg, cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -80,7 +80,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_exit_instance(cmd_info->cache_id,
retval = cache_mngt_exit_instance(cmd_info->cache_id,
cmd_info->flush_data);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -91,7 +91,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_set_cache_mode(cmd_info->cache_id,
retval = cache_mngt_set_cache_mode(cmd_info->cache_id,
cmd_info->caching_mode, cmd_info->flush_data);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -103,11 +103,11 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_prepare_core_cfg(&cfg, cmd_info);
retval = cache_mngt_prepare_core_cfg(&cfg, cmd_info);
if (retval)
RETURN_CMD_RESULT(cmd_info, arg, retval);
retval = cache_mng_add_core_to_cache(&cfg, cmd_info->cache_id,
retval = cache_mngt_add_core_to_cache(&cfg, cmd_info->cache_id,
cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -118,7 +118,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_remove_core_from_cache(cmd_info);
retval = cache_mngt_remove_core_from_cache(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -128,7 +128,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_reset_stats(cmd_info->cache_id,
retval = cache_mngt_reset_stats(cmd_info->cache_id,
cmd_info->core_id);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -139,7 +139,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_flush_device(cmd_info->cache_id);
retval = cache_mngt_flush_device(cmd_info->cache_id);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -149,7 +149,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_interrupt_flushing(cmd_info->cache_id);
retval = cache_mngt_interrupt_flushing(cmd_info->cache_id);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -159,7 +159,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_flush_object(cmd_info->cache_id,
retval = cache_mngt_flush_object(cmd_info->cache_id,
cmd_info->core_id);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -170,7 +170,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_get_info(cmd_info);
retval = cache_mngt_get_info(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -180,7 +180,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_get_core_info(cmd_info);
retval = cache_mngt_get_core_info(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -190,7 +190,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_get_io_class_info(cmd_info);
retval = cache_mngt_get_io_class_info(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -203,7 +203,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
* ocf_io_class_info structs past the end of kcas_io_classes */
_GET_CMD_INFO(cmd_info, arg, KCAS_IO_CLASSES_SIZE);
retval = cache_mng_set_partitions(cmd_info);
retval = cache_mngt_set_partitions(cmd_info);
/* return just sizeof(struct kcas_io_classes) bytes of data */
RETURN_CMD_RESULT(cmd_info, arg, retval);
@ -224,7 +224,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_list_caches(cmd_info);
retval = cache_mngt_list_caches(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval > 0 ? 0 : retval);
}
@ -282,7 +282,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_core_pool_get_paths(cmd_info);
retval = cache_mngt_core_pool_get_paths(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -291,7 +291,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_core_pool_remove(cmd_info);
retval = cache_mngt_core_pool_remove(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -300,7 +300,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_cache_check_device(cmd_info);
retval = cache_mngt_cache_check_device(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -309,7 +309,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_set_core_params(cmd_info);
retval = cache_mngt_set_core_params(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -318,7 +318,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_get_core_params(cmd_info);
retval = cache_mngt_get_core_params(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -327,7 +327,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_set_cache_params(cmd_info);
retval = cache_mngt_set_cache_params(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}
@ -336,7 +336,7 @@ long cas_service_ioctl_ctrl(struct file *filp, unsigned int cmd,
GET_CMD_INFO(cmd_info, arg);
retval = cache_mng_get_cache_params(cmd_info);
retval = cache_mngt_get_cache_params(cmd_info);
RETURN_CMD_RESULT(cmd_info, arg, retval);
}

1422
modules/tags
View File

File diff suppressed because it is too large Load Diff

2
ocf

@ -1 +1 @@
Subproject commit cc3b38c9e3ff3b0ffb96b27a87f930815f315060
Subproject commit 75ec3c7db424e11b6e5fbde5f5afba12b824f849