Optimize per-src v6 matching on <= /64s to avoid always storing 4 0-bytes

[flowspec-xdp] / genrules.py

diff --git a/genrules.py b/genrules.py
index a09fde157e9eed0988e54a385a79cbba6721ac15..b2bf796af9a86e43218f70e2a7c8f21eda034f01 100755 (executable)
--- a/genrules.py
+++ b/genrules.py
@@ -297,6 +297,7 @@ with open("rules.h", "w") as out:
     rulecnt = 0
     ratelimitcnt = 0
     v4persrcratelimits = []
+    v5persrcratelimits = []
     v6persrcratelimits = []
 
     lastrule = None
@@ -419,17 +420,23 @@ with open("rules.h", "w") as out:
                                     continue
                                 first_action += f"const uint32_t srcip = ip->saddr & MASK4({mid_byte});\n"
                                 first_action += f"void *rate_map = &v4_src_rate_{len(v4persrcratelimits)};\n"
-                                first_action += f"struct persrc_rate4_ptr rate_ptr = get_v4_persrc_ratelimit(srcip, rate_map, {(high_byte + 1) * 1024});\n"
+                                first_action += f"struct persrc_rate4_ptr rate_ptr = get_v4_persrc_ratelimit(srcip, rate_map, {(high_byte + 1) * 4096});\n"
                                 first_action += f"struct persrc_rate4_entry *rate = rate_ptr.rate;\n"
-                                v4persrcratelimits.append((high_byte + 1) * 1024)
+                                v4persrcratelimits.append((high_byte + 1) * 4096)
+                            elif mid_byte <= 64:
+                                first_action += f"const uint64_t srcip = BE128BEHIGH64(ip6->saddr & MASK6({mid_byte}));\n"
+                                first_action += f"void *rate_map = &v5_src_rate_{len(v5persrcratelimits)};\n"
+                                first_action += f"struct persrc_rate5_ptr rate_ptr = get_v5_persrc_ratelimit(srcip, rate_map, {(high_byte + 1) * 4096});\n"
+                                first_action += f"struct persrc_rate5_entry *rate = rate_ptr.rate;\n"
+                                v5persrcratelimits.append((high_byte + 1) * 4096)
                             else:
                                 if mid_byte > 128:
                                     continue
                                 first_action += f"const uint128_t srcip = ip6->saddr & MASK6({mid_byte});\n"
                                 first_action += f"void *rate_map = &v6_src_rate_{len(v6persrcratelimits)};\n"
-                                first_action += f"struct persrc_rate6_ptr rate_ptr = get_v6_persrc_ratelimit(srcip, rate_map, {(high_byte + 1) * 1024});\n"
+                                first_action += f"struct persrc_rate6_ptr rate_ptr = get_v6_persrc_ratelimit(srcip, rate_map, {(high_byte + 1) * 4096});\n"
                                 first_action += f"struct persrc_rate6_entry *rate = rate_ptr.rate;\n"
-                                v6persrcratelimits.append((high_byte + 1) * 1024)
+                                v6persrcratelimits.append((high_byte + 1) * 4096)
                         first_action +=  "if (rate) {\n"
                         first_action += f"\t{spin_lock}\n"
                         first_action +=  "\tif (likely(rate->sent_rate > 0))" + " {\n"
@@ -504,5 +511,7 @@ with open("rules.h", "w") as out:
     with open("maps.h", "w") as out:
         for idx, limit in enumerate(v4persrcratelimits):
             out.write(f"SRC_RATE_DEFINE(4, {idx}, {limit})\n")
+        for idx, limit in enumerate(v5persrcratelimits):
+            out.write(f"SRC_RATE_DEFINE(5, {idx}, {limit})\n")
         for idx, limit in enumerate(v6persrcratelimits):
             out.write(f"SRC_RATE_DEFINE(6, {idx}, {limit})\n")