Clean up for bpf related code
Clean up warnings and fix clang format for bpf_progs and libnetdbpf
code. No functionality changes
Bug: 119261702
Test: build and flash
Change-Id: Ied3025ab4e2b03c12ce88ff611634537a378c495
diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c
index 1d47c73..38782f9 100644
--- a/bpf_progs/netd.c
+++ b/bpf_progs/netd.c
@@ -59,10 +59,10 @@
}
struct bpf_map_def SEC("maps") uid_permission_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(uint8_t),
- .max_entries = UID_OWNER_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(uint8_t),
+ .max_entries = UID_OWNER_MAP_SIZE,
};
SEC("cgroupsock/inet/creat")
diff --git a/bpf_progs/netd.h b/bpf_progs/netd.h
index fcf3a72..3c36807 100644
--- a/bpf_progs/netd.h
+++ b/bpf_progs/netd.h
@@ -72,66 +72,66 @@
#define RST_OFFSET 2
struct bpf_map_def SEC("maps") cookie_tag_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint64_t),
- .value_size = sizeof(struct uid_tag),
- .max_entries = COOKIE_UID_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint64_t),
+ .value_size = sizeof(struct uid_tag),
+ .max_entries = COOKIE_UID_MAP_SIZE,
};
struct bpf_map_def SEC("maps") uid_counterset_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(uint8_t),
- .max_entries = UID_COUNTERSET_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(uint8_t),
+ .max_entries = UID_COUNTERSET_MAP_SIZE,
};
struct bpf_map_def SEC("maps") app_uid_stats_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(struct stats_value),
- .max_entries = APP_STATS_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(struct stats_value),
+ .max_entries = APP_STATS_MAP_SIZE,
};
struct bpf_map_def SEC("maps") stats_map_A = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(struct stats_key),
- .value_size = sizeof(struct stats_value),
- .max_entries = STATS_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(struct stats_key),
+ .value_size = sizeof(struct stats_value),
+ .max_entries = STATS_MAP_SIZE,
};
struct bpf_map_def SEC("maps") stats_map_B = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(struct stats_key),
- .value_size = sizeof(struct stats_value),
- .max_entries = STATS_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(struct stats_key),
+ .value_size = sizeof(struct stats_value),
+ .max_entries = STATS_MAP_SIZE,
};
struct bpf_map_def SEC("maps") iface_stats_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(struct stats_value),
- .max_entries = IFACE_STATS_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(struct stats_value),
+ .max_entries = IFACE_STATS_MAP_SIZE,
};
struct bpf_map_def SEC("maps") configuration_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(uint8_t),
- .max_entries = CONFIGURATION_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(uint8_t),
+ .max_entries = CONFIGURATION_MAP_SIZE,
};
struct bpf_map_def SEC("maps") uid_owner_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(uint8_t),
- .max_entries = UID_OWNER_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(uint8_t),
+ .max_entries = UID_OWNER_MAP_SIZE,
};
struct bpf_map_def SEC("maps") iface_index_name_map = {
- .type = BPF_MAP_TYPE_HASH,
- .key_size = sizeof(uint32_t),
- .value_size = sizeof(struct IfaceValue),
- .max_entries = IFACE_INDEX_NAME_MAP_SIZE,
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(uint32_t),
+ .value_size = sizeof(struct IfaceValue),
+ .max_entries = IFACE_INDEX_NAME_MAP_SIZE,
};
static __always_inline int is_system_uid(uint32_t uid) {