Skip to content

Commit 63d990a

Browse files
committed
Changed misleading 'max dirty ratio' name
The updated name version is 'dirty ratio trigger' Signed-off-by: Daniel Madej <daniel.madej@huawei.com>
1 parent 10c0d91 commit 63d990a

File tree

3 files changed

+29
-26
lines changed

3 files changed

+29
-26
lines changed

inc/cleaning/alru.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ enum ocf_cleaning_alru_parameters {
1717
ocf_alru_stale_buffer_time,
1818
ocf_alru_flush_max_buffers,
1919
ocf_alru_activity_threshold,
20-
ocf_alru_max_dirty_ratio,
20+
ocf_alru_dirty_ratio_trigger,
2121
};
2222

2323
/**
@@ -70,17 +70,18 @@ enum ocf_cleaning_alru_parameters {
7070
#define OCF_ALRU_DEFAULT_ACTIVITY_THRESHOLD 10000
7171

7272
/**
73-
* ALRU max dirty ratio for a cache device
73+
* ALRU dirty ratio based cleaning trigger for a cache device
7474
*/
7575

76-
/** Minimum dirty ratio value */
77-
#define OCF_ALRU_MIN_MAX_DIRTY_RATIO 0
78-
/** Maximum dirty ratio value */
79-
#define OCF_ALRU_MAX_MAX_DIRTY_RATIO 100
80-
/** Default dirty ratio value */
81-
#define OCF_ALRU_DEFAULT_MAX_DIRTY_RATIO OCF_ALRU_MAX_MAX_DIRTY_RATIO
76+
/** Minimum dirty ratio trigger value */
77+
#define OCF_ALRU_MIN_DIRTY_RATIO_TRIGGER 0
78+
/** Maximum dirty ratio trigger value */
79+
#define OCF_ALRU_MAX_DIRTY_RATIO_TRIGGER 100
80+
/** Default dirty ratio trigger value */
81+
#define OCF_ALRU_DEFAULT_DIRTY_RATIO_TRIGGER \
82+
OCF_ALRU_MAX_DIRTY_RATIO_TRIGGER
8283
/** Default dirty ratio trigger inertia */
83-
#define OCF_ALRU_DEFAULT_TRIGGER_INERTIA 5
84+
#define OCF_ALRU_DEFAULT_TRIGGER_INERTIA 5
8485
/**
8586
* @}
8687
*/

src/cleaning/alru.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ void cleaning_policy_alru_setup(struct ocf_cache *cache)
363363
config->stale_buffer_time = OCF_ALRU_DEFAULT_STALENESS_TIME;
364364
config->flush_max_buffers = OCF_ALRU_DEFAULT_FLUSH_MAX_BUFFERS;
365365
config->activity_threshold = OCF_ALRU_DEFAULT_ACTIVITY_THRESHOLD;
366-
config->max_dirty_ratio = OCF_ALRU_DEFAULT_MAX_DIRTY_RATIO;
366+
config->dirty_trigger_threshold = OCF_ALRU_DEFAULT_DIRTY_RATIO_TRIGGER;
367367
config->dirty_trigger_inertia = OCF_ALRU_DEFAULT_TRIGGER_INERTIA;
368368
}
369369

@@ -632,18 +632,19 @@ int cleaning_policy_alru_set_cleaning_param(ocf_cache_t cache,
632632
"activity time threshold: %d\n",
633633
config->activity_threshold);
634634
break;
635-
case ocf_alru_max_dirty_ratio:
635+
case ocf_alru_dirty_ratio_trigger:
636636
OCF_CLEANING_CHECK_PARAM(cache, param_value,
637-
OCF_ALRU_MIN_MAX_DIRTY_RATIO,
638-
OCF_ALRU_MAX_MAX_DIRTY_RATIO,
639-
"max_dirty_ratio");
640-
config->max_dirty_ratio = param_value;
637+
OCF_ALRU_MIN_DIRTY_RATIO_TRIGGER,
638+
OCF_ALRU_MAX_DIRTY_RATIO_TRIGGER,
639+
"dirty_trigger_threshold");
640+
config->dirty_trigger_threshold = param_value;
641641
ocf_cache_log(cache, log_info, "Write-back flush thread "
642-
"max dirty ratio: %d\n",
643-
config->max_dirty_ratio);
644-
if (config->max_dirty_ratio < config->dirty_trigger_inertia)
642+
"dirty ratio trigger threshold: %d\n",
643+
config->dirty_trigger_threshold);
644+
if (config->dirty_trigger_threshold
645+
< config->dirty_trigger_inertia)
645646
config->dirty_trigger_inertia
646-
= config->max_dirty_ratio;
647+
= config->dirty_trigger_threshold;
647648
break;
648649
default:
649650
return -OCF_ERR_INVAL;
@@ -672,8 +673,8 @@ int cleaning_policy_alru_get_cleaning_param(ocf_cache_t cache,
672673
case ocf_alru_activity_threshold:
673674
*param_value = config->activity_threshold;
674675
break;
675-
case ocf_alru_max_dirty_ratio:
676-
*param_value = config->max_dirty_ratio;
676+
case ocf_alru_dirty_ratio_trigger:
677+
*param_value = config->dirty_trigger_threshold;
677678
break;
678679
default:
679680
return -OCF_ERR_INVAL;
@@ -728,16 +729,17 @@ static bool check_for_dirty_ratio(ocf_cache_t cache,
728729
struct alru_context *ctx;
729730
uint32_t threshold;
730731

731-
if (config->max_dirty_ratio == OCF_ALRU_MAX_MAX_DIRTY_RATIO)
732+
if (config->dirty_trigger_threshold == OCF_ALRU_MAX_DIRTY_RATIO_TRIGGER)
732733
return false;
733734

734735
if (ocf_cache_get_info(cache, &info))
735736
return false;
736737

737738
ctx = cache->cleaner.cleaning_policy_context;
738739
threshold = ctx->dirty_ratio_triggered
739-
? config->max_dirty_ratio - config->dirty_trigger_inertia
740-
: config->max_dirty_ratio;
740+
? config->dirty_trigger_threshold
741+
- config->dirty_trigger_inertia
742+
: config->dirty_trigger_threshold;
741743

742744
ctx->dirty_ratio_triggered = info.dirty * 100 / info.size >= threshold;
743745
return ctx->dirty_ratio_triggered;
@@ -753,7 +755,7 @@ static bool is_cleanup_possible(ocf_cache_t cache, struct alru_flush_ctx *fctx)
753755
if (check_for_dirty_ratio(cache, config)) {
754756
fctx->dirty_ratio_exceeded = true;
755757
OCF_DEBUG_PARAM(cache, "Dirty ratio exceeds: %u%%",
756-
config->max_dirty_ratio);
758+
config->dirty_trigger_threshold);
757759
return true;
758760
}
759761

src/cleaning/alru_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct alru_cleaning_policy_config {
2222
uint32_t stale_buffer_time; /* in seconds */
2323
uint32_t flush_max_buffers; /* in lines */
2424
uint32_t activity_threshold; /* in milliseconds */
25-
uint32_t max_dirty_ratio; /* percent */
25+
uint32_t dirty_trigger_threshold; /* percent */
2626
uint32_t dirty_trigger_inertia; /* percent */
2727
};
2828

0 commit comments

Comments
 (0)