break;"""
def fragment_to_rule(ipproto, rules):
- ast = parse_ast(rules, parse_frag_expr, True)
+ ast = parse_ast(rules, parse_frag_expr, False)
return "if (!( " + ast.write(ipproto) + " )) break;"
def len_to_rule(rules):
def port_to_rule(ty, rules):
if ty == "port" :
ast = parse_ast(rules, parse_numbers_expr, True)
- return "if (!ports_valid) break;\nif (!( " + ast.write("sport", "dport") + " )) break;"
+ return "if (sport == -1 || dport == -1) break;\nif (!( " + ast.write("sport", "dport") + " )) break;"
ast = parse_ast(rules, parse_numbers_expr, True)
- return "if (!ports_valid) break;\nif (!( " + ast.write(ty) + " )) break;"
+ return "if (" + ty + " == -1) break;\nif (!( " + ast.write(ty) + " )) break;"
def tcp_flags_to_rule(rules):
ast = parse_ast(rules, parse_bit_expr, False)
use_v6_frags = False
rulecnt = 0
ratelimitcnt = 0
- v4persrcratelimitcnt = 0
- v6persrcratelimitcnt = 0
+ v4persrcratelimits = []
+ v6persrcratelimits = []
lastrule = None
for line in sys.stdin.readlines():
if len(blocks[1].strip()) != 10: # Should be 0x12345678
continue
ty = blocks[1].strip()[:6]
- high_byte = int(blocks[1].strip()[8:], 16)
+ high_byte = int(blocks[1].strip()[6:8], 16)
+ mid_byte = int(blocks[1].strip()[8:], 16)
low_bytes = int(blocks[2].strip(") \n"), 16)
if ty == "0x8006" or ty == "0x800c" or ty == "0x8306" or ty == "0x830c":
if first_action is not None:
mantissa = low_bytes & ((1 << 23) - 1)
value = 1.0 + mantissa / (2**23)
value *= 2**(exp-127)
- if ty == "0x8006" or ty == "0x8306":
- accessor = "rate->rate.sent_bytes"
- else:
- accessor = "rate->rate.sent_packets"
# Note that int64_t will overflow after 292 years of uptime
first_action = "int64_t time = bpf_ktime_get_ns();\n"
first_action += "uint64_t allowed_since_last = 0;\n"
spin_lock = "/* No locking as we're per-CPU */"
spin_unlock = "/* No locking as we're per-CPU */"
if proto == 4:
- if high_byte > 32:
+ if mid_byte > 32:
continue
- first_action += f"const uint32_t srcip = ip->saddr & MASK4({high_byte});\n"
- first_action += f"void *rate_map = &v4_src_rate_{v4persrcratelimitcnt};\n"
- v4persrcratelimitcnt += 1
+ 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"
+ v4persrcratelimits.append((high_byte + 1) * 1024)
else:
- if high_byte > 128:
+ if mid_byte > 128:
continue
- first_action += f"const uint128_t srcip = ip6->saddr & MASK6({high_byte});\n"
- first_action += f"void *rate_map = &v6_src_rate_{v6persrcratelimitcnt};\n"
- v6persrcratelimitcnt += 1
+ 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"
+ v6persrcratelimits.append((high_byte + 1) * 1024)
first_action += f"struct percpu_ratelimit *rate = bpf_map_lookup_elem(rate_map, &srcip);\n"
first_action += "if (rate) {\n"
first_action += f"\t{spin_lock}\n"
- first_action += f"\tif (likely({accessor} > 0))" + " {\n"
+ first_action += "\tif (likely(rate->sent_rate > 0))" + " {\n"
first_action += "\t\tint64_t diff = time - rate->sent_time;\n"
# Unlikely or not, if the flow is slow, take a perf hit (though with the else if branch it doesn't matter)
first_action += "\t\tif (unlikely(diff > 1000000000))\n"
- first_action += f"\t\t\t{accessor} = 0;\n"
+ first_action += "\t\t\trate->sent_rate = 0;\n"
first_action += "\t\telse if (likely(diff > 0))\n"
first_action += f"\t\t\tallowed_since_last = ((uint64_t)diff) * {math.floor(value)} / 1000000000;\n"
first_action += "\t}\n"
- first_action += f"\tif ({accessor} - ((int64_t)allowed_since_last) <= 0)" + " {\n"
+ first_action += "\tif (rate->sent_rate - ((int64_t)allowed_since_last) <= 0)" + " {\n"
if ty == "0x8006" or ty == "0x8306":
- first_action += f"\t\t{accessor} = data_end - pktdata;\n"
+ first_action += "\t\trate->sent_rate = data_end - pktdata;\n"
else:
- first_action += f"\t\t{accessor} = 1;\n"
+ first_action += "\t\trate->sent_rate = 1;\n"
first_action += "\t\trate->sent_time = time;\n"
first_action += f"\t\t{spin_unlock}\n"
first_action += "\t} else {\n"
first_action += "\tstruct percpu_ratelimit new_rate = { .sent_time = time, };\n"
first_action += "\trate = &new_rate;\n"
if ty == "0x8006" or ty == "0x8306":
- first_action += f"\t\t{accessor} = data_end - pktdata;\n"
+ first_action += f"\t\trate->sent_rate = data_end - pktdata;\n"
else:
- first_action += f"\t\t{accessor} = 1;\n"
+ first_action += f"\t\trate->sent_rate = 1;\n"
first_action += "\tbpf_map_update_elem(rate_map, &srcip, rate, BPF_ANY);\n"
first_action += "}\n"
elif ty == "0x8007":
out.write(f"#define RULECNT {rulecnt}\n")
if ratelimitcnt != 0:
out.write(f"#define RATE_CNT {ratelimitcnt}\n")
- if v4persrcratelimitcnt != 0:
- out.write(f"#define V4_SRC_RATE_CNT {v4persrcratelimitcnt}\n")
- if v6persrcratelimitcnt != 0:
- out.write(f"#define V6_SRC_RATE_CNT {v6persrcratelimitcnt}\n")
if rules4 != "":
out.write("#define NEED_V4_PARSE\n")
out.write("#define RULES4 {\\\n" + rules4 + "}\n")
if args.v6frag == "ignore-parse-if-rule":
if use_v6_frags:
out.write("#define PARSE_V6_FRAG PARSE\n")
+ with open("maps.h", "w") as out:
+ for idx, limit in enumerate(v4persrcratelimits):
+ out.write(f"V4_SRC_RATE_DEFINE({idx}, {limit})\n")
+ for idx, limit in enumerate(v6persrcratelimits):
+ out.write(f"V6_SRC_RATE_DEFINE({idx}, {limit})\n")