Avoid inlining siphash globally to avoid hitting BPF instruction limits

[flowspec-xdp] / xdp.c

diff --git a/xdp.c b/xdp.c
index 62120d2ef52107511c5f4a4f245c666ef5d4dcb2..36a45e2a72783c2ee49a326c689edc16e69cd1a3 100644 (file)
--- a/xdp.c
+++ b/xdp.c
@@ -151,7 +151,7 @@ struct xdp_md {
 static const int XDP_PASS = 0;
 static const int XDP_DROP = 1;
 
-static long drop_cnt_map[RULECNT + STATIC_RULE_CNT];
+static long drop_cnt_map[STATS_RULECNT + STATIC_RULE_CNT];
 #define INCREMENT_MATCH(reason) { drop_cnt_map[reason] += 1; drop_cnt_map[reason] += data_end - pktdata; }
 
 #else /* TEST */
@@ -164,7 +164,7 @@ struct match_counter {
 };
 struct {
        __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
-       __uint(max_entries, RULECNT + STATIC_RULE_CNT);
+       __uint(max_entries, STATS_RULECNT + STATIC_RULE_CNT);
        __u32 *key;
        struct match_counter *value;
 } drop_cnt_map SEC(".maps");
@@ -226,8 +226,6 @@ struct {
 #define SRC_HASH_BUCKET_COUNT_POW 4
 #define SRC_HASH_BUCKET_COUNT (1 << SRC_HASH_BUCKET_COUNT_POW)
 
-#include "rand.h"
-
 #define CREATE_PERSRC_LOOKUP(IPV, IP_TYPE) \
 struct persrc_rate##IPV##_entry { \
        uint64_t sent_time; \
@@ -247,7 +245,7 @@ struct persrc_rate##IPV##_ptr { \
 __attribute__((always_inline)) \
 static inline struct persrc_rate##IPV##_ptr get_v##IPV##_persrc_ratelimit(IP_TYPE key, void *map, size_t map_limit, int64_t cur_time_masked) { \
        struct persrc_rate##IPV##_ptr res = { .rate = NULL, .lock = NULL }; \
-       uint64_t hash = siphash(&key, sizeof(key), COMPILE_TIME_RAND); \
+       uint64_t hash = siphash_##IP_TYPE(key); \
  \
        const uint32_t map_key = hash % SRC_HASH_MAX_PARALLELISM; \
        struct persrc_rate##IPV##_bucket *buckets = bpf_map_lookup_elem(map, &map_key); \