wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd: fix low swap threshold failing to update after reinit 

lmkd calculates low swap threshold using total available swap and
ro.lmk.swap_free_low_percentage property. A wrong assumption is made that
both these values are constant and therefore the threshold can be
calculated once and reused later. However ro.lmk.swap_free_low_percentage
can be changed by the user and lmkd --reinit issued to reapply new
configuration. If that happens low swap threshold will not be updated.
Fix this by calculating the threshold whenever it is used. The overhead
of that calculation is negligible.

Bug: 203161607
Test: setprop ro.lmk.swap_free_low_percentage <new value>; lmkd --reinit
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Idff50655a75d006ea86d9ab10ca54c375c4bea46
This commit is contained in:
Suren Baghdasaryan 2021-10-28 13:30:08 -07:00
parent 1938f90eb8
commit 6e6d14b387
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lmkd.cpp
View File

@ -2428,7 +2428,6 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
static int64_t base_file_lru; static int64_t base_file_lru;
static int64_t init_pgscan_kswapd; static int64_t init_pgscan_kswapd;
static int64_t init_pgscan_direct; static int64_t init_pgscan_direct;
static int64_t swap_low_threshold;
static bool killing; static bool killing;
static int thrashing_limit = thrashing_limit_pct; static int thrashing_limit = thrashing_limit_pct;
static struct zone_watermarks watermarks; static struct zone_watermarks watermarks;
@ -2453,6 +2452,7 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
bool cut_thrashing_limit = false; bool cut_thrashing_limit = false;
int min_score_adj = 0; int min_score_adj = 0;
int swap_util = 0; int swap_util = 0;
int64_t swap_low_threshold;
long since_thrashing_reset_ms; long since_thrashing_reset_ms;
int64_t workingset_refault_file; int64_t workingset_refault_file;
@ -2501,10 +2501,10 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
/* Check free swap levels */ /* Check free swap levels */
if (swap_free_low_percentage) { if (swap_free_low_percentage) {
if (!swap_low_threshold) {
swap_low_threshold = mi.field.total_swap * swap_free_low_percentage / 100; swap_low_threshold = mi.field.total_swap * swap_free_low_percentage / 100;
}
swap_is_low = mi.field.free_swap < swap_low_threshold; swap_is_low = mi.field.free_swap < swap_low_threshold;
} else {
swap_low_threshold = 0;
} }
/* Identify reclaim state */ /* Identify reclaim state */