Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a3d889 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Eliminate memtrack variability in Lost RAM when ION is being used am: 6162e8bc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13790793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7380ef1955de479ce0cceac1fd69c35505531e80
parents 00b97ae9 6162e8bc

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -10790,9 +10790,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        pw.print(" unmapped + ");

                        pw.print(stringifyKBSize(ionPool));

                        pw.println(" pools)");

                kernelUsed += ionUnmapped;

                // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being

                // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

                kernelUsed += ionHeap;

                // set on ION VMAs, however it might be included by the memtrack HAL.

                // Replace memtrack HAL reported Graphics category with mapped dmabufs

                ss[INDEX_TOTAL_PSS] -= ss[INDEX_TOTAL_MEMTRACK_GRAPHICS];

                ss[INDEX_TOTAL_PSS] += dmabufMapped;

            } else {

                final long totalExportedDmabuf = Debug.getDmabufTotalExportedKb();

                if (totalExportedDmabuf >= 0) {

services/core/java/com/android/server/am/AppProfiler.java

+7 −3
Original line number Diff line number Diff line
@@ -1517,17 +1517,21 @@ public class AppProfiler { 
        long kernelUsed = memInfo.getKernelUsedSizeKb();

        final long ionHeap = Debug.getIonHeapsSizeKb();

        final long ionPool = Debug.getIonPoolsSizeKb();

        final long dmabufMapped = Debug.getDmabufMappedSizeKb();

        if (ionHeap >= 0 && ionPool >= 0) {

            final long ionUnmapped = ionHeap - dmabufMapped;

            memInfoBuilder.append("       ION: ");

            memInfoBuilder.append(stringifyKBSize(ionHeap + ionPool));

            memInfoBuilder.append("\n");

            kernelUsed += ionUnmapped;

            // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being

            // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

            kernelUsed += ionHeap;

            // set on ION VMAs, however it might be included by the memtrack HAL.

            // Replace memtrack HAL reported Graphics category with mapped dmabufs

            totalPss -= totalMemtrackGraphics;

            totalPss += dmabufMapped;

        } else {

            final long totalExportedDmabuf = Debug.getDmabufTotalExportedKb();

            if (totalExportedDmabuf >= 0) {

                final long dmabufMapped = Debug.getDmabufMappedSizeKb();

                final long dmabufUnmapped = totalExportedDmabuf - dmabufMapped;

                memInfoBuilder.append("DMA-BUF: ");

                memInfoBuilder.append(stringifyKBSize(totalExportedDmabuf));