From 00c01a6e8fc9870d71c54b84f8aaf516de476917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 15 Jul 2025 12:19:45 -0700 Subject: [PATCH] bpf/progs/netd: remove DATA_SAVER_ENABLED_MAP_SIZE constant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (only needed by test, but this is really just a single boolean) Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: I3cf8ae1ca474ccd3feba6d6346428a46c3020122 --- bpf/dns_helper/DnsBpfHelperTest.cpp | 2 +- bpf/progs/netd.c | 3 +-- bpf/progs/netd.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bpf/dns_helper/DnsBpfHelperTest.cpp b/bpf/dns_helper/DnsBpfHelperTest.cpp index 18a5df4bf4..be83df29f5 100644 --- a/bpf/dns_helper/DnsBpfHelperTest.cpp +++ b/bpf/dns_helper/DnsBpfHelperTest.cpp @@ -43,7 +43,7 @@ class DnsBpfHelperTest : public ::testing::Test { mFakeUidOwnerMap.resetMap(BPF_MAP_TYPE_HASH, TEST_MAP_SIZE); ASSERT_VALID(mFakeUidOwnerMap); - mFakeDataSaverEnabledMap.resetMap(BPF_MAP_TYPE_ARRAY, DATA_SAVER_ENABLED_MAP_SIZE); + mFakeDataSaverEnabledMap.resetMap(BPF_MAP_TYPE_ARRAY, 1); ASSERT_VALID(mFakeDataSaverEnabledMap); mDnsBpfHelper.mConfigurationMap = mFakeConfigurationMap; diff --git a/bpf/progs/netd.c b/bpf/progs/netd.c index 821420433d..ce22890886 100644 --- a/bpf/progs/netd.c +++ b/bpf/progs/netd.c @@ -93,8 +93,7 @@ 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); -DEFINE_BPF_MAP_RO_NETD(data_saver_enabled_map, ARRAY, uint32_t, bool, - DATA_SAVER_ENABLED_MAP_SIZE) +DEFINE_BPF_MAP_RO_NETD(data_saver_enabled_map, ARRAY, uint32_t, bool, 1) DEFINE_BPF_MAP_EXT(local_net_access_map, LPM_TRIE, LocalNetAccessKey, bool, 1000, AID_ROOT, AID_NET_BW_ACCT, 0060, "fs_bpf_net_shared", "", PRIVATE, diff --git a/bpf/progs/netd.h b/bpf/progs/netd.h index 0da516153d..7010d558a0 100644 --- a/bpf/progs/netd.h +++ b/bpf/progs/netd.h @@ -98,7 +98,6 @@ STRUCT_SIZE(SkStorageValue, 8); // 'static' - otherwise these constants end up in .rodata in the resulting .o post compilation static const int STATS_MAP_SIZE = 5000; static const int CONFIGURATION_MAP_SIZE = 2; -static const int DATA_SAVER_ENABLED_MAP_SIZE = 1; #ifdef __cplusplus