commit 5bec8b44a958e1c79e4aed34080edc59af782ff0
author Maciej Żenczykowski <maze@google.com> Wed Jun 07 06:59:20 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Wed Jun 07 06:59:40 2023 +0000
tree 3f29d279c8d125f8f271dba6819b06cd09204d2b
parent 267467ec936aef3ac8cdcfe8a068792c6997c768

force map key/value sizes < 1024/65536 bytes to match BpfMap.java

Test: TreeHugger
Bug: 286154283
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I31fb48aa032e22a83e3e9f0ac8d7f2b3253e995e

staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
index 65c0b72..b3946ec 100644
--- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
+++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -262,6 +262,8 @@
                       KVER_NONE, KVER_INF, min_loader, max_loader,                               \
                       ignore_eng, ignore_user, ignore_userdebug);                                \
     BPF_MAP_ASSERT_OK(BPF_MAP_TYPE_##TYPE, (num_entries), (md));                                 \
+    _Static_assert(sizeof(KeyType) < 1024, "aosp/2370288 requires < 1024 byte keys");            \
+    _Static_assert(sizeof(ValueType) < 65536, "aosp/2370288 requires < 65536 byte values");      \
     BPF_ANNOTATE_KV_PAIR(the_map, KeyType, ValueType);                                           \
                                                                                                  \
     static inline __always_inline __unused ValueType* bpf_##the_map##_lookup_elem(               \