main.c aktualisiert
This commit is contained in:
@@ -22,294 +22,260 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define IPV6_FLOWINFO_MASK bpf_htonl(0x0FFFFFFF)
|
#define IPV6_FLOWINFO_MASK bpf_htonl(0x0FFFFFFF)
|
||||||
#define VLAN_MAX_DEPTH 2 /* Support double-tagged VLANs */
|
#define VLAN_MAX_DEPTH 2
|
||||||
#define IPV6_EXT_MAX_CHAIN 6 /* Max IPv6 extension headers to parse */
|
#define IPV6_EXT_MAX_CHAIN 6
|
||||||
|
|
||||||
|
struct vlan_hdr {
|
||||||
|
__be16 h_vlan_TCI;
|
||||||
|
__be16 h_vlan_encapsulated_proto;
|
||||||
|
};
|
||||||
|
|
||||||
/* Forwarding ports */
|
|
||||||
struct {
|
struct {
|
||||||
__uint(type, BPF_MAP_TYPE_DEVMAP);
|
__uint(type, BPF_MAP_TYPE_DEVMAP);
|
||||||
__uint(key_size, sizeof(int));
|
__type(key, __u32);
|
||||||
__uint(value_size, sizeof(int));
|
__type(value, __u32);
|
||||||
__uint(max_entries, 512);
|
__uint(max_entries, 512);
|
||||||
} xdp_l3fwd_ports SEC(".maps");
|
} xdp_l3fwd_ports SEC(".maps");
|
||||||
|
|
||||||
/* Stats key — identifies a connection or flow */
|
|
||||||
struct flow_key {
|
struct flow_key {
|
||||||
__u8 proto;
|
__u8 proto;
|
||||||
__u8 pad[3]; /* alignment */
|
__u8 pad[3];
|
||||||
__u16 vlan_id; /* VLAN ID (0 if untagged) */
|
__u16 vlan_id;
|
||||||
__u16 pad2; /* alignment */
|
__u16 pad2;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
__u32 ipv4_src;
|
__u32 ipv4_src;
|
||||||
__u8 ipv6_src[16];
|
__u8 ipv6_src[16];
|
||||||
};
|
};
|
||||||
|
union {
|
||||||
|
__u32 ipv4_dst;
|
||||||
|
__u8 ipv6_dst[16];
|
||||||
|
};
|
||||||
|
|
||||||
union {
|
__u16 sport;
|
||||||
__u32 ipv4_dst;
|
__u16 dport;
|
||||||
__u8 ipv6_dst[16];
|
|
||||||
};
|
|
||||||
|
|
||||||
__u16 sport;
|
|
||||||
__u16 dport;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Stats value — counts packets and bytes */
|
|
||||||
struct flow_stats {
|
struct flow_stats {
|
||||||
__u64 packets;
|
__u64 packets;
|
||||||
__u64 bytes;
|
__u64 bytes;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* PERCPU hash map to track stats per flow - NO LOCKING NEEDED */
|
|
||||||
struct {
|
struct {
|
||||||
__uint(type, BPF_MAP_TYPE_PERCPU_HASH);
|
__uint(type, BPF_MAP_TYPE_PERCPU_HASH);
|
||||||
__uint(key_size, sizeof(struct flow_key));
|
__uint(key_size, sizeof(struct flow_key));
|
||||||
__uint(value_size, sizeof(struct flow_stats));
|
__uint(value_size, sizeof(struct flow_stats));
|
||||||
__uint(max_entries, 65536);
|
__uint(max_entries, 65536);
|
||||||
} xdp_flow_stats SEC(".maps");
|
} xdp_flow_stats SEC(".maps");
|
||||||
|
|
||||||
/* Decrease IPv4 TTL helper */
|
|
||||||
static __always_inline int ip_decrease_ttl(struct iphdr *iph)
|
static __always_inline int ip_decrease_ttl(struct iphdr *iph)
|
||||||
{
|
{
|
||||||
__u32 check = (__u32)iph->check;
|
__u32 check = (__u32)iph->check;
|
||||||
check += (__u32)bpf_htons(0x0100);
|
check += (__u32)bpf_htons(0x0100);
|
||||||
iph->check = (__sum16)(check + (check >= 0xFFFF));
|
iph->check = (__sum16)(check + (check >= 0xFFFF));
|
||||||
return --iph->ttl;
|
return --iph->ttl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Record stats in the xdp_flow_stats map - OPTIMIZED for PERCPU */
|
static __always_inline void record_stats(struct flow_key *key, __u64 bytes)
|
||||||
static __always_inline void record_stats(struct xdp_md *ctx, struct flow_key *key, __u64 bytes)
|
|
||||||
{
|
{
|
||||||
struct flow_stats *stats;
|
struct flow_stats *stats = bpf_map_lookup_elem(&xdp_flow_stats, key);
|
||||||
|
if (stats) {
|
||||||
stats = bpf_map_lookup_elem(&xdp_flow_stats, key);
|
stats->packets++;
|
||||||
if (stats) {
|
stats->bytes += bytes;
|
||||||
/* Direct update - no atomics needed with PERCPU maps */
|
} else {
|
||||||
stats->packets++;
|
struct flow_stats new_stats = {
|
||||||
stats->bytes += bytes;
|
.packets = 1,
|
||||||
} else {
|
.bytes = bytes,
|
||||||
struct flow_stats new_stats = {
|
};
|
||||||
.packets = 1,
|
bpf_map_update_elem(&xdp_flow_stats, key, &new_stats, BPF_ANY);
|
||||||
.bytes = bytes,
|
}
|
||||||
};
|
|
||||||
/* Use BPF_ANY instead of BPF_NOEXIST for better performance */
|
|
||||||
bpf_map_update_elem(&xdp_flow_stats, key, &new_stats, BPF_ANY);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Parse VLAN headers and return next protocol and offset */
|
|
||||||
static __always_inline int parse_vlan(void *data, void *data_end, __u64 *nh_off, __u16 *h_proto, __u16 *vlan_id)
|
static __always_inline int parse_vlan(void *data, void *data_end, __u64 *nh_off, __u16 *h_proto, __u16 *vlan_id)
|
||||||
{
|
{
|
||||||
struct vlan_hdr {
|
struct vlan_hdr *vh;
|
||||||
__be16 h_vlan_TCI;
|
#pragma unroll
|
||||||
__be16 h_vlan_encapsulated_proto;
|
for (int i = 0; i < VLAN_MAX_DEPTH; i++) {
|
||||||
} *vhdr;
|
if (*h_proto != bpf_htons(ETH_P_8021Q) && *h_proto != bpf_htons(ETH_P_8021AD))
|
||||||
int i;
|
break;
|
||||||
|
|
||||||
/* Parse up to VLAN_MAX_DEPTH VLAN headers */
|
vh = (void *)((char *)data + *nh_off);
|
||||||
#pragma unroll
|
if ((void *)(vh + 1) > data_end)
|
||||||
for (i = 0; i < VLAN_MAX_DEPTH; i++) {
|
return -1;
|
||||||
if (*h_proto != bpf_htons(ETH_P_8021Q) && *h_proto != bpf_htons(ETH_P_8021AD))
|
|
||||||
break;
|
|
||||||
|
|
||||||
vhdr = data + *nh_off;
|
if (i == 0)
|
||||||
if ((void *)(vhdr + 1) > data_end)
|
*vlan_id = bpf_ntohs(vh->h_vlan_TCI) & 0x0FFF;
|
||||||
return -1;
|
|
||||||
|
|
||||||
/* Store the outermost VLAN ID */
|
*nh_off += sizeof(*vh);
|
||||||
if (i == 0)
|
*h_proto = vh->h_vlan_encapsulated_proto;
|
||||||
*vlan_id = bpf_ntohs(vhdr->h_vlan_TCI) & 0x0FFF;
|
}
|
||||||
|
return 0;
|
||||||
*nh_off += sizeof(*vhdr);
|
|
||||||
*h_proto = vhdr->h_vlan_encapsulated_proto;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Skip IPv6 extension headers to find the actual L4 protocol */
|
static __always_inline int skip_ip6hdrext(void *data, void *data_end, __u64 *nh_off, __u8 next)
|
||||||
static __always_inline int skip_ip6hdrext(void *data, void *data_end, __u64 *nh_off, __u8 next_hdr_type)
|
|
||||||
{
|
{
|
||||||
struct ipv6_opt_hdr {
|
struct ipv6_opt_hdr *hdr;
|
||||||
__u8 nexthdr;
|
#pragma unroll
|
||||||
__u8 hdrlen;
|
for (int i = 0; i < IPV6_EXT_MAX_CHAIN; i++) {
|
||||||
} *hdr;
|
hdr = (void *)((char *)data + *nh_off);
|
||||||
int i;
|
if ((void *)(hdr + 1) > data_end)
|
||||||
|
return -1;
|
||||||
|
|
||||||
#pragma unroll
|
switch (next) {
|
||||||
for (i = 0; i < IPV6_EXT_MAX_CHAIN; i++) {
|
case IPPROTO_HOPOPTS:
|
||||||
hdr = data + *nh_off;
|
case IPPROTO_DSTOPTS:
|
||||||
|
case IPPROTO_ROUTING:
|
||||||
if ((void *)(hdr + 1) > data_end)
|
case IPPROTO_MH:
|
||||||
return -1;
|
*nh_off += (hdr->hdrlen + 1) * 8;
|
||||||
|
next = hdr->nexthdr;
|
||||||
switch (next_hdr_type) {
|
break;
|
||||||
case IPPROTO_HOPOPTS:
|
case IPPROTO_AH:
|
||||||
case IPPROTO_DSTOPTS:
|
*nh_off += (hdr->hdrlen + 2) * 4;
|
||||||
case IPPROTO_ROUTING:
|
next = hdr->nexthdr;
|
||||||
case IPPROTO_MH:
|
break;
|
||||||
*nh_off += (hdr->hdrlen + 1) * 8;
|
case IPPROTO_FRAGMENT:
|
||||||
next_hdr_type = hdr->nexthdr;
|
*nh_off += 8;
|
||||||
break;
|
next = hdr->nexthdr;
|
||||||
case IPPROTO_AH:
|
break;
|
||||||
*nh_off += (hdr->hdrlen + 2) * 4;
|
default:
|
||||||
next_hdr_type = hdr->nexthdr;
|
return next;
|
||||||
break;
|
}
|
||||||
case IPPROTO_FRAGMENT:
|
}
|
||||||
*nh_off += 8;
|
return -1;
|
||||||
next_hdr_type = hdr->nexthdr;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* Found a header that is not an IPv6 extension header */
|
|
||||||
return next_hdr_type;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static __always_inline int xdp_l3fwd_flags(struct xdp_md *ctx, __u32 flags)
|
static __always_inline int xdp_l3fwd_flags(struct xdp_md *ctx, __u32 flags)
|
||||||
{
|
{
|
||||||
void *data_end = (void *)(long)ctx->data_end;
|
void *data_end = (void *)(long)ctx->data_end;
|
||||||
void *data = (void *)(long)ctx->data;
|
void *data = (void *)(long)ctx->data;
|
||||||
struct bpf_fib_lookup fib_params;
|
|
||||||
struct ethhdr *eth = data;
|
|
||||||
struct ipv6hdr *ip6h;
|
|
||||||
struct iphdr *iph;
|
|
||||||
__u16 h_proto;
|
|
||||||
__u64 nh_off;
|
|
||||||
int rc;
|
|
||||||
__u16 vlan_id = 0;
|
|
||||||
|
|
||||||
nh_off = sizeof(*eth);
|
struct ethhdr *eth = data;
|
||||||
if (data + nh_off > data_end)
|
__u64 nh_off = sizeof(*eth);
|
||||||
return XDP_DROP;
|
if ((void *)((char *)data + nh_off) > data_end)
|
||||||
|
return XDP_DROP;
|
||||||
|
|
||||||
__builtin_memset(&fib_params, 0, sizeof(fib_params));
|
struct bpf_fib_lookup fib_params = {};
|
||||||
h_proto = eth->h_proto;
|
__u16 h_proto = eth->h_proto;
|
||||||
|
__u16 vlan_id = 0;
|
||||||
|
|
||||||
/* Parse VLAN headers if present */
|
if (parse_vlan(data, data_end, &nh_off, &h_proto, &vlan_id) < 0)
|
||||||
if (parse_vlan(data, data_end, &nh_off, &h_proto, &vlan_id) < 0)
|
return XDP_DROP;
|
||||||
return XDP_DROP;
|
|
||||||
|
|
||||||
struct flow_key key = {};
|
struct flow_key key = {};
|
||||||
key.vlan_id = vlan_id;
|
key.vlan_id = vlan_id;
|
||||||
__u64 bytes = data_end - data;
|
__u64 bytes = (char *)data_end - (char *)data;
|
||||||
|
|
||||||
if (h_proto == bpf_htons(ETH_P_IP)) {
|
if (h_proto == bpf_htons(ETH_P_IP)) {
|
||||||
iph = data + nh_off;
|
struct iphdr *iph = (void *)((char *)data + nh_off);
|
||||||
if ((void *)(iph + 1) > data_end)
|
if ((void *)(iph + 1) > data_end)
|
||||||
return XDP_DROP;
|
return XDP_DROP;
|
||||||
|
|
||||||
if (iph->ttl <= 1)
|
if (iph->ttl <= 1)
|
||||||
return XDP_PASS;
|
return XDP_PASS;
|
||||||
|
|
||||||
key.proto = iph->protocol;
|
key.proto = iph->protocol;
|
||||||
key.ipv4_src = iph->saddr;
|
key.ipv4_src = iph->saddr;
|
||||||
key.ipv4_dst = iph->daddr;
|
key.ipv4_dst = iph->daddr;
|
||||||
|
|
||||||
/* FIXED: Proper bounds checking for L4 headers */
|
__u8 ihl = iph->ihl;
|
||||||
__u64 l4_off = nh_off + (iph->ihl * 4);
|
if (ihl < 5)
|
||||||
if (iph->protocol == IPPROTO_TCP) {
|
return XDP_DROP;
|
||||||
struct tcphdr *tcph = data + l4_off;
|
|
||||||
if ((void *)(tcph + 1) <= data_end) {
|
__u64 l4_off = nh_off + (ihl * 4);
|
||||||
key.sport = tcph->source;
|
|
||||||
key.dport = tcph->dest;
|
/* Parse L4 ports - check exactly 4 bytes (sport + dport) */
|
||||||
}
|
void *l4_hdr = (void *)((char *)data + l4_off);
|
||||||
} else if (iph->protocol == IPPROTO_UDP) {
|
if ((void *)((char *)l4_hdr + 4) <= data_end) {
|
||||||
struct udphdr *udph = data + l4_off;
|
if (iph->protocol == IPPROTO_TCP || iph->protocol == IPPROTO_UDP) {
|
||||||
if ((void *)(udph + 1) <= data_end) {
|
__u16 *ports = l4_hdr;
|
||||||
key.sport = udph->source;
|
key.sport = ports[0];
|
||||||
key.dport = udph->dest;
|
key.dport = ports[1];
|
||||||
}
|
fib_params.sport = ports[0];
|
||||||
}
|
fib_params.dport = ports[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fib_params.family = AF_INET;
|
fib_params.family = AF_INET;
|
||||||
fib_params.tos = iph->tos;
|
fib_params.tos = iph->tos;
|
||||||
fib_params.l4_protocol = iph->protocol;
|
fib_params.l4_protocol = iph->protocol;
|
||||||
fib_params.tot_len = bpf_ntohs(iph->tot_len);
|
fib_params.tot_len = bpf_ntohs(iph->tot_len);
|
||||||
fib_params.ipv4_src = iph->saddr;
|
fib_params.ipv4_src = iph->saddr;
|
||||||
fib_params.ipv4_dst = iph->daddr;
|
fib_params.ipv4_dst = iph->daddr;
|
||||||
|
|
||||||
} else if (h_proto == bpf_htons(ETH_P_IPV6)) {
|
} else if (h_proto == bpf_htons(ETH_P_IPV6)) {
|
||||||
ip6h = data + nh_off;
|
struct ipv6hdr *ip6h = (void *)((char *)data + nh_off);
|
||||||
if ((void *)(ip6h + 1) > data_end)
|
if ((void *)(ip6h + 1) > data_end)
|
||||||
return XDP_DROP;
|
return XDP_DROP;
|
||||||
|
|
||||||
if (ip6h->hop_limit <= 1)
|
if (ip6h->hop_limit <= 1)
|
||||||
return XDP_PASS;
|
return XDP_PASS;
|
||||||
|
|
||||||
__builtin_memcpy(key.ipv6_src, &ip6h->saddr, 16);
|
__builtin_memcpy(key.ipv6_src, &ip6h->saddr, 16);
|
||||||
__builtin_memcpy(key.ipv6_dst, &ip6h->daddr, 16);
|
__builtin_memcpy(key.ipv6_dst, &ip6h->daddr, 16);
|
||||||
|
|
||||||
/* FIXED: Parse IPv6 extension headers to get actual L4 protocol */
|
__u64 l4_off = nh_off + sizeof(*ip6h);
|
||||||
__u64 l4_off = nh_off + sizeof(*ip6h);
|
int l4_proto = skip_ip6hdrext(data, data_end, &l4_off, ip6h->nexthdr);
|
||||||
int l4_proto = skip_ip6hdrext(data, data_end, &l4_off, ip6h->nexthdr);
|
if (l4_proto < 0)
|
||||||
|
l4_proto = ip6h->nexthdr;
|
||||||
if (l4_proto < 0)
|
|
||||||
l4_proto = ip6h->nexthdr; /* Fallback if parsing fails */
|
|
||||||
|
|
||||||
key.proto = l4_proto;
|
key.proto = l4_proto;
|
||||||
|
|
||||||
/* FIXED: Proper bounds checking for L4 headers */
|
/* Parse L4 ports - check exactly 4 bytes */
|
||||||
if (l4_proto == IPPROTO_TCP) {
|
void *l4_hdr = (void *)((char *)data + l4_off);
|
||||||
struct tcphdr *tcph = data + l4_off;
|
if ((void *)((char *)l4_hdr + 4) <= data_end) {
|
||||||
if ((void *)(tcph + 1) <= data_end) {
|
if (l4_proto == IPPROTO_TCP || l4_proto == IPPROTO_UDP) {
|
||||||
key.sport = tcph->source;
|
__u16 *ports = l4_hdr;
|
||||||
key.dport = tcph->dest;
|
key.sport = ports[0];
|
||||||
}
|
key.dport = ports[1];
|
||||||
} else if (l4_proto == IPPROTO_UDP) {
|
fib_params.sport = ports[0];
|
||||||
struct udphdr *udph = data + l4_off;
|
fib_params.dport = ports[1];
|
||||||
if ((void *)(udph + 1) <= data_end) {
|
}
|
||||||
key.sport = udph->source;
|
}
|
||||||
key.dport = udph->dest;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fib_params.family = AF_INET6;
|
fib_params.family = AF_INET6;
|
||||||
fib_params.flowinfo = *(__be32 *)ip6h & IPV6_FLOWINFO_MASK;
|
__be32 flow = *(__be32 *)ip6h & IPV6_FLOWINFO_MASK;
|
||||||
fib_params.l4_protocol = l4_proto;
|
fib_params.flowinfo = flow;
|
||||||
fib_params.tot_len = bpf_ntohs(ip6h->payload_len);
|
fib_params.l4_protocol = l4_proto;
|
||||||
__builtin_memcpy(fib_params.ipv6_src, &ip6h->saddr, 16);
|
fib_params.tot_len = bpf_ntohs(ip6h->payload_len);
|
||||||
__builtin_memcpy(fib_params.ipv6_dst, &ip6h->daddr, 16);
|
__builtin_memcpy(fib_params.ipv6_src, &ip6h->saddr, 16);
|
||||||
} else {
|
__builtin_memcpy(fib_params.ipv6_dst, &ip6h->daddr, 16);
|
||||||
return XDP_PASS;
|
} else {
|
||||||
}
|
return XDP_PASS;
|
||||||
|
}
|
||||||
|
|
||||||
fib_params.ifindex = ctx->ingress_ifindex;
|
fib_params.ifindex = ctx->ingress_ifindex;
|
||||||
rc = bpf_fib_lookup(ctx, &fib_params, sizeof(fib_params), flags);
|
|
||||||
|
|
||||||
if (rc == BPF_FIB_LKUP_RET_SUCCESS) {
|
|
||||||
if (!bpf_map_lookup_elem(&xdp_l3fwd_ports, &fib_params.ifindex))
|
|
||||||
return XDP_PASS;
|
|
||||||
|
|
||||||
/* Record stats AFTER fib lookup and port validation */
|
int rc = bpf_fib_lookup(ctx, &fib_params, sizeof(fib_params), flags);
|
||||||
record_stats(ctx, &key, bytes);
|
if (rc == 0) {
|
||||||
|
record_stats(&key, bytes);
|
||||||
|
|
||||||
/* Update TTL/hop limit and MAC addresses */
|
if (h_proto == bpf_htons(ETH_P_IP)) {
|
||||||
if (h_proto == bpf_htons(ETH_P_IP))
|
struct iphdr *iph = (void *)((char *)data + nh_off);
|
||||||
ip_decrease_ttl(iph);
|
ip_decrease_ttl(iph);
|
||||||
else if (h_proto == bpf_htons(ETH_P_IPV6))
|
} else if (h_proto == bpf_htons(ETH_P_IPV6)) {
|
||||||
ip6h->hop_limit--;
|
struct ipv6hdr *ip6h = (void *)((char *)data + nh_off);
|
||||||
|
ip6h->hop_limit--;
|
||||||
|
}
|
||||||
|
|
||||||
__builtin_memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN);
|
__builtin_memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN);
|
||||||
__builtin_memcpy(eth->h_source, fib_params.smac, ETH_ALEN);
|
__builtin_memcpy(eth->h_source, fib_params.smac, ETH_ALEN);
|
||||||
return bpf_redirect_map(&xdp_l3fwd_ports, fib_params.ifindex, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return XDP_PASS;
|
return bpf_redirect_map(&xdp_l3fwd_ports, fib_params.ifindex, XDP_PASS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return XDP_PASS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SEC("xdp_l3fwd")
|
SEC("xdp")
|
||||||
int xdp_l3fwd_prog(struct xdp_md *ctx)
|
int xdp_l3fwd_prog(struct xdp_md *ctx)
|
||||||
{
|
{
|
||||||
return xdp_l3fwd_flags(ctx, 0);
|
return xdp_l3fwd_flags(ctx, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
SEC("xdp_l3fwd_direct")
|
SEC("xdp")
|
||||||
int xdp_l3fwd_direct_prog(struct xdp_md *ctx)
|
int xdp_l3fwd_direct_prog(struct xdp_md *ctx)
|
||||||
{
|
{
|
||||||
return xdp_l3fwd_flags(ctx, BPF_FIB_LOOKUP_DIRECT);
|
return xdp_l3fwd_flags(ctx, BPF_FIB_LOOKUP_DIRECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
char _license[] SEC("license") = "GPL";
|
char _license[] SEC("license") = "GPL";
|
||||||
Reference in New Issue
Block a user