X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=xdp.c;h=36a45e2a72783c2ee49a326c689edc16e69cd1a3;hb=7a55a5451c3c8bdf18adf773059c5e80474e6707;hp=ad6ab82db97feedc53f88f9f9f3f067d65bcbb7f;hpb=80e92801d22e22493f9f0505a8ed06e6ca95716d;p=flowspec-xdp

diff --git a/xdp.c b/xdp.c
index ad6ab82..36a45e2 100644
--- 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");
@@ -213,13 +213,19 @@ struct {
 // Then we build an array of MAX_ENTRIES/2**SRC_HASH_MAX_PARALLELISM_POW entries,
 // which are split into buckets of size SRC_HASH_BUCKET_COUNT. An entry can appear
 // in any of the SRC_HASH_BUCKET_COUNT buckets at it's hash value.
-#define SRC_HASH_MAX_PARALLELISM_POW 9
+//
+// Because we use buckets of size 16, see collision_prob.py, the number of
+// elements we can hold with only a 1% probability of overflowing a bucket is:
+//
+// 128K-entry hash table (2MiB): ~33K sources
+// 256K-entry hash table (4MiB): ~63K sources
+// 512K-entry hash table (8MiB): ~119K sources
+// 1M-entry hash table (16MiB): ~227K sources
+#define SRC_HASH_MAX_PARALLELISM_POW 8
 #define SRC_HASH_MAX_PARALLELISM (1 << SRC_HASH_MAX_PARALLELISM_POW)
-#define SRC_HASH_BUCKET_COUNT_POW 3
+#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; \
@@ -239,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); \