Merge "Add perfetto persistent tracing configuration file" into main

This commit is contained in:
Daniele Di Proietto 2024-03-05 14:25:23 +00:00 committed by Gerrit Code Review
commit edfb82499e
4 changed files with 9 additions and 0 deletions

View file

@ -444,6 +444,7 @@
/system/etc/ld.config. system_linker_config_file /system/etc/ld.config. system_linker_config_file
/system/etc/ld.config.test system_linker_config_file /system/etc/ld.config.test system_linker_config_file
/system/etc/passwd system_passwd_file /system/etc/passwd system_passwd_file
/system/etc/perfetto/persistent_cfg.pbtxt system_perfetto_config_file
/system/etc/seccomp_policy system_seccomp_policy_file /system/etc/seccomp_policy system_seccomp_policy_file
/system/etc/seccomp_policy/crash_dump.x86.policy system_seccomp_policy_file /system/etc/seccomp_policy/crash_dump.x86.policy system_seccomp_policy_file
/system/etc/security/cacerts system_security_cacerts_file /system/etc/security/cacerts system_security_cacerts_file

View file

@ -31,6 +31,9 @@ type perfetto_traces_profiling_data_file, file_type, data_file_type, core_data_f
# /data/misc/perfetto-configs for perfetto configs # /data/misc/perfetto-configs for perfetto configs
type perfetto_configs_data_file, file_type, data_file_type, core_data_file_type; type perfetto_configs_data_file, file_type, data_file_type, core_data_file_type;
# /system/etc/perfetto for perfetto configs
type system_perfetto_config_file, file_type, system_file_type;
# /data/misc/uprobestats-configs for uprobestats configs # /data/misc/uprobestats-configs for uprobestats configs
type uprobestats_configs_data_file, file_type, data_file_type, core_data_file_type; type uprobestats_configs_data_file, file_type, data_file_type, core_data_file_type;

View file

@ -367,6 +367,7 @@
/system/etc/group u:object_r:system_group_file:s0 /system/etc/group u:object_r:system_group_file:s0
/system/etc/ld\.config.* u:object_r:system_linker_config_file:s0 /system/etc/ld\.config.* u:object_r:system_linker_config_file:s0
/system/etc/passwd u:object_r:system_passwd_file:s0 /system/etc/passwd u:object_r:system_passwd_file:s0
/system/etc/perfetto(/.*)? u:object_r:system_perfetto_config_file:s0
/system/etc/seccomp_policy(/.*)? u:object_r:system_seccomp_policy_file:s0 /system/etc/seccomp_policy(/.*)? u:object_r:system_seccomp_policy_file:s0
/system/etc/security/cacerts(/.*)? u:object_r:system_security_cacerts_file:s0 /system/etc/security/cacerts(/.*)? u:object_r:system_security_cacerts_file:s0
/system/etc/selinux/mapping/[0-9]+\.[0-9]+(\.compat)?\.cil u:object_r:sepolicy_file:s0 /system/etc/selinux/mapping/[0-9]+\.[0-9]+(\.compat)?\.cil u:object_r:sepolicy_file:s0

View file

@ -40,6 +40,10 @@ binder_call(perfetto, system_server)
allow perfetto perfetto_configs_data_file:dir r_dir_perms; allow perfetto perfetto_configs_data_file:dir r_dir_perms;
allow perfetto perfetto_configs_data_file:file r_file_perms; allow perfetto perfetto_configs_data_file:file r_file_perms;
# Allow perfetto to read the trace config from /system/etc/perfetto.
allow perfetto system_perfetto_config_file:dir r_dir_perms;
allow perfetto system_perfetto_config_file:file r_file_perms;
# Allow perfetto to read the trace config from statsd, mm_events and shell # Allow perfetto to read the trace config from statsd, mm_events and shell
# (both root and non-root) on stdin and also to write the resulting trace to # (both root and non-root) on stdin and also to write the resulting trace to
# stdout. # stdout.