commit 475f128493373d5237122611c70c0e8077286c61
author Carlos Galo <carlosgalo@google.com> Tue Apr 09 05:04:32 2024 +0000
committer Carlos Galo <carlosgalo@google.com> Wed Apr 10 18:05:12 2024 +0000
tree fd6d8512f109e41c29aa3036121f2d79a1cba664
parent fcc20357b342764cdd89707c7339dd883db10ada

KernelOomKillOccurred: Adding new oom/mark_victim fields

The oom/mark_victim tracepoint has been updated to capture additional
fields[1]. Update the OOM kill atom to track this new fields.

[1] https://android-review.googlesource.com/c/kernel/common/+/3030703

Test: statsd_testdrive 754 displays new fields
Test: Atom captures the same data from kernel OOM log
Bug: 331214192
Change-Id: I6691c31c629a6644fc4d4de2751c66457d264465
Merged-In: I6691c31c629a6644fc4d4de2751c66457d264465
Signed-off-by: Carlos Galo <carlosgalo@google.com>

stats/atoms/kernel/kernel_extension_atoms.proto

diff --git a/stats/atoms/kernel/kernel_extension_atoms.proto b/stats/atoms/kernel/kernel_extension_atoms.proto
index 8b6ae30..6178a3d 100644
--- a/stats/atoms/kernel/kernel_extension_atoms.proto
+++ b/stats/atoms/kernel/kernel_extension_atoms.proto
@@ -32,7 +32,7 @@
 /**
  * Logs each time the kernel's out-of-memory (OOM) killer claims a victim.
  * Logged from:
- *  frameworks/base/services/core/java/com/android/server/am/OomStatsReporter.java
+ *  frameworks/base/core/java/android/os/OomKillRecord.java
  */
 message KernelOomKillOccurred {
     // The uid if available. -1 means not available.
@@ -44,9 +44,24 @@
     // Recorded oom score when getting killed.
     optional int32 oom_score_adj = 3;
 
-    // Millisecond timestamp of when the kill was detected by the memhealth driver.
+    // Millisecond uptime timestamp of when the kill was detected by the memevents bpf-program.
     optional int64 timestamp_millis = 4;
 
     // Name of the killed process.
     optional string process_name = 5;
+
+    // OOM victim's virtual memory, which was freed up after the process' death.
+    optional int64 total_vm_kb = 6;
+
+    // OOM victim's anonymous RSS memory, which was freed up after the process' death.
+    optional int64 anon_rss_kb = 7;
+
+    // OOM victim's file-backed RSS memory, which was freed up after the process' death.
+    optional int64 file_rss_kb = 8;
+
+    // OOM victim's shared RSS memory, which was freed up after the process' death.
+    optional int64 shmem_rss_kb = 9;
+
+    // OOM victim's page tables, which was freed after the process' death
+    optional int64 pgtables_kb = 10;
 }