From 312c3800b8de0cfccc4f00076361dff79df143c3 Mon Sep 17 00:00:00 2001 From: Joel Galenson <jgalenson@google.com> Date: Wed, 5 Jul 2017 12:30:46 -0700 Subject: [PATCH] Simplify genfs labeling of tracefs. The code used to look like this, but in commit 4cae28d43c32d66a343d7efe5677495855970a90 we replaced the generic regexes to improve performance. Now that we've switched to genfs, this no longer affects performance, so let's simplify the labeling. Bug: 62413700 Test: Built, flashed, and booted two devices. Verified that all of the files have the correct context and that wifi, camera, and traceur work. Change-Id: I1a859d17075fa25543ee090cc7a7478391bc45c1 --- private/genfs_contexts | 75 +++++++----------------------------------- 1 file changed, 12 insertions(+), 63 deletions(-) diff --git a/private/genfs_contexts b/private/genfs_contexts index 5d0fe0bca..07c31abb6 100644 --- a/private/genfs_contexts +++ b/private/genfs_contexts @@ -64,69 +64,18 @@ genfscon sysfs /module/lowmemorykiller u:object_r:sysfs_lowmemorykiller:s0 genfscon sysfs /module/wlan/parameters/fwpath u:object_r:sysfs_wlan_fwpath:s0 genfscon sysfs /devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vibrator:s0 -genfscon debugfs /mmc0 u:object_r:debugfs_mmc:s0 - -genfscon debugfs /tracing/buffer_size_kb u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/binder/binder_locked/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/binder/binder_lock/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/binder/binder_transaction/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/binder/binder_transaction_received/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/binder/binder_unlock/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/cpufreq_interactive/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/power/clock_set_rate/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/power/cpu_frequency/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/power/cpu_frequency_limits/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/power/cpu_idle/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/sched/sched_blocked_reason/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/sched/sched_cpu_hotplug/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/sched/sched_switch/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/sched/sched_wakeup/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/vmscan/mm_vmscan_direct_reclaim_end/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/vmscan/mm_vmscan_kswapd_wake/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/events/lowmemorykiller/enable u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/instances u:object_r:debugfs_tracing_instances:s0 -genfscon debugfs /tracing/instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 -genfscon debugfs /tracing/instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 -genfscon debugfs /tracing/instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 -genfscon debugfs /tracing/options/overwrite u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/options/print-tgid u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/trace u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/trace_clock u:object_r:debugfs_tracing:s0 -genfscon debugfs /tracing/trace_marker u:object_r:debugfs_trace_marker:s0 -genfscon debugfs /tracing/tracing_on u:object_r:debugfs_tracing:s0 - -genfscon tracefs /buffer_size_kb u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/binder/binder_locked/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/binder/binder_lock/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/binder/binder_transaction/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/binder/binder_transaction_received/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/binder/binder_unlock/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/cpufreq_interactive/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/power/clock_set_rate/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/power/cpu_frequency/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/power/cpu_frequency_limits/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/power/cpu_idle/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/sched/sched_blocked_reason/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/sched/sched_cpu_hotplug/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/sched/sched_switch/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/sched/sched_wakeup/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/vmscan/mm_vmscan_direct_reclaim_begin/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/vmscan/mm_vmscan_direct_reclaim_end/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/vmscan/mm_vmscan_kswapd_sleep/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/vmscan/mm_vmscan_kswapd_wake/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /events/lowmemorykiller/enable u:object_r:debugfs_tracing:s0 -genfscon tracefs /instances u:object_r:debugfs_tracing_instances:s0 -genfscon tracefs /instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 -genfscon tracefs /instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 -genfscon tracefs /instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 -genfscon tracefs /options/overwrite u:object_r:debugfs_tracing:s0 -genfscon tracefs /options/print-tgid u:object_r:debugfs_tracing:s0 -genfscon tracefs /trace u:object_r:debugfs_tracing:s0 -genfscon tracefs /trace_clock u:object_r:debugfs_tracing:s0 -genfscon tracefs /trace_marker u:object_r:debugfs_trace_marker:s0 -genfscon tracefs /tracing_on u:object_r:debugfs_tracing:s0 +genfscon debugfs /mmc0 u:object_r:debugfs_mmc:s0 +genfscon debugfs /tracing u:object_r:debugfs_tracing:s0 +genfscon debugfs /tracing/instances u:object_r:debugfs_tracing_instances:s0 +genfscon tracefs /instances u:object_r:debugfs_tracing_instances:s0 +genfscon debugfs /tracing/instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 +genfscon debugfs /tracing/instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 +genfscon debugfs /tracing/instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 +genfscon tracefs /instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 +genfscon tracefs /instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 +genfscon tracefs /instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 +genfscon debugfs /tracing/trace_marker u:object_r:debugfs_trace_marker:s0 +genfscon tracefs /trace_marker u:object_r:debugfs_trace_marker:s0 genfscon debugfs /tracing/events/sync/enable u:object_r:debugfs_tracing_debug:s0 genfscon debugfs /tracing/events/workqueue/enable u:object_r:debugfs_tracing_debug:s0 -- GitLab