commit 8ff50690630c29ffdd0eec46aa3d19a343e7c75c
author Connor O'Brien <connoro@google.com> Tue Feb 18 21:10:28 2020 +0000
committer Connor O'Brien <connoro@google.com> Tue Feb 18 21:10:28 2020 +0000
tree e0dbd5d7e40c1385d7d282e95912ac2f6eea7403
parent 53e5b8f8b1a7b179f284ece507570b268fd69684
parent 12a2fcad49cc521a41ddbb726658bb8bdd8514f5

time_in_state: set group & modes for maps & progs am: 12a2fcad49

Change-Id: I5d96ee7239b23372f47964df06d3c62a7d1a718d

time_in_state.c

diff --git a/time_in_state.c b/time_in_state.c
index 961ba6b..26d13c0 100644
--- a/time_in_state.c
+++ b/time_in_state.c
@@ -17,20 +17,20 @@
 #include <bpf_helpers.h>
 #include <bpf_timeinstate.h>
 
-DEFINE_BPF_MAP(uid_time_in_state_map, PERCPU_HASH, time_key_t, tis_val_t, 1024)
+DEFINE_BPF_MAP_GRW(uid_time_in_state_map, PERCPU_HASH, time_key_t, tis_val_t, 1024, AID_SYSTEM)
 
-DEFINE_BPF_MAP(uid_concurrent_times_map, PERCPU_HASH, time_key_t, concurrent_val_t, 1024)
-DEFINE_BPF_MAP(uid_last_update_map, HASH, uint32_t, uint64_t, 1024)
+DEFINE_BPF_MAP_GRW(uid_concurrent_times_map, PERCPU_HASH, time_key_t, concurrent_val_t, 1024, AID_SYSTEM)
+DEFINE_BPF_MAP_GRW(uid_last_update_map, HASH, uint32_t, uint64_t, 1024, AID_SYSTEM)
 
-DEFINE_BPF_MAP(cpu_last_update_map, PERCPU_ARRAY, uint32_t, uint64_t, 1)
+DEFINE_BPF_MAP_UGM(cpu_last_update_map, PERCPU_ARRAY, uint32_t, uint64_t, 1, AID_ROOT, AID_SYSTEM, 0620)
 
-DEFINE_BPF_MAP(cpu_policy_map, ARRAY, uint32_t, uint32_t, 1024)
-DEFINE_BPF_MAP(policy_freq_idx_map, ARRAY, uint32_t, uint8_t, 1024)
+DEFINE_BPF_MAP_UGM(cpu_policy_map, ARRAY, uint32_t, uint32_t, 1024, AID_ROOT, AID_SYSTEM, 0620)
+DEFINE_BPF_MAP_UGM(policy_freq_idx_map, ARRAY, uint32_t, uint8_t, 1024, AID_ROOT, AID_SYSTEM, 0620)
 
-DEFINE_BPF_MAP(freq_to_idx_map, HASH, freq_idx_key_t, uint8_t, 2048)
+DEFINE_BPF_MAP_UGM(freq_to_idx_map, HASH, freq_idx_key_t, uint8_t, 2048, AID_ROOT, AID_SYSTEM, 0620)
 
-DEFINE_BPF_MAP(nr_active_map, ARRAY, uint32_t, uint32_t, 1)
-DEFINE_BPF_MAP(policy_nr_active_map, ARRAY, uint32_t, uint32_t, 1024)
+DEFINE_BPF_MAP_UGM(nr_active_map, ARRAY, uint32_t, uint32_t, 1, AID_ROOT, AID_SYSTEM, 0620)
+DEFINE_BPF_MAP_UGM(policy_nr_active_map, ARRAY, uint32_t, uint32_t, 1024, AID_ROOT, AID_SYSTEM, 0620)
 
 struct switch_args {
     unsigned long long ignore;
@@ -43,8 +43,8 @@
     int next_prio;
 };
 
-SEC("tracepoint/sched/sched_switch")
-int tp_sched_switch(struct switch_args* args) {
+DEFINE_BPF_PROG("tracepoint/sched/sched_switch", AID_ROOT, AID_SYSTEM, tp_sched_switch)
+(struct switch_args* args) {
     uint32_t zero = 0;
     uint64_t* last = bpf_cpu_last_update_map_lookup_elem(&zero);
     if (!last) return 0;
@@ -134,8 +134,8 @@
     unsigned int cpu_id;
 };
 
-SEC("tracepoint/power/cpu_frequency")
-int tp_cpufreq(struct cpufreq_args* args) {
+DEFINE_BPF_PROG("tracepoint/power/cpu_frequency", AID_ROOT, AID_SYSTEM, tp_cpufreq)
+(struct cpufreq_args* args) {
     uint32_t cpu = args->cpu_id;
     unsigned int new = args->state;
     uint32_t* policyp = bpf_cpu_policy_map_lookup_elem(&cpu);