commit 40899ad1e693a94ea0abb24d34c350dfaf36979f
author Suren Baghdasaryan <surenb@google.com> Mon Nov 25 19:30:29 2019 -0800
committer Suren Baghdasaryan <surenb@google.com> Thu Dec 19 19:49:05 2019 +0000
tree 0d64e346fea9ce99d0e5dbdd364d0d1b658a07c0
parent 5911b9ef0a4e28cd2f3921681f5da4afd32e443a

Improve cached kernel memory accounting using meminfo KReclaimable field

KReclaimable field from /proc/meminfo is designed to represent total amount
of memory that kernel can reclaim when needed. This includes reclaimable
memory consumed by slab and reported in SReclaimable field as well as ION
pools. By using KReclaimable instead of SReclaimable we will account for
ION pools currently reported under "Lost RAM" category in dumpsys meminfo
report.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: Ifdea234d05639db93074ab598b81db5ff5b43612
Signed-off-by: Suren Baghdasaryan <surenb@google.com>

core/java/com/android/internal/util/MemInfoReader.java

diff --git a/core/java/com/android/internal/util/MemInfoReader.java b/core/java/com/android/internal/util/MemInfoReader.java
index c1d129b..362bc92 100644
--- a/core/java/com/android/internal/util/MemInfoReader.java
+++ b/core/java/com/android/internal/util/MemInfoReader.java
@@ -91,7 +91,15 @@
      * that are mapped in to processes.
      */
     public long getCachedSizeKb() {
-        return mInfos[Debug.MEMINFO_BUFFERS] + mInfos[Debug.MEMINFO_SLAB_RECLAIMABLE]
+        long kReclaimable = mInfos[Debug.MEMINFO_KRECLAIMABLE];
+
+        // Note: MEMINFO_KRECLAIMABLE includes MEMINFO_SLAB_RECLAIMABLE and ION pools.
+        // Fall back to using MEMINFO_SLAB_RECLAIMABLE in case of older kernels that do
+        // not include KReclaimable meminfo field.
+        if (kReclaimable == 0) {
+            kReclaimable = mInfos[Debug.MEMINFO_SLAB_RECLAIMABLE];
+        }
+        return mInfos[Debug.MEMINFO_BUFFERS] + kReclaimable
                 + mInfos[Debug.MEMINFO_CACHED] - mInfos[Debug.MEMINFO_MAPPED];
     }