X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=xdp.c;h=8003b89e0066b4311fd8eb482a922718914166e4;hb=ce7cb6545f4fd8872f08263733cb2188530e9420;hp=74e8e8cb0e850c8556b68877c0faa6de194f51b4;hpb=b2597a12f3a4c500b43b9888b5174385b0227bc3;p=flowspec-xdp diff --git a/xdp.c b/xdp.c index 74e8e8c..8003b89 100644 --- a/xdp.c +++ b/xdp.c @@ -96,6 +96,7 @@ struct tcphdr { #elif defined(__BIG_ENDIAN) #define BIGEND128(a, b, c, d) ((((uint128_t)a) << 3*32) | (((uint128_t)b) << 2*32) | (((uint128_t)c) << 1*32) | (((uint128_t)d) << 0*32)) #define HTON128(a) (a) +#define BE16(a) ((uint16_t)a) #else #error "Need endian info" #endif @@ -117,6 +118,16 @@ static const uint32_t IHL_DROP = 2; static const uint32_t V6FRAG_DROP = 3; #define STATIC_RULE_CNT 4 +#define DO_RETURN(reason, ret) {\ + if (ret == XDP_DROP) { INCREMENT_MATCH(reason); } \ + return ret; \ + } + +// It seems (based on drop counts) that data_end points to the last byte, not one-past-the-end. +// This feels strange, but some documentation suggests > here as well, so we stick with that. +#define CHECK_LEN(start, struc) \ + if (unlikely((void*)(start) + sizeof(struct struc) > data_end)) DO_RETURN(PKT_LEN_DROP, XDP_DROP); + #ifdef TEST // 64 bit version of xdp_md for testing struct xdp_md { @@ -133,10 +144,7 @@ static const int XDP_PASS = 0; static const int XDP_DROP = 1; static long drop_cnt_map[RULECNT + STATIC_RULE_CNT]; -#define DO_RETURN(reason, ret) { \ - if (ret == XDP_DROP) drop_cnt_map[reason] += 1; \ - return ret; \ - } +#define INCREMENT_MATCH(reason) drop_cnt_map[reason] += 1; #else #include @@ -148,14 +156,25 @@ struct bpf_map_def SEC("maps") drop_cnt_map = { .value_size = sizeof(long), .max_entries = RULECNT + STATIC_RULE_CNT, }; -#define DO_RETURN(reason, ret) {\ - if (ret == XDP_DROP) { \ - long *value = bpf_map_lookup_elem(&drop_cnt_map, &reason); \ - if (value) \ - *value += 1; \ - } \ - return XDP_DROP; \ - } +#define INCREMENT_MATCH(reason) { \ + long *value = bpf_map_lookup_elem(&drop_cnt_map, &reason); \ + if (value) \ + *value += 1; \ +} + +#ifdef RATE_CNT +struct ratelimit { + struct bpf_spin_lock lock; + int64_t sent_bytes; + int64_t sent_time; +}; +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, RATE_CNT); + __u32 *key; + struct ratelimit *value; +} rate_map SEC(".maps"); +#endif SEC("xdp_drop") #endif @@ -167,14 +186,12 @@ int xdp_drop_prog(struct xdp_md *ctx) unsigned short eth_proto; { - if (unlikely((void*)(size_t)ctx->data + sizeof(struct ethhdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN((size_t)ctx->data, ethhdr); const struct ethhdr *const eth = (void*)(size_t)ctx->data; #if PARSE_8021Q == PARSE if (likely(eth->h_proto == BE16(ETH_P_8021Q))) { - if (unlikely((void*)(size_t)ctx->data + sizeof(struct ethhdr_vlan) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN((size_t)ctx->data, ethhdr_vlan); const struct ethhdr_vlan *const eth_vlan = (void*)(size_t)ctx->data; #ifdef REQ_8021Q @@ -198,25 +215,15 @@ int xdp_drop_prog(struct xdp_md *ctx) } } -#ifdef NEED_V4_PARSE - const struct iphdr *ip = NULL; - const struct icmphdr *icmp = NULL; -#endif -#ifdef NEED_V6_PARSE - const struct ip6hdr *ip6 = NULL; - const struct icmp6hdr *icmpv6 = NULL; - const struct ip6_fraghdr *frag6 = NULL; -#endif - const void *l4hdr = NULL; const struct tcphdr *tcp = NULL; - const struct udphdr *udp = NULL; + uint8_t ports_valid = 0; + uint16_t sport, dport; // Host Endian! Only valid with tcp || udp #ifdef NEED_V4_PARSE if (eth_proto == BE16(ETH_P_IP)) { - if (unlikely(pktdata + sizeof(struct iphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); - ip = (struct iphdr*) pktdata; + CHECK_LEN(pktdata, iphdr); + struct iphdr *ip = (struct iphdr*) pktdata; #if PARSE_IHL == PARSE if (unlikely(ip->ihl < 5)) DO_RETURN(IHL_DROP, XDP_DROP); @@ -226,37 +233,42 @@ int xdp_drop_prog(struct xdp_md *ctx) l4hdr = pktdata + 5*4; #endif + const struct icmphdr *icmp = NULL; if ((ip->frag_off & BE16(IP_OFFSET)) == 0) { if (ip->protocol == IP_PROTO_TCP) { - if (unlikely(l4hdr + sizeof(struct tcphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN(l4hdr, tcphdr); tcp = (struct tcphdr*) l4hdr; + sport = BE16(tcp->source); + dport = BE16(tcp->dest); + ports_valid = 1; } else if (ip->protocol == IP_PROTO_UDP) { - if (unlikely(l4hdr + sizeof(struct udphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); - udp = (struct udphdr*) l4hdr; + CHECK_LEN(l4hdr, udphdr); + const struct udphdr *udp = (struct udphdr*) l4hdr; + sport = BE16(udp->source); + dport = BE16(udp->dest); + ports_valid = 1; } else if (ip->protocol == IP_PROTO_ICMP) { - if (unlikely(l4hdr + sizeof(struct icmphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN(l4hdr, icmphdr); icmp = (struct icmphdr*) l4hdr; } } + + RULES4 } #endif #ifdef NEED_V6_PARSE if (eth_proto == BE16(ETH_P_IPV6)) { - if (unlikely(pktdata + sizeof(struct ip6hdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); - ip6 = (struct ip6hdr*) pktdata; + CHECK_LEN(pktdata, ip6hdr); + struct ip6hdr *ip6 = (struct ip6hdr*) pktdata; l4hdr = pktdata + 40; uint8_t v6nexthdr = ip6->nexthdr; + const struct ip6_fraghdr *frag6 = NULL; #ifdef PARSE_V6_FRAG #if PARSE_V6_FRAG == PARSE if (ip6->nexthdr == IP6_PROTO_FRAG) { - if (unlikely(l4hdr + sizeof(struct ip6_fraghdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN(l4hdr, ip6_fraghdr); frag6 = (struct ip6_fraghdr*) l4hdr; l4hdr = l4hdr + sizeof(struct ip6_fraghdr); v6nexthdr = frag6->nexthdr; @@ -268,34 +280,29 @@ int xdp_drop_prog(struct xdp_md *ctx) #endif // TODO: Handle more options? + const struct icmp6hdr *icmpv6 = NULL; if (frag6 == NULL || (frag6->frag_off & BE16(IP6_FRAGOFF)) == 0) { if (v6nexthdr == IP_PROTO_TCP) { - if (unlikely(l4hdr + sizeof(struct tcphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN(l4hdr, tcphdr); tcp = (struct tcphdr*) l4hdr; + sport = BE16(tcp->source); + dport = BE16(tcp->dest); + ports_valid = 1; } else if (v6nexthdr == IP_PROTO_UDP) { - if (unlikely(l4hdr + sizeof(struct udphdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); - udp = (struct udphdr*) l4hdr; + CHECK_LEN(l4hdr, udphdr); + const struct udphdr *udp = (struct udphdr*) l4hdr; + sport = BE16(udp->source); + dport = BE16(udp->dest); + ports_valid = 1; } else if (v6nexthdr == IP6_PROTO_ICMPV6) { - if (unlikely(l4hdr + sizeof(struct icmp6hdr) > data_end)) - DO_RETURN(PKT_LEN_DROP, XDP_DROP); + CHECK_LEN(l4hdr, icmp6hdr); icmpv6 = (struct icmp6hdr*) l4hdr; } } - } -#endif - uint16_t sport, dport; // Host Endian! Only valid with tcp || udp - if (tcp != NULL) { - sport = BE16(tcp->source); - dport = BE16(tcp->dest); - } else if (udp != NULL) { - sport = BE16(udp->source); - dport = BE16(udp->dest); + RULES6 } - - RULES +#endif return XDP_PASS; } @@ -304,7 +311,7 @@ int xdp_drop_prog(struct xdp_md *ctx) #include #include -const char d[] = TEST; +char d[] = TEST; int main() { struct xdp_md test = { .data = (uint64_t)d,