diff options
author | Carlos Galo <carlosgalo@google.com> | 2024-04-09 05:04:32 +0000 |
---|---|---|
committer | Carlos Galo <carlosgalo@google.com> | 2024-04-10 18:05:12 +0000 |
commit | 475f128493373d5237122611c70c0e8077286c61 (patch) | |
tree | fd6d8512f109e41c29aa3036121f2d79a1cba664 | |
parent | fcc20357b342764cdd89707c7339dd883db10ada (diff) | |
download | proto_logging-475f128493373d5237122611c70c0e8077286c61.tar.gz |
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>
-rw-r--r-- | stats/atoms/kernel/kernel_extension_atoms.proto | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/stats/atoms/kernel/kernel_extension_atoms.proto b/stats/atoms/kernel/kernel_extension_atoms.proto index 8b6ae308..6178a3d2 100644 --- a/stats/atoms/kernel/kernel_extension_atoms.proto +++ b/stats/atoms/kernel/kernel_extension_atoms.proto @@ -32,7 +32,7 @@ extend Atom { /** * 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 @@ message KernelOomKillOccurred { // 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; } |