Add gpu_mem_total ftrace event
This change adds the proto updates required to trace gpu_mem_total
ftrace events from the android kernel.
Test: OUT=out/android_release_arm64 CONFIG=<trace proto config>
tools/tmux
Bug: 157142826
Change-Id: I3c18ded9239dca76592b9439cd8ecf0e42dcb0c2
diff --git a/Android.bp b/Android.bp
index b7c3df7..e1b75a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3527,6 +3527,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -3570,6 +3571,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ion.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.gen.cc",
@@ -3613,6 +3615,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -3656,6 +3659,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ion.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.gen.h",
@@ -3703,6 +3707,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -3745,6 +3750,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ion.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.pb.cc",
@@ -3788,6 +3794,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -3830,6 +3837,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ion.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.pb.h",
@@ -3877,6 +3885,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -3920,6 +3929,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ion.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.pbzero.cc",
@@ -3963,6 +3973,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
@@ -4006,6 +4017,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ion.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ipi.pbzero.h",
diff --git a/BUILD b/BUILD
index 31ec7c2..4521953 100644
--- a/BUILD
+++ b/BUILD
@@ -2191,6 +2191,7 @@
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
"protos/perfetto/trace/ftrace/generic.proto",
+ "protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
"protos/perfetto/trace/ftrace/ion.proto",
"protos/perfetto/trace/ftrace/ipi.proto",
diff --git a/protos/perfetto/trace/ftrace/all_protos.gni b/protos/perfetto/trace/ftrace/all_protos.gni
index a1deef0..fc11e54 100644
--- a/protos/perfetto/trace/ftrace/all_protos.gni
+++ b/protos/perfetto/trace/ftrace/all_protos.gni
@@ -30,6 +30,7 @@
"fence.proto",
"filemap.proto",
"ftrace.proto",
+ "gpu_mem.proto",
"i2c.proto",
"ion.proto",
"ipi.proto",
diff --git a/protos/perfetto/trace/ftrace/ftrace_event.proto b/protos/perfetto/trace/ftrace/ftrace_event.proto
index 2afe0a6..ba8db73 100644
--- a/protos/perfetto/trace/ftrace/ftrace_event.proto
+++ b/protos/perfetto/trace/ftrace/ftrace_event.proto
@@ -30,6 +30,7 @@
import "protos/perfetto/trace/ftrace/fence.proto";
import "protos/perfetto/trace/ftrace/filemap.proto";
import "protos/perfetto/trace/ftrace/ftrace.proto";
+import "protos/perfetto/trace/ftrace/gpu_mem.proto";
import "protos/perfetto/trace/ftrace/i2c.proto";
import "protos/perfetto/trace/ftrace/ion.proto";
import "protos/perfetto/trace/ftrace/ipi.proto";
@@ -420,5 +421,6 @@
IonBufferDestroyFtraceEvent ion_buffer_destroy = 337;
ScmCallStartFtraceEvent scm_call_start = 338;
ScmCallEndFtraceEvent scm_call_end = 339;
+ GpuMemTotalFtraceEvent gpu_mem_total = 340;
}
}
diff --git a/protos/perfetto/trace/ftrace/gpu_mem.proto b/protos/perfetto/trace/ftrace/gpu_mem.proto
new file mode 100644
index 0000000..7578492
--- /dev/null
+++ b/protos/perfetto/trace/ftrace/gpu_mem.proto
@@ -0,0 +1,12 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message GpuMemTotalFtraceEvent {
+ optional uint32 gpu_id = 1;
+ optional uint32 pid = 2;
+ optional uint64 size = 3;
+}
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 1e549ad..dbf902e 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -3305,6 +3305,16 @@
// End of protos/perfetto/trace/ftrace/generic.proto
+// Begin of protos/perfetto/trace/ftrace/gpu_mem.proto
+
+message GpuMemTotalFtraceEvent {
+ optional uint32 gpu_id = 1;
+ optional uint32 pid = 2;
+ optional uint64 size = 3;
+}
+
+// End of protos/perfetto/trace/ftrace/gpu_mem.proto
+
// Begin of protos/perfetto/trace/ftrace/i2c.proto
message I2cReadFtraceEvent {
@@ -4500,6 +4510,7 @@
IonBufferDestroyFtraceEvent ion_buffer_destroy = 337;
ScmCallStartFtraceEvent scm_call_start = 338;
ScmCallEndFtraceEvent scm_call_end = 339;
+ GpuMemTotalFtraceEvent gpu_mem_total = 340;
}
}
diff --git a/src/traced/probes/ftrace/event_info.cc b/src/traced/probes/ftrace/event_info.cc
index 752614c..3449084 100644
--- a/src/traced/probes/ftrace/event_info.cc
+++ b/src/traced/probes/ftrace/event_info.cc
@@ -3953,6 +3953,22 @@
kUnsetFtraceId,
3,
kUnsetSize},
+ {"gpu_mem_total",
+ "gpu_mem",
+ {
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "gpu_id", 1, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "pid", 2, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "size", 3, ProtoSchemaType::kUint64,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ },
+ kUnsetFtraceId,
+ 340,
+ kUnsetSize},
{"i2c_read",
"i2c",
{
diff --git a/src/traced/probes/ftrace/test/data/synthetic/events/gpu_mem/gpu_mem_total/format b/src/traced/probes/ftrace/test/data/synthetic/events/gpu_mem/gpu_mem_total/format
new file mode 100644
index 0000000..7a95262
--- /dev/null
+++ b/src/traced/probes/ftrace/test/data/synthetic/events/gpu_mem/gpu_mem_total/format
@@ -0,0 +1,13 @@
+name: gpu_mem_total
+ID: 639
+format:
+ field:unsigned short common_type; offset:0; size:2; signed:0;
+ field:unsigned char common_flags; offset:2; size:1; signed:0;
+ field:unsigned char common_preempt_count; offset:3; size:1; signed:0;
+ field:int common_pid; offset:4; size:4; signed:1;
+
+ field:uint32_t gpu_id; offset:8; size:4; signed:0;
+ field:uint32_t pid; offset:12; size:4; signed:0;
+ field:uint64_t size; offset:16; size:8; signed:0;
+
+print fmt: "gpu_id=%u pid=%u size=%llu", REC->gpu_id, REC->pid, REC->size
diff --git a/tools/ftrace_proto_gen/event_whitelist b/tools/ftrace_proto_gen/event_whitelist
index 17697e5..0f38e2a 100644
--- a/tools/ftrace_proto_gen/event_whitelist
+++ b/tools/ftrace_proto_gen/event_whitelist
@@ -334,3 +334,4 @@
kmem/ion_buffer_destroy
scm/scm_call_start
scm/scm_call_end
+gpu_mem/gpu_mem_total