commit 88a85f3fa162e6deffe65192c812b3025cead94b
author Ioannis Ilkos <ilkos@google.com> Thu Apr 23 22:43:40 2020 +0100
committer Ioannis Ilkos <ilkos@google.com> Thu Apr 23 22:43:40 2020 +0100
tree a114463ded572d6d19fffe0c794edb1a166d1987
parent b57cf93f5ca4e29a0c5cbe0c4456bb8522547b42

Add ion/ion_stat to the atrace memory category

ion_stat was added to 4.19+ kernels as a successor to the existing
ion_heap_grow / shrink tracepoints

Bug: 154302786
Test: cuttlefish with new kernel, run atrace memory and cat /sys/kernel/tracing/events/ion/ion_stat/enable
Change-Id: I2502d281be0a1de5a0bde41482e70ad8ef29fd0b

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 8637a31..28fdaa4 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -237,6 +237,7 @@
         { OPT,      "events/kmem/rss_stat/enable" },
         { OPT,      "events/kmem/ion_heap_grow/enable" },
         { OPT,      "events/kmem/ion_heap_shrink/enable" },
+        { OPT,      "events/ion/ion_stat/enable" },
     } },
 };
 

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 040ddde..9b2f4a8 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -107,6 +107,8 @@
     chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_grow/enable
     chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_shrink/enable
     chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_shrink/enable
+    chmod 0666 /sys/kernel/debug/tracing/events/ion/ion_stat/enable
+    chmod 0666 /sys/kernel/tracing/events/ion/ion_stat/enable
     chmod 0666 /sys/kernel/debug/tracing/events/mm_event/mm_event_record/enable
     chmod 0666 /sys/kernel/tracing/events/mm_event/mm_event_record/enable
     chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_generate/enable