From 15538c9845b1bc7b629693b55195f579025cdd82 Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Mon, 6 May 2024 13:00:53 +0000 Subject: [PATCH 1/2] Dump bts information Get BTS information when capturing bugreport. Bug: 335422086 Test: capture bugreport Change-Id: I5ae9be35a3fc3c975ccc843e9daee6d4e0ac130a --- performance/Android.bp | 2 +- performance/dump_perf.cpp | 3 +++ performance/sepolicy/dump_perf.te | 4 ++++ performance/sepolicy/file.te | 1 + performance/sepolicy/genfs_contexts | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/performance/Android.bp b/performance/Android.bp index 6eee7c4..e8c06dc 100644 --- a/performance/Android.bp +++ b/performance/Android.bp @@ -11,7 +11,7 @@ cc_binary { "-Werror", ], shared_libs: [ - "libdump", + "libdump", ], vendor: true, relative_install_path: "dump", diff --git a/performance/dump_perf.cpp b/performance/dump_perf.cpp index aa742f1..d2989ad 100644 --- a/performance/dump_perf.cpp +++ b/performance/dump_perf.cpp @@ -18,5 +18,8 @@ int main() { dumpFileContent("VENDOR PROC DUMP", "/proc/vendor_sched/dump_task"); + dumpFileContent("BTS scenario", "/sys/kernel/debug/bts/scenario"); + dumpFileContent("BTS vc", "/sys/kernel/debug/bts/vc"); + dumpFileContent("BTS status", "/sys/kernel/debug/bts/status"); return 0; } diff --git a/performance/sepolicy/dump_perf.te b/performance/sepolicy/dump_perf.te index 15c4f6e..befe9ba 100644 --- a/performance/sepolicy/dump_perf.te +++ b/performance/sepolicy/dump_perf.te @@ -1,3 +1,7 @@ pixel_bugreport(dump_perf) allow dump_perf proc_vendor_sched:file r_file_perms; +userdebug_or_eng(` + allow dump_perf vendor_bts_debugfs:dir r_dir_perms; + allow dump_perf vendor_bts_debugfs:file r_file_perms; +') diff --git a/performance/sepolicy/file.te b/performance/sepolicy/file.te index 0357d51..8e16bbf 100644 --- a/performance/sepolicy/file.te +++ b/performance/sepolicy/file.te @@ -1 +1,2 @@ type sysfs_pakills, fs_type, sysfs_type; +type vendor_bts_debugfs, fs_type, debugfs_type; diff --git a/performance/sepolicy/genfs_contexts b/performance/sepolicy/genfs_contexts index 07bcff9..041021c 100644 --- a/performance/sepolicy/genfs_contexts +++ b/performance/sepolicy/genfs_contexts @@ -1,2 +1,3 @@ genfscon proc /sys/kernel/sched_pelt_multiplier u:object_r:proc_sched:s0 genfscon sysfs /kernel/vendor_mm/pa_kill u:object_r:sysfs_pakills:s0 +genfscon debugfs /bts u:object_r:vendor_bts_debugfs:s0 From 93c25dcb0d67ef9f41b58473c244c89bd5ba5fea Mon Sep 17 00:00:00 2001 From: feiyuchen Date: Wed, 15 May 2024 02:57:56 +0000 Subject: [PATCH 2/2] Add missing SEPolicy for audio HAL to use EdgeTpu lib Some policies were missing. This CL adds them. Bug: 340369535 Test: Default presubmit. To be tested on device Change-Id: I8a124d644906ffc622598ac0bf6079d704197a33 --- edgetpu/sepolicy/hal_audio_default.te | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/edgetpu/sepolicy/hal_audio_default.te b/edgetpu/sepolicy/hal_audio_default.te index 523770c..4d58e0b 100644 --- a/edgetpu/sepolicy/hal_audio_default.te +++ b/edgetpu/sepolicy/hal_audio_default.te @@ -12,7 +12,19 @@ binder_call(hal_audio_default, edgetpu_app_server) # Allow audio HAL to read tflite Darwinn delegate properties get_prop(hal_audio_default, vendor_tflite_delegate_prop) + +# Allow audio HAL to read DarwiNN runtime properties get_prop(hal_audio_default, vendor_edgetpu_runtime_prop) +# Allow audio HAL to read hetero runtime properties +get_prop(hal_audio_default, vendor_hetero_runtime_prop) + # Allow DMA Buf access. allow hal_audio_default dmabuf_system_heap_device:chr_file r_file_perms; + +# Allow audio HAL to connect to the stats service for logging EdgeTpu metrics. +allow hal_audio_default fwk_stats_service:service_manager find; + +# Allow audio HAL to send EdgeTpu trace packets to Perfetto. +# Enable for prod devices, see: go/darwinn-perfetto-critical-events +perfetto_producer(hal_audio_default)