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

Commit 0f1b4367 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Eliminate memtrack variability in Lost RAM when ION is being used" am:... 

Merge "Eliminate memtrack variability in Lost RAM when ION is being used" am: 055977a3 am: fda49eb9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b8c6bf00639dfe066d99b8334c2328aa4e2f141
parents 3e0fe963 fda49eb9

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

+12 −5
Original line number Diff line number Diff line
@@ -13770,9 +13770,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

                totalPss -= totalMemtrackGraphics;

                totalPss += dmabufMapped;

            } else {

                final long totalExportedDmabuf = Debug.getDmabufTotalExportedKb();

                if (totalExportedDmabuf >= 0) {
@@ -14632,17 +14635,21 @@ public class ActivityManagerService extends IActivityManager.Stub 
        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));