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

Revert "lmkd: Add a margin for watermark when swap free is low" am: cd5f08d8ee am: 7a57924ce8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12445404

Change-Id: Id0d8e4fa7f6753623be2a4322a53083083a7daa2
This commit is contained in:
Martin Liu 2020-09-08 07:13:01 +00:00 committed by Automerger Merge Worker
parent 50dfb961e5 7a57924ce8
commit 6a7f526ac6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lmkd.cpp
View File

@ -2254,11 +2254,9 @@ struct zone_watermarks {
* Returns lowest breached watermark or WMARK_NONE.
*/
static enum zone_watermark get_lowest_watermark(union meminfo *mi,
struct zone_watermarks *watermarks,
long margin)
struct zone_watermarks *watermarks)
{
int64_t nr_free_pages = mi->field.nr_free_pages - mi->field.cma_free;
int64_t high_wmark = (watermarks->high_wmark * margin) / 100;
if (nr_free_pages < watermarks->min_wmark) {
return WMARK_MIN;
@ -2266,7 +2264,7 @@ static enum zone_watermark get_lowest_watermark(union meminfo *mi,
if (nr_free_pages < watermarks->low_wmark) {
return WMARK_LOW;
}
if (nr_free_pages < high_wmark) {
if (nr_free_pages < watermarks->high_wmark) {
return WMARK_HIGH;
}
return WMARK_NONE;
@ -2466,7 +2464,7 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
}
/* Find out which watermark is breached if any */
wmark = get_lowest_watermark(&mi, &watermarks, swap_is_low ? 115 : 100);
wmark = get_lowest_watermark(&mi, &watermarks);
/*
* TODO: move this logic into a separate function