From cd3c5d3524dd015ef4abc47fa8634649cd8506c1 Mon Sep 17 00:00:00 2001 From: Joel Galenson <jgalenson@google.com> Date: Wed, 5 Jul 2017 10:10:26 -0700 Subject: [PATCH] Move file labeling to genfs_contexts. This should slightly improve performance, as file_contexts is slower than genfs_contexts. Now that the kernel patch enabling genfs labeling of tracefs has landed, we can re-enable this. 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: Ifc1c6ac634b94e060ed1f311049bd37f6fcc8313 --- private/file_contexts | 57 ------------------------ private/genfs_contexts | 98 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 57 deletions(-) diff --git a/private/file_contexts b/private/file_contexts index 797c76bfb..90f7bbf44 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -453,63 +453,6 @@ # LocalTransport (backup) uses this subtree /data/cache/backup(/.*)? u:object_r:cache_private_backup_file:s0 -############################# -# tracefs files -# -/sys/kernel(/debug)?/tracing/buffer_size_kb u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_locked/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_lock/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_transaction/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_transaction_received/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/binder/binder_unlock/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/cpufreq_interactive/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/power/clock_set_rate/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_frequency/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_frequency_limits/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/power/cpu_idle/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_blocked_reason/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_cpu_hotplug/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_switch/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/sched/sched_wakeup/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_direct_reclaim_end/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/vmscan/mm_vmscan_kswapd_wake/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/events/lowmemorykiller/enable u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/instances(/.*)? u:object_r:debugfs_tracing_instances:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/free_buffer u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/trace u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/instances/wifi/tracing_on u:object_r:debugfs_wifi_tracing:s0 -/sys/kernel(/debug)?/tracing/options/overwrite u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/options/print-tgid u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/trace u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/trace_clock u:object_r:debugfs_tracing:s0 -/sys/kernel(/debug)?/tracing/trace_marker u:object_r:debugfs_trace_marker:s0 -/sys/kernel(/debug)?/tracing/tracing_on u:object_r:debugfs_tracing:s0 - -########################################### -# debug-only tracing -# -/sys/kernel/debug/tracing/events/sync/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/workqueue/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/regulator/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/pagecache/enable u:object_r:debugfs_tracing_debug:s0 - -/sys/kernel/debug/tracing/events/irq/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/ipi/enable u:object_r:debugfs_tracing_debug:s0 - -/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/block/block_rq_issue/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/events/block/block_rq_complete/enable u:object_r:debugfs_tracing_debug:s0 -/sys/kernel/debug/tracing/saved_cmdlines_size u:object_r:debugfs_tracing_debug:s0 - ############################# # asec containers /mnt/asec(/.*)? u:object_r:asec_apk_file:s0 diff --git a/private/genfs_contexts b/private/genfs_contexts index b3fbd0b1a..5d0fe0bca 100644 --- a/private/genfs_contexts +++ b/private/genfs_contexts @@ -66,6 +66,104 @@ genfscon sysfs /devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vi 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 /tracing/events/sync/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/workqueue/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/regulator/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/pagecache/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/irq/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/ipi/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/f2fs/f2fs_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/f2fs/f2fs_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/f2fs/f2fs_write_begin/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/f2fs/f2fs_write_end/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/ext4/ext4_da_write_begin/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/ext4/ext4_da_write_end/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/ext4/ext4_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/ext4/ext4_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/block/block_rq_issue/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/events/block/block_rq_complete/enable u:object_r:debugfs_tracing_debug:s0 +genfscon debugfs /tracing/saved_cmdlines_size u:object_r:debugfs_tracing_debug:s0 + +genfscon tracefs /events/sync/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/workqueue/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/regulator/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/pagecache/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/irq/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/ipi/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/f2fs/f2fs_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/f2fs/f2fs_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/f2fs/f2fs_write_begin/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/f2fs/f2fs_write_end/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/ext4/ext4_da_write_begin/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/ext4/ext4_da_write_end/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/ext4/ext4_sync_file_enter/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/ext4/ext4_sync_file_exit/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/block/block_rq_issue/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /events/block/block_rq_complete/enable u:object_r:debugfs_tracing_debug:s0 +genfscon tracefs /saved_cmdlines_size u:object_r:debugfs_tracing_debug:s0 + genfscon inotifyfs / u:object_r:inotify:s0 genfscon vfat / u:object_r:vfat:s0 genfscon debugfs / u:object_r:debugfs:s0 -- GitLab