commit cd5f08d8ee58834da49a5e7db25cf2fa6e604832
author Martin Liu <liumartin@google.com> Fri Aug 21 12:38:58 2020 +0800
committer Martin Liu <liumartin@google.com> Mon Sep 07 10:42:40 2020 +0800
tree 6a56e06c67eb3ad7cf355b8d1a59cf2262bd24ba
parent 07c9ed14e33238f71b1b909c2a07d9df7d84a694

Revert "lmkd: Add a margin for watermark when swap free is low"

This reverts commit 95551f816ae87fac700f97c7e6d1bf3302f2b85b.

Reason to revert: don't need this change.
Bug: 163134367

Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I8b209b054b6caec553bce13cd51f931401c1e42a

lmkd.cpp

diff --git a/lmkd.cpp b/lmkd.cpp
index b7eb18f..a2820b8 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -2239,11 +2239,9 @@
  * 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;
@@ -2251,7 +2249,7 @@
     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;
@@ -2408,7 +2406,7 @@
      }
 
     /* 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