Run each converted filter through both the interpreter and the JIT and check they agree, catching JIT miscompiles.
test_bpf_filter and test_bpf_match did nearly the same thing: compile, load and run a filter against the dummy packet. Combine them into test_bpf_match, which now builds the packet itself and returns whether the filter matched. Callers run it for both load methods. The dummy packet is a UDP packet to a fixed destination MAC, source and destination ports, so the filter results are deterministic. None of the sample filters should match it, so assert that; a convert or JIT bug that flips a result is then caught. The destination MAC and source port are chosen so the negative ethernet and port filters do not match, and "port not 53 and not arp" is dropped as it matches any non-ARP packet that lacks port 53. Reduce log output to make it easier to match which expression might be causing issues. Signed-off-by: Stephen Hemminger <[email protected]> --- app/test/test_bpf.c | 171 ++++++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 71 deletions(-) diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 9adffcce64..8934c98c3c 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -32,6 +32,7 @@ test_bpf(void) #include <rte_bpf.h> #include <rte_ether.h> #include <rte_ip.h> +#include <rte_udp.h> /* Tests of most simple BPF programs (no instructions, one instruction etc.) */ @@ -4763,11 +4764,13 @@ load_cbpf_program_convert(struct bpf_program *cbpf_program, const char *str) return NULL; } +#ifdef DEBUG printf("bpf convert(\"%s\") produced:\n", str); rte_bpf_dump(stdout, prm->ins, prm->nb_ins); printf("%s \"%s\"\n", __func__, str); test_bpf_dump(cbpf_program, prm); +#endif bpf = rte_bpf_load(prm); rte_free(prm); @@ -4792,18 +4795,65 @@ load_cbpf_program_direct(struct bpf_program *cbpf_program, const char *str __rte }); } +static const load_cbpf_program_t cbpf_program_loaders[] = { + load_cbpf_program_convert, + load_cbpf_program_direct, +}; + +/* Setup Ethernet/IP/UDP headers in a dummy packet buffer for filter tests */ +static void +dummy_ip_prep(void *data, uint16_t plen) +{ + struct { + struct rte_ether_hdr eth_hdr; + struct rte_ipv4_hdr ip_hdr; + struct rte_udp_hdr udp_hdr; + } *hdr = data; + + hdr->eth_hdr = (struct rte_ether_hdr) { + .dst_addr.addr_bytes = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e }, + .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), + }; + hdr->ip_hdr = (struct rte_ipv4_hdr) { + .version_ihl = RTE_IPV4_VHL_DEF, + .total_length = rte_cpu_to_be_16(plen), + .time_to_live = IPDEFTTL, + .next_proto_id = IPPROTO_UDP, + .src_addr = rte_cpu_to_be_32(RTE_IPV4_LOOPBACK), + .dst_addr = rte_cpu_to_be_32(RTE_IPV4_BROADCAST), + }; + hdr->udp_hdr = (struct rte_udp_hdr) { + .src_port = rte_cpu_to_be_16(49152), /* fixed, avoids filter ports */ + .dst_port = rte_cpu_to_be_16(9), /* discard port */ + .dgram_len = rte_cpu_to_be_16(plen - sizeof(struct rte_ipv4_hdr)), + .dgram_cksum = 0, + }; +} + +/* + * Compile a pcap filter, load it with the given loader, then run it against + * a standard dummy packet with both the interpreter and (when available) the + * JIT, checking the two agree. + * + * Returns 1 if the filter matched, 0 if it did not, and -1 on any error + * (compile, load, or interpreter/JIT mismatch). + */ static int -test_bpf_match(pcap_t *pcap, const char *str, struct rte_mbuf *mb, +test_bpf_match(pcap_t *pcap, const char *str, load_cbpf_program_t load_cbpf_program) { + uint8_t tbuf[RTE_MBUF_DEFAULT_BUF_SIZE]; + const uint32_t plen = 100; struct bpf_program fcode; - struct rte_bpf *bpf; + struct rte_mbuf mb = { 0 }; + struct rte_bpf *bpf = NULL; int ret = -1; uint64_t rc; + printf("%s '%s'\n", __func__, str); if (pcap_compile(pcap, &fcode, str, 1, PCAP_NETMASK_UNKNOWN)) { printf("%s@%d: pcap_compile(\"%s\") failed: %s;\n", - __func__, __LINE__, str, pcap_geterr(pcap)); + __func__, __LINE__, str, pcap_geterr(pcap)); return -1; } @@ -4811,15 +4861,41 @@ test_bpf_match(pcap_t *pcap, const char *str, struct rte_mbuf *mb, if (bpf == NULL) { printf("%s@%d: failed to load cbpf program for \"%s\", error=%d(%s);\n", __func__, __LINE__, str, rte_errno, strerror(rte_errno)); + test_bpf_dump(&fcode, NULL); goto error; } - rc = rte_bpf_exec(bpf, mb); - /* The return code from bpf capture filter is non-zero if matched */ - ret = (rc == 0); + dummy_mbuf_prep(&mb, tbuf, sizeof(tbuf), plen); + dummy_ip_prep(rte_pktmbuf_mtod(&mb, void *), plen); + + rc = rte_bpf_exec(bpf, &mb); + + /* Verify the JIT, when available, produces the same result. */ + { + struct rte_bpf_jit jit; + + rte_bpf_get_jit(bpf, &jit); + if (jit.func != NULL) { + fflush(stdout); + if (jit.func(&mb) != rc) { + printf("%s@%d: JIT return code does not match\n", + __func__, __LINE__); + goto error; + } + } +#ifdef RTE_BPF_JIT_SUPPORTED + else { + printf("%s@%d: no JIT code generated\n", + __func__, __LINE__); + goto error; + } +#endif + } + + /* The return code from a bpf capture filter is non-zero if matched. */ + ret = (rc != 0); error: - if (bpf) - rte_bpf_destroy(bpf); + rte_bpf_destroy(bpf); pcap_freecode(&fcode); return ret; } @@ -4828,44 +4904,13 @@ test_bpf_match(pcap_t *pcap, const char *str, struct rte_mbuf *mb, static int test_bpf_filter_sanity(pcap_t *pcap) { - static const load_cbpf_program_t cbpf_program_loaders[] = { - load_cbpf_program_convert, - load_cbpf_program_direct, - }; - - const uint32_t plen = 100; - struct rte_mbuf mb, *m; - uint8_t tbuf[RTE_MBUF_DEFAULT_BUF_SIZE]; - struct { - struct rte_ether_hdr eth_hdr; - struct rte_ipv4_hdr ip_hdr; - } *hdr; - - memset(&mb, 0, sizeof(mb)); - dummy_mbuf_prep(&mb, tbuf, sizeof(tbuf), plen); - m = &mb; - - hdr = rte_pktmbuf_mtod(m, typeof(hdr)); - hdr->eth_hdr = (struct rte_ether_hdr) { - .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), - }; - hdr->ip_hdr = (struct rte_ipv4_hdr) { - .version_ihl = RTE_IPV4_VHL_DEF, - .total_length = rte_cpu_to_be_16(plen), - .time_to_live = IPDEFTTL, - .next_proto_id = IPPROTO_RAW, - .src_addr = rte_cpu_to_be_32(RTE_IPV4_LOOPBACK), - .dst_addr = rte_cpu_to_be_32(RTE_IPV4_BROADCAST), - }; - - for (int li = 0; li != RTE_DIM(cbpf_program_loaders); ++li) { - if (test_bpf_match(pcap, "ip", m, cbpf_program_loaders[li]) != 0) { + for (unsigned int li = 0; li != RTE_DIM(cbpf_program_loaders); ++li) { + if (test_bpf_match(pcap, "ip", cbpf_program_loaders[li]) != 1) { printf("%s@%d: filter \"ip\" doesn't match test data\n", __func__, __LINE__); return -1; } - if (test_bpf_match(pcap, "not ip", m, cbpf_program_loaders[li]) == 0) { + if (test_bpf_match(pcap, "not ip", cbpf_program_loaders[li]) != 0) { printf("%s@%d: filter \"not ip\" does match test data\n", __func__, __LINE__); return -1; @@ -4889,7 +4934,6 @@ static const char * const sample_filters[] = { "port 53", "host 192.0.2.1 and not (port 80 or port 25)", "host 2001:4b98:db0::8 and not port 80 and not port 25", - "port not 53 and not arp", "(tcp[0:2] > 1500 and tcp[0:2] < 1550) or (tcp[2:2] > 1500 and tcp[2:2] < 1550)", "ether proto 0x888e", "ether[0] & 1 = 0 and ip[16] >= 224", @@ -4916,35 +4960,10 @@ static const char * const sample_filters[] = { "or host 192.0.2.1 or host 192.0.2.100 or host 192.0.2.200"), }; -static int -test_bpf_filter(pcap_t *pcap, const char *s, load_cbpf_program_t load_cbpf_program) -{ - struct bpf_program fcode; - struct rte_bpf *bpf; - - if (pcap_compile(pcap, &fcode, s, 1, PCAP_NETMASK_UNKNOWN)) { - printf("%s@%d: pcap_compile(\"%s\") failed: %s;\n", - __func__, __LINE__, s, pcap_geterr(pcap)); - return -1; - } - - bpf = load_cbpf_program(&fcode, s); - if (bpf == NULL) { - printf("%s@%d: failed to load cbpf program for \"%s\", error=%d(%s);\n", - __func__, __LINE__, s, rte_errno, strerror(rte_errno)); - test_bpf_dump(&fcode, NULL); - } - - rte_bpf_destroy(bpf); - - pcap_freecode(&fcode); - return (bpf == NULL) ? -1 : 0; -} - static int test_bpf_convert(void) { - unsigned int i; + unsigned int i, li; pcap_t *pcap; int rc; @@ -4956,8 +4975,18 @@ test_bpf_convert(void) rc = test_bpf_filter_sanity(pcap); for (i = 0; i < RTE_DIM(sample_filters); i++) { - rc |= test_bpf_filter(pcap, sample_filters[i], load_cbpf_program_convert); - rc |= test_bpf_filter(pcap, sample_filters[i], load_cbpf_program_direct); + for (li = 0; li < RTE_DIM(cbpf_program_loaders); li++) { + int m = test_bpf_match(pcap, sample_filters[i], + cbpf_program_loaders[li]); + + /* None of the sample filters match the dummy packet. */ + if (m != 0) { + if (m > 0) + printf("%s@%d: filter \"%s\" unexpectedly matched\n", + __func__, __LINE__, sample_filters[i]); + rc = -1; + } + } } pcap_close(pcap); -- 2.53.0
