From 5bbc1d73f0fcb6ffedc2dbc2679514a1ce6e4943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 15 Jul 2025 12:14:17 -0700 Subject: [PATCH] bpf/progs/netd: remove some constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These aren't used anywhere else, furthermore switching to libbpf would require these to become #define's. Let's just hard code them instead. Test: TreeHugger Flag: EXEMPT mainline / comment only Signed-off-by: Maciej Żenczykowski Change-Id: Ie8026c519e90800f59b5b7ad3826c7902243d5ac --- bpf/progs/netd.c | 15 +++++++-------- bpf/progs/netd.h | 7 ------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bpf/progs/netd.c b/bpf/progs/netd.c index 4e24efa486..821420433d 100644 --- a/bpf/progs/netd.c +++ b/bpf/progs/netd.c @@ -65,16 +65,15 @@ DEFINE_BPF_MAP_RO_NETD(configuration_map, ARRAY, uint32_t, uint32_t, CONFIGURATI // uid_counterset_map + uid_owner_map + uid_permission_map DEFINE_BPF_MAP_NO_NETD(blocked_ports_map, ARRAY, int, uint64_t, 1024 /* 64K ports -> 1024 u64s */) -DEFINE_BPF_MAP_RW_NETD(cookie_tag_map, HASH, uint64_t, UidTagValue, COOKIE_UID_MAP_SIZE) -DEFINE_BPF_MAP_NO_NETD(uid_counterset_map, HASH, uint32_t, uint8_t, UID_COUNTERSET_MAP_SIZE) -DEFINE_BPF_MAP_NO_NETD(app_uid_stats_map, HASH, uint32_t, StatsValue, APP_STATS_MAP_SIZE) +DEFINE_BPF_MAP_RW_NETD(cookie_tag_map, HASH, uint64_t, UidTagValue, 10000) +DEFINE_BPF_MAP_NO_NETD(uid_counterset_map, HASH, uint32_t, uint8_t, 4000) +DEFINE_BPF_MAP_NO_NETD(app_uid_stats_map, HASH, uint32_t, StatsValue, 10000) DEFINE_BPF_MAP_RO_NETD(stats_map_A, HASH, StatsKey, StatsValue, STATS_MAP_SIZE) DEFINE_BPF_MAP_RO_NETD(stats_map_B, HASH, StatsKey, StatsValue, STATS_MAP_SIZE) -DEFINE_BPF_MAP_NO_NETD(iface_stats_map, HASH, uint32_t, StatsValue, IFACE_STATS_MAP_SIZE) +DEFINE_BPF_MAP_NO_NETD(iface_stats_map, HASH, uint32_t, StatsValue, 1000) DEFINE_BPF_MAP_RO_NETD(uid_owner_map, HASH, uint32_t, UidOwnerValue, 20000) DEFINE_BPF_MAP_RO_NETD(uid_permission_map, HASH, uint32_t, uint8_t, 6000) -DEFINE_BPF_MAP_NO_NETD(ingress_discard_map, HASH, IngressDiscardKey, IngressDiscardValue, - INGRESS_DISCARD_MAP_SIZE) +DEFINE_BPF_MAP_NO_NETD(ingress_discard_map, HASH, IngressDiscardKey, IngressDiscardValue, 100) DEFINE_BPF_MAP_RW_NETD(lock_array_test_map, ARRAY, uint32_t, bool, 1) DEFINE_BPF_MAP_RW_NETD(lock_hash_test_map, HASH, uint32_t, bool, 1) @@ -82,7 +81,7 @@ DEFINE_BPF_MAP_RW_NETD(lock_hash_test_map, HASH, uint32_t, bool, 1) DEFINE_BPF_SK_STORAGE(sk_storage, SkStorageValue) /* never actually used from ebpf */ -DEFINE_BPF_MAP_NO_NETD(iface_index_name_map, HASH, uint32_t, IfaceValue, IFACE_INDEX_NAME_MAP_SIZE) +DEFINE_BPF_MAP_NO_NETD(iface_index_name_map, HASH, uint32_t, IfaceValue, 1000) // A single-element configuration array, packet tracing is enabled when 'true'. DEFINE_BPF_MAP_EXT(packet_trace_enabled_map, ARRAY, uint32_t, bool, 1, @@ -90,7 +89,7 @@ DEFINE_BPF_MAP_EXT(packet_trace_enabled_map, ARRAY, uint32_t, bool, 1, BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAX_VER, 0) // A ring buffer on which packet information is pushed. -DEFINE_BPF_RINGBUF_EXT(packet_trace_ringbuf, PacketTrace, PACKET_TRACE_BUF_SIZE, +DEFINE_BPF_RINGBUF_EXT(packet_trace_ringbuf, PacketTrace, 32 * 1024, AID_ROOT, AID_SYSTEM, 0060, "fs_bpf_net_shared", "", PRIVATE, BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAX_VER); diff --git a/bpf/progs/netd.h b/bpf/progs/netd.h index 41de378390..0da516153d 100644 --- a/bpf/progs/netd.h +++ b/bpf/progs/netd.h @@ -96,15 +96,8 @@ typedef struct { STRUCT_SIZE(SkStorageValue, 8); // 'static' - otherwise these constants end up in .rodata in the resulting .o post compilation -static const int COOKIE_UID_MAP_SIZE = 10000; -static const int UID_COUNTERSET_MAP_SIZE = 4000; -static const int APP_STATS_MAP_SIZE = 10000; static const int STATS_MAP_SIZE = 5000; -static const int IFACE_INDEX_NAME_MAP_SIZE = 1000; -static const int IFACE_STATS_MAP_SIZE = 1000; static const int CONFIGURATION_MAP_SIZE = 2; -static const int INGRESS_DISCARD_MAP_SIZE = 100; -static const int PACKET_TRACE_BUF_SIZE = 32 * 1024; static const int DATA_SAVER_ENABLED_MAP_SIZE = 1; #ifdef __cplusplus