nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

selftests/bpf: make flow dissector tests more extensible

Browse source 
Rewrite selftest to iterate over an array with input packet and
expected flow_keys. This should make it easier to extend this test
with additional cases without too much boilerplate.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Stanislav Fomichev 2019-04-12 16:43:10 -07:00 committed by Daniel Borkmann
parent 08de198c95
commit a5cb33464e
1 changed files with 116 additions and 81 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

197
tools/testing/selftests/bpf/prog_tests/flow_dissector.c
View file

@ -2,7 +2,7 @@
#include <test_progs.h> #include <test_progs.h>
#define CHECK_FLOW_KEYS(desc, got, expected) \ #define CHECK_FLOW_KEYS(desc, got, expected) \
CHECK(memcmp(&got, &expected, sizeof(got)) != 0, \ CHECK_ATTR(memcmp(&got, &expected, sizeof(got)) != 0, \
desc, \ desc, \
"nhoff=%u/%u " \ "nhoff=%u/%u " \
"thoff=%u/%u " \ "thoff=%u/%u " \
@ -10,6 +10,7 @@
"is_frag=%u/%u " \ "is_frag=%u/%u " \
"is_first_frag=%u/%u " \ "is_first_frag=%u/%u " \
"is_encap=%u/%u " \ "is_encap=%u/%u " \
"ip_proto=0x%x/0x%x " \
"n_proto=0x%x/0x%x " \ "n_proto=0x%x/0x%x " \
"sport=%u/%u " \ "sport=%u/%u " \
"dport=%u/%u\n", \ "dport=%u/%u\n", \
@ -19,53 +20,32 @@
got.is_frag, expected.is_frag, \ got.is_frag, expected.is_frag, \
got.is_first_frag, expected.is_first_frag, \ got.is_first_frag, expected.is_first_frag, \
got.is_encap, expected.is_encap, \ got.is_encap, expected.is_encap, \
got.ip_proto, expected.ip_proto, \
got.n_proto, expected.n_proto, \ got.n_proto, expected.n_proto, \
got.sport, expected.sport, \ got.sport, expected.sport, \
got.dport, expected.dport) got.dport, expected.dport)
static struct bpf_flow_keys pkt_v4_flow_keys = { struct ipv4_pkt {
.nhoff = 0, struct ethhdr eth;
.thoff = sizeof(struct iphdr), struct iphdr iph;
.addr_proto = ETH_P_IP, struct tcphdr tcp;
.ip_proto = IPPROTO_TCP, } __packed;
.n_proto = __bpf_constant_htons(ETH_P_IP),
};
static struct bpf_flow_keys pkt_v6_flow_keys = { struct svlan_ipv4_pkt {
.nhoff = 0,
.thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
.n_proto = __bpf_constant_htons(ETH_P_IPV6),
};
#define VLAN_HLEN 4
static struct {
struct ethhdr eth; struct ethhdr eth;
__u16 vlan_tci; __u16 vlan_tci;
__u16 vlan_proto; __u16 vlan_proto;
struct iphdr iph; struct iphdr iph;
struct tcphdr tcp; struct tcphdr tcp;
} __packed pkt_vlan_v4 = { } __packed;
.eth.h_proto = __bpf_constant_htons(ETH_P_8021Q),
.vlan_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
.iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
static struct bpf_flow_keys pkt_vlan_v4_flow_keys = { struct ipv6_pkt {
.nhoff = VLAN_HLEN, struct ethhdr eth;
.thoff = VLAN_HLEN + sizeof(struct iphdr), struct ipv6hdr iph;
.addr_proto = ETH_P_IP, struct tcphdr tcp;
.ip_proto = IPPROTO_TCP, } __packed;
.n_proto = __bpf_constant_htons(ETH_P_IP),
};
static struct { struct dvlan_ipv6_pkt {
struct ethhdr eth; struct ethhdr eth;
__u16 vlan_tci; __u16 vlan_tci;
__u16 vlan_proto; __u16 vlan_proto;
@ -73,31 +53,97 @@ static struct {
__u16 vlan_proto2; __u16 vlan_proto2;
struct ipv6hdr iph; struct ipv6hdr iph;
struct tcphdr tcp; struct tcphdr tcp;
} __packed pkt_vlan_v6 = { } __packed;
.eth.h_proto = __bpf_constant_htons(ETH_P_8021AD),
.vlan_proto = __bpf_constant_htons(ETH_P_8021Q), struct test {
.vlan_proto2 = __bpf_constant_htons(ETH_P_IPV6), const char *name;
.iph.nexthdr = IPPROTO_TCP, union {
.iph.payload_len = __bpf_constant_htons(MAGIC_BYTES), struct ipv4_pkt ipv4;
.tcp.urg_ptr = 123, struct svlan_ipv4_pkt svlan_ipv4;
.tcp.doff = 5, struct ipv6_pkt ipv6;
struct dvlan_ipv6_pkt dvlan_ipv6;
} pkt;
struct bpf_flow_keys keys;
}; };
static struct bpf_flow_keys pkt_vlan_v6_flow_keys = { #define VLAN_HLEN 4
.nhoff = VLAN_HLEN * 2,
.thoff = VLAN_HLEN * 2 + sizeof(struct ipv6hdr), struct test tests[] = {
.addr_proto = ETH_P_IPV6, {
.ip_proto = IPPROTO_TCP, .name = "ipv4",
.n_proto = __bpf_constant_htons(ETH_P_IPV6), .pkt.ipv4 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
.iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
.tcp.doff = 5,
},
.keys = {
.nhoff = 0,
.thoff = sizeof(struct iphdr),
.addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP,
.n_proto = __bpf_constant_htons(ETH_P_IP),
},
},
{
.name = "ipv6",
.pkt.ipv6 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),
.iph.nexthdr = IPPROTO_TCP,
.iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
.tcp.doff = 5,
},
.keys = {
.nhoff = 0,
.thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
.n_proto = __bpf_constant_htons(ETH_P_IPV6),
},
},
{
.name = "802.1q-ipv4",
.pkt.svlan_ipv4 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_8021Q),
.vlan_proto = __bpf_constant_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
.iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
.tcp.doff = 5,
},
.keys = {
.nhoff = VLAN_HLEN,
.thoff = VLAN_HLEN + sizeof(struct iphdr),
.addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP,
.n_proto = __bpf_constant_htons(ETH_P_IP),
},
},
{
.name = "802.1ad-ipv6",
.pkt.dvlan_ipv6 = {
.eth.h_proto = __bpf_constant_htons(ETH_P_8021AD),
.vlan_proto = __bpf_constant_htons(ETH_P_8021Q),
.vlan_proto2 = __bpf_constant_htons(ETH_P_IPV6),
.iph.nexthdr = IPPROTO_TCP,
.iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
.tcp.doff = 5,
},
.keys = {
.nhoff = VLAN_HLEN * 2,
.thoff = VLAN_HLEN * 2 + sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
.n_proto = __bpf_constant_htons(ETH_P_IPV6),
},
},
}; };
void test_flow_dissector(void) void test_flow_dissector(void)
{ {
struct bpf_flow_keys flow_keys;
struct bpf_object *obj; struct bpf_object *obj;
__u32 duration, retval;
int err, prog_fd; int err, prog_fd;
__u32 size;
err = bpf_flow_load(&obj, "./bpf_flow.o", "flow_dissector", err = bpf_flow_load(&obj, "./bpf_flow.o", "flow_dissector",
"jmp_table", &prog_fd); "jmp_table", &prog_fd);
@ -106,35 +152,24 @@ void test_flow_dissector(void)
return; return;
} }
err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4), for (int i = 0; i < ARRAY_SIZE(tests); i++) {
&flow_keys, &size, &retval, &duration); struct bpf_flow_keys flow_keys;
CHECK(size != sizeof(flow_keys) || err || retval != 1, "ipv4", struct bpf_prog_test_run_attr tattr = {
"err %d errno %d retval %d duration %d size %u/%lu\n", .prog_fd = prog_fd,
err, errno, retval, duration, size, sizeof(flow_keys)); .data_in = &tests[i].pkt,
CHECK_FLOW_KEYS("ipv4_flow_keys", flow_keys, pkt_v4_flow_keys); .data_size_in = sizeof(tests[i].pkt),
.data_out = &flow_keys,
};
err = bpf_prog_test_run(prog_fd, 10, &pkt_v6, sizeof(pkt_v6), err = bpf_prog_test_run_xattr(&tattr);
&flow_keys, &size, &retval, &duration); CHECK_ATTR(tattr.data_size_out != sizeof(flow_keys) ||
CHECK(size != sizeof(flow_keys) || err || retval != 1, "ipv6", err || tattr.retval != 1,
"err %d errno %d retval %d duration %d size %u/%lu\n", tests[i].name,
err, errno, retval, duration, size, sizeof(flow_keys)); "err %d errno %d retval %d duration %d size %u/%lu\n",
CHECK_FLOW_KEYS("ipv6_flow_keys", flow_keys, pkt_v6_flow_keys); err, errno, tattr.retval, tattr.duration,
tattr.data_size_out, sizeof(flow_keys));
err = bpf_prog_test_run(prog_fd, 10, &pkt_vlan_v4, sizeof(pkt_vlan_v4), CHECK_FLOW_KEYS(tests[i].name, flow_keys, tests[i].keys);
&flow_keys, &size, &retval, &duration); }
CHECK(size != sizeof(flow_keys) || err || retval != 1, "vlan_ipv4",
"err %d errno %d retval %d duration %d size %u/%lu\n",
err, errno, retval, duration, size, sizeof(flow_keys));
CHECK_FLOW_KEYS("vlan_ipv4_flow_keys", flow_keys,
pkt_vlan_v4_flow_keys);
err = bpf_prog_test_run(prog_fd, 10, &pkt_vlan_v6, sizeof(pkt_vlan_v6),
&flow_keys, &size, &retval, &duration);
CHECK(size != sizeof(flow_keys) || err || retval != 1, "vlan_ipv6",
"err %d errno %d retval %d duration %d size %u/%lu\n",
err, errno, retval, duration, size, sizeof(flow_keys));
CHECK_FLOW_KEYS("vlan_ipv6_flow_keys", flow_keys,
pkt_vlan_v6_flow_keys);
bpf_object__close(obj); bpf_object__close(obj);
} }