github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #757 from live4thee/alru/add-dirty-ratio

Browse Source 
alru: add parameter `max_dirty_ratio'
This commit is contained in:
Robert Baldyga 2022-10-07 15:14:24 +02:00 committed by GitHub
commit 4314e8eb13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/simple/src/main.c
View File

@ -94,7 +94,7 @@ int initialize_cache(ocf_ctx_t ctx, ocf_cache_t *cache)
ocf_mngt_cache_config_set_default(&cache_cfg);
cache_cfg.metadata_volatile = true;
/* Cache deivce (volume) configuration */
/* Cache device (volume) configuration */
type = ocf_ctx_get_volume_type(ctx, VOL_TYPE);
ret = ocf_uuid_set_str(&uuid, "cache");
if (ret)
@ -260,7 +260,7 @@ void complete_read(struct ocf_io *io, int error)
{
struct volume_data *data = ocf_io_get_data(io);
printf("WRITE COMPLETE (error: %d)\n", error);
printf("READ COMPLETE (error: %d)\n", error);
printf("DATA: \"%s\"\n", (char *)data->ptr);
/* Free data buffer and io */

11
inc/cleaning/alru.h
View File

@ -15,6 +15,7 @@ enum ocf_cleaning_alru_parameters {
ocf_alru_stale_buffer_time,
ocf_alru_flush_max_buffers,
ocf_alru_activity_threshold,
ocf_alru_max_dirty_ratio,
};
/**
@ -66,6 +67,16 @@ enum ocf_cleaning_alru_parameters {
/** Idle time before flushing thread can start default value */
#define OCF_ALRU_DEFAULT_ACTIVITY_THRESHOLD 10000
/**
* ALRU max dirty ratio for a cache device
*/
/** Minimum dirty ratio value */
#define OCF_ALRU_MIN_MAX_DIRTY_RATIO 0
/** Maximum dirty ratio value */
#define OCF_ALRU_MAX_MAX_DIRTY_RATIO 100
/** Default dirty ratio value */
#define OCF_ALRU_DEFAULT_MAX_DIRTY_RATIO OCF_ALRU_MAX_MAX_DIRTY_RATIO
/**
* @}
*/

4
inc/ocf_mngt.h
View File

@ -445,9 +445,9 @@ struct ocf_mngt_cache_attach_config {
};
/**
* @brief Initialize core config to default values
* @brief Initialize attach config to default values
*
* @note This function doesn't initiialize uuid and volume_type fields
* @note This function doesn't initialize uuid and volume_type fields
* which have no default values and are required to be set by user.
*
* @param[in] cfg Cache device config stucture

43
src/cleaning/alru.c
View File

@ -47,6 +47,7 @@
struct alru_flush_ctx {
struct ocf_cleaner_attribs attribs;
bool flush_perfomed;
bool dirty_ratio_exceeded;
uint32_t clines_no;
ocf_cache_t cache;
ocf_cleaner_end_t cmpl;
@ -359,6 +360,7 @@ void cleaning_policy_alru_setup(struct ocf_cache *cache)
config->stale_buffer_time = OCF_ALRU_DEFAULT_STALENESS_TIME;
config->flush_max_buffers = OCF_ALRU_DEFAULT_FLUSH_MAX_BUFFERS;
config->activity_threshold = OCF_ALRU_DEFAULT_ACTIVITY_THRESHOLD;
config->max_dirty_ratio = OCF_ALRU_DEFAULT_MAX_DIRTY_RATIO;
}
int cleaning_policy_alru_initialize(ocf_cache_t cache, int kick_cleaner)
@ -625,6 +627,16 @@ int cleaning_policy_alru_set_cleaning_param(ocf_cache_t cache,
"activity time threshold: %d\n",
config->activity_threshold);
break;
case ocf_alru_max_dirty_ratio:
OCF_CLEANING_CHECK_PARAM(cache, param_value,
OCF_ALRU_MIN_MAX_DIRTY_RATIO,
OCF_ALRU_MAX_MAX_DIRTY_RATIO,
"max_dirty_ratio");
config->max_dirty_ratio = param_value;
ocf_cache_log(cache, log_info, "Write-back flush thread "
"max dirty ratio: %d\n",
config->max_dirty_ratio);
break;
default:
return -OCF_ERR_INVAL;
}
@ -652,6 +664,9 @@ int cleaning_policy_alru_get_cleaning_param(ocf_cache_t cache,
case ocf_alru_activity_threshold:
*param_value = config->activity_threshold;
break;
case ocf_alru_max_dirty_ratio:
*param_value = config->max_dirty_ratio;
break;
default:
return -OCF_ERR_INVAL;
}
@ -698,13 +713,34 @@ static bool clean_later(ocf_cache_t cache, uint32_t *delta)
return false;
}
static bool is_cleanup_possible(ocf_cache_t cache)
static bool check_for_dirty_ratio(ocf_cache_t cache,
struct alru_cleaning_policy_config *config)
{
struct ocf_cache_info info;
if (config->max_dirty_ratio == OCF_ALRU_MAX_MAX_DIRTY_RATIO)
return false;
if (ocf_cache_get_info(cache, &info))
return false;
return info.dirty * 100 / info.size >= config->max_dirty_ratio;
}
static bool is_cleanup_possible(ocf_cache_t cache, struct alru_flush_ctx *fctx)
{
struct alru_cleaning_policy_config *config;
uint32_t delta;
config = (void *)&cache->conf_meta->cleaning[ocf_cleaning_alru].data;
if (check_for_dirty_ratio(cache, config)) {
fctx->dirty_ratio_exceeded = true;
OCF_DEBUG_PARAM(cache, "Dirty ratio exceeds: %u%%",
config->max_dirty_ratio);
return true;
}
if (check_for_io_activity(cache, config)) {
OCF_DEBUG_PARAM(cache, "IO activity detected");
return false;
@ -794,7 +830,7 @@ static int get_data_to_flush(struct alru_context *ctx)
cache_line = user_part->clean_pol->policy.alru.lru_tail;
last_access = compute_timestamp(config);
last_access = fctx->dirty_ratio_exceeded ? (uint32_t)(~0UL) : compute_timestamp(config);
#if OCF_CLEANING_DEBUG == 1
alru = &ocf_metadata_get_cleaning_policy(cache, cache_line)
@ -852,7 +888,7 @@ static void alru_clean(struct alru_context *ctx)
ocf_cache_t cache = fctx->cache;
int to_clean;
if (!is_cleanup_possible(cache)) {
if (!is_cleanup_possible(cache, fctx)) {
alru_clean_complete(fctx, 0);
return;
}
@ -909,6 +945,7 @@ void cleaning_alru_perform_cleaning(ocf_cache_t cache, ocf_cleaner_end_t cmpl)
fctx->cache = cache;
fctx->cmpl = cmpl;
fctx->flush_perfomed = false;
fctx->dirty_ratio_exceeded = false;
alru_clean(ctx);
}

1
src/cleaning/alru_structs.h
View File

@ -20,6 +20,7 @@ struct alru_cleaning_policy_config {
uint32_t stale_buffer_time; /* in seconds */
uint32_t flush_max_buffers; /* in lines */
uint32_t activity_threshold; /* in milliseconds */
uint32_t max_dirty_ratio; /* percent */
};
struct alru_cleaning_policy {