From 8864cde3495dbfd6b476c1b77a8bde035e1cf000 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 10 Feb 2017 01:13:12 +0000 Subject: MFC r305358,r305449,r305451,r306367,r306397,r309474: This also contains a merge of ^/projects/netbsd-tests-update-12@r304035 . This change never hit ^/head because bin/cat's behavior was changed (on ^/head) to match NetBSD. PR: 210607 r305358: Update contrib/netbsd-tests with new content from NetBSD This updates the snapshot from 09/30/2014 to 08/11/2016 This brings in a number of new testcases from upstream, most notably: - bin/cat - lib/libc - lib/msun - lib/libthr - usr.bin/sort lib/libc/tests/stdio/open_memstream_test.c was moved to lib/libc/tests/stdio/open_memstream2_test.c to accomodate the new open_memstream test from NetBSD. Tested on: amd64 (VMware fusion VM; various bare metal platforms); i386 (VMware fusion VM); make tinderbox r305449: Install h_db to unbreak some of the lib/libc/db testcases after r305358 r305451: Fix lib/libc/rpc test assumptions added in r305358 - Require root in the tcp/udp subtests (it's needed on FreeBSD when registering services). - Skip the tests if service registration fails. r306367 (by br): Allow up to 6 arguments only on MIPS. r306397 (by br): Use right piece of code for FreeBSD. r309474: Don't build :strvis_locale if VIS_NOLOCALE is undefined The copy of contrib/libc-vis on ^/stable/10 doesn't contain all of the features in the ^/stable/11 // ^/head version, including VIS_NOLOCALE. The risk is lower in conditionally running the test instead of backporting the newer version of libc-vis --- contrib/netbsd-tests/net/bpfjit/t_bpfjit.c | 884 ++++++++++++++++++++++++++--- 1 file changed, 797 insertions(+), 87 deletions(-) (limited to 'contrib/netbsd-tests/net/bpfjit/t_bpfjit.c') diff --git a/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c b/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c index a9f8f41..58db1e0 100644 --- a/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c +++ b/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c @@ -1,7 +1,7 @@ -/* $NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $ */ +/* $NetBSD: t_bpfjit.c,v 1.11 2015/02/14 22:34:33 alnsn Exp $ */ /*- - * Copyright (c) 2011-2012, 2014 Alexander Nasonov. + * Copyright (c) 2011-2012, 2014-2015 Alexander Nasonov. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__RCSID("$NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $"); +__RCSID("$NetBSD: t_bpfjit.c,v 1.11 2015/02/14 22:34:33 alnsn Exp $"); #include #include @@ -79,15 +79,73 @@ ATF_TC_HEAD(bpfjit_empty, tc) ATF_TC_BODY(bpfjit_empty, tc) { struct bpf_insn dummy; - bpfjit_func_t fn; + bpfjit_func_t code; RZ(rump_init()); + ATF_CHECK(!prog_validate(&dummy, 0)); + rump_schedule(); - fn = rumpns_bpfjit_generate_code(NULL, &dummy, 0); + code = rumpns_bpfjit_generate_code(NULL, &dummy, 0); rump_unschedule(); - ATF_CHECK(fn == NULL); + ATF_CHECK(code == NULL); +} + +ATF_TC(bpfjit_ret_k); +ATF_TC_HEAD(bpfjit_ret_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of a trivial bpf program"); +} + +ATF_TC_BODY(bpfjit_ret_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_RET+BPF_K, 17) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 17); +} + +ATF_TC(bpfjit_bad_ret_k); +ATF_TC_HEAD(bpfjit_bad_ret_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that JIT compilation of a program with bad BPF_RET fails"); +} + +ATF_TC_BODY(bpfjit_bad_ret_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_RET+BPF_K+0x8000, 13) + }; + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + uint8_t pkt[1]; /* the program doesn't read any data */ + + /* + * The point of this test is checking a bad instruction of + * a valid class and with a valid BPF_RVAL data. + */ + const uint16_t rcode = insns[0].code; + ATF_CHECK(BPF_CLASS(rcode) == BPF_RET && + (BPF_RVAL(rcode) == BPF_K || BPF_RVAL(rcode) == BPF_A)); + + RZ(rump_init()); + + ATF_CHECK(!prog_validate(insns, insn_count)); + + /* Current implementation generates code. */ + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 13); } ATF_TC(bpfjit_alu_add_k); @@ -364,6 +422,205 @@ ATF_TC_BODY(bpfjit_alu_div80000000_k, tc) ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1); } +ATF_TC(bpfjit_alu_mod0_k); +ATF_TC_HEAD(bpfjit_alu_mod0_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=0"); +} + +ATF_TC_BODY(bpfjit_alu_mod0_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + //ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0); +} + +ATF_TC(bpfjit_alu_mod1_k); +ATF_TC_HEAD(bpfjit_alu_mod1_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=1"); +} + +ATF_TC_BODY(bpfjit_alu_mod1_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 7), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 1), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0); +} + +ATF_TC(bpfjit_alu_mod2_k); +ATF_TC_HEAD(bpfjit_alu_mod2_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=2"); +} + +ATF_TC_BODY(bpfjit_alu_mod2_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 7), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 2), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1); +} + +ATF_TC(bpfjit_alu_mod4_k); +ATF_TC_HEAD(bpfjit_alu_mod4_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=4"); +} + +ATF_TC_BODY(bpfjit_alu_mod4_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 4), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3); +} + +ATF_TC(bpfjit_alu_mod10_k); +ATF_TC_HEAD(bpfjit_alu_mod10_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=10"); +} + +ATF_TC_BODY(bpfjit_alu_mod10_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 10), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 9); +} + +ATF_TC(bpfjit_alu_mod10000_k); +ATF_TC_HEAD(bpfjit_alu_mod10000_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=10000"); +} + +ATF_TC_BODY(bpfjit_alu_mod10000_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, 10000), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3849); +} + +ATF_TC(bpfjit_alu_mod7609801_k); +ATF_TC_HEAD(bpfjit_alu_mod7609801_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=7609801"); +} + +ATF_TC_BODY(bpfjit_alu_mod7609801_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, UINT32_C(7609801)), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3039531); +} + +ATF_TC(bpfjit_alu_mod80000000_k); +ATF_TC_HEAD(bpfjit_alu_mod80000000_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_K with k=0x80000000"); +} + +ATF_TC_BODY(bpfjit_alu_mod80000000_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffde)), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_K, UINT32_C(0x80000000)), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_C(0x7fffffde)); +} + ATF_TC(bpfjit_alu_and_k); ATF_TC_HEAD(bpfjit_alu_and_k, tc) { @@ -414,6 +671,31 @@ ATF_TC_BODY(bpfjit_alu_or_k, tc) ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef); } +ATF_TC(bpfjit_alu_xor_k); +ATF_TC_HEAD(bpfjit_alu_xor_k, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_XOR+BPF_K"); +} + +ATF_TC_BODY(bpfjit_alu_xor_k, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f), + BPF_STMT(BPF_ALU+BPF_XOR+BPF_K, 0x0000b1e0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef); +} + ATF_TC(bpfjit_alu_lsh_k); ATF_TC_HEAD(bpfjit_alu_lsh_k, tc) { @@ -606,22 +888,229 @@ ATF_TC_BODY(bpfjit_alu_add_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 5); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 5); +} + +ATF_TC(bpfjit_alu_sub_x); +ATF_TC_HEAD(bpfjit_alu_sub_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_X"); +} + +ATF_TC_BODY(bpfjit_alu_sub_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 1), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), + BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX); +} + +ATF_TC(bpfjit_alu_mul_x); +ATF_TC_HEAD(bpfjit_alu_mul_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_X"); +} + +ATF_TC_BODY(bpfjit_alu_mul_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3), + BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xfffffffd); +} + +ATF_TC(bpfjit_alu_div0_x); +ATF_TC_HEAD(bpfjit_alu_div0_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0"); +} + +ATF_TC_BODY(bpfjit_alu_div0_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0); +} + +ATF_TC(bpfjit_alu_div1_x); +ATF_TC_HEAD(bpfjit_alu_div1_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=1"); +} + +ATF_TC_BODY(bpfjit_alu_div1_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 7), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 7); +} + +ATF_TC(bpfjit_alu_div2_x); +ATF_TC_HEAD(bpfjit_alu_div2_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=2"); +} + +ATF_TC_BODY(bpfjit_alu_div2_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 7), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3); +} + +ATF_TC(bpfjit_alu_div4_x); +ATF_TC_HEAD(bpfjit_alu_div4_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=4"); +} + +ATF_TC_BODY(bpfjit_alu_div4_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x3fffffff); +} + +ATF_TC(bpfjit_alu_div10_x); +ATF_TC_HEAD(bpfjit_alu_div10_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10"); +} + +ATF_TC_BODY(bpfjit_alu_div10_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484384); +} + +ATF_TC(bpfjit_alu_div10000_x); +ATF_TC_HEAD(bpfjit_alu_div10000_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10000"); +} + +ATF_TC_BODY(bpfjit_alu_div10000_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10000), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484); } -ATF_TC(bpfjit_alu_sub_x); -ATF_TC_HEAD(bpfjit_alu_sub_x, tc) +ATF_TC(bpfjit_alu_div7609801_x); +ATF_TC_HEAD(bpfjit_alu_div7609801_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_SUB+BPF_X"); + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=7609801"); } -ATF_TC_BODY(bpfjit_alu_sub_x, tc) +ATF_TC_BODY(bpfjit_alu_div7609801_x, tc) { static struct bpf_insn insns[] = { - BPF_STMT(BPF_LD+BPF_IMM, 1), - BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), - BPF_STMT(BPF_ALU+BPF_SUB+BPF_X, 0), + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(7609801)), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -632,22 +1121,22 @@ ATF_TC_BODY(bpfjit_alu_sub_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 564); } -ATF_TC(bpfjit_alu_mul_x); -ATF_TC_HEAD(bpfjit_alu_mul_x, tc) +ATF_TC(bpfjit_alu_div80000000_x); +ATF_TC_HEAD(bpfjit_alu_div80000000_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_MUL+BPF_X"); + "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0x80000000"); } -ATF_TC_BODY(bpfjit_alu_mul_x, tc) +ATF_TC_BODY(bpfjit_alu_div80000000_x, tc) { static struct bpf_insn insns[] = { - BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)), - BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3), - BPF_STMT(BPF_ALU+BPF_MUL+BPF_X, 0), + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffde)), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0x80000000)), + BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -658,21 +1147,21 @@ ATF_TC_BODY(bpfjit_alu_mul_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xfffffffd); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1); } -ATF_TC(bpfjit_alu_div0_x); -ATF_TC_HEAD(bpfjit_alu_div0_x, tc) +ATF_TC(bpfjit_alu_mod0_x); +ATF_TC_HEAD(bpfjit_alu_mod0_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=0"); } -ATF_TC_BODY(bpfjit_alu_div0_x, tc) +ATF_TC_BODY(bpfjit_alu_mod0_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -686,19 +1175,19 @@ ATF_TC_BODY(bpfjit_alu_div0_x, tc) ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0); } -ATF_TC(bpfjit_alu_div1_x); -ATF_TC_HEAD(bpfjit_alu_div1_x, tc) +ATF_TC(bpfjit_alu_mod1_x); +ATF_TC_HEAD(bpfjit_alu_mod1_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=1"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=1"); } -ATF_TC_BODY(bpfjit_alu_div1_x, tc) +ATF_TC_BODY(bpfjit_alu_mod1_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, 7), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 1), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -709,22 +1198,22 @@ ATF_TC_BODY(bpfjit_alu_div1_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 7); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0); } -ATF_TC(bpfjit_alu_div2_x); -ATF_TC_HEAD(bpfjit_alu_div2_x, tc) +ATF_TC(bpfjit_alu_mod2_x); +ATF_TC_HEAD(bpfjit_alu_mod2_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=2"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=2"); } -ATF_TC_BODY(bpfjit_alu_div2_x, tc) +ATF_TC_BODY(bpfjit_alu_mod2_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, 7), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 2), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -735,22 +1224,22 @@ ATF_TC_BODY(bpfjit_alu_div2_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1); } -ATF_TC(bpfjit_alu_div4_x); -ATF_TC_HEAD(bpfjit_alu_div4_x, tc) +ATF_TC(bpfjit_alu_mod4_x); +ATF_TC_HEAD(bpfjit_alu_mod4_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=4"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=4"); } -ATF_TC_BODY(bpfjit_alu_div4_x, tc) +ATF_TC_BODY(bpfjit_alu_mod4_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffff)), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 4), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -761,22 +1250,22 @@ ATF_TC_BODY(bpfjit_alu_div4_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0x3fffffff); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3); } -ATF_TC(bpfjit_alu_div10_x); -ATF_TC_HEAD(bpfjit_alu_div10_x, tc) +ATF_TC(bpfjit_alu_mod10_x); +ATF_TC_HEAD(bpfjit_alu_mod10_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=10"); } -ATF_TC_BODY(bpfjit_alu_div10_x, tc) +ATF_TC_BODY(bpfjit_alu_mod10_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -787,22 +1276,22 @@ ATF_TC_BODY(bpfjit_alu_div10_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484384); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 9); } -ATF_TC(bpfjit_alu_div10000_x); -ATF_TC_HEAD(bpfjit_alu_div10000_x, tc) +ATF_TC(bpfjit_alu_mod10000_x); +ATF_TC_HEAD(bpfjit_alu_mod10000_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=10000"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=10000"); } -ATF_TC_BODY(bpfjit_alu_div10000_x, tc) +ATF_TC_BODY(bpfjit_alu_mod10000_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294843849)), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 10000), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -813,22 +1302,22 @@ ATF_TC_BODY(bpfjit_alu_div10000_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 429484); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3849); } -ATF_TC(bpfjit_alu_div7609801_x); -ATF_TC_HEAD(bpfjit_alu_div7609801_x, tc) +ATF_TC(bpfjit_alu_mod7609801_x); +ATF_TC_HEAD(bpfjit_alu_mod7609801_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=7609801"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=7609801"); } -ATF_TC_BODY(bpfjit_alu_div7609801_x, tc) +ATF_TC_BODY(bpfjit_alu_mod7609801_x, tc) { static struct bpf_insn insns[] = { BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(4294967295)), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(7609801)), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -839,22 +1328,22 @@ ATF_TC_BODY(bpfjit_alu_div7609801_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 564); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 3039531); } -ATF_TC(bpfjit_alu_div80000000_x); -ATF_TC_HEAD(bpfjit_alu_div80000000_x, tc) +ATF_TC(bpfjit_alu_mod80000000_x); +ATF_TC_HEAD(bpfjit_alu_mod80000000_x, tc) { atf_tc_set_md_var(tc, "descr", - "Test JIT compilation of BPF_ALU+BPF_DIV+BPF_X with X=0x80000000"); + "Test JIT compilation of BPF_ALU+BPF_MOD+BPF_X with X=0x80000000"); } -ATF_TC_BODY(bpfjit_alu_div80000000_x, tc) +ATF_TC_BODY(bpfjit_alu_mod80000000_x, tc) { static struct bpf_insn insns[] = { - BPF_STMT(BPF_LD+BPF_IMM, UINT32_MAX - 33), + BPF_STMT(BPF_LD+BPF_IMM, UINT32_C(0xffffffde)), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, UINT32_C(0x80000000)), - BPF_STMT(BPF_ALU+BPF_DIV+BPF_X, 0), + BPF_STMT(BPF_ALU+BPF_MOD+BPF_X, 0), BPF_STMT(BPF_RET+BPF_A, 0) }; @@ -865,7 +1354,7 @@ ATF_TC_BODY(bpfjit_alu_div80000000_x, tc) RZ(rump_init()); ATF_CHECK(prog_validate(insns, insn_count)); - ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 1); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_C(0x7fffffde)); } ATF_TC(bpfjit_alu_and_x); @@ -920,6 +1409,32 @@ ATF_TC_BODY(bpfjit_alu_or_x, tc) ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef); } +ATF_TC(bpfjit_alu_xor_x); +ATF_TC_HEAD(bpfjit_alu_xor_x, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test JIT compilation of BPF_ALU+BPF_XOR+BPF_X"); +} + +ATF_TC_BODY(bpfjit_alu_xor_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0x0000b1e0), + BPF_STMT(BPF_ALU+BPF_XOR+BPF_X, 0), + BPF_STMT(BPF_RET+BPF_A, 0) + }; + + uint8_t pkt[1]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef); +} + ATF_TC(bpfjit_alu_lsh_x); ATF_TC_HEAD(bpfjit_alu_lsh_x, tc) { @@ -1155,6 +1670,66 @@ ATF_TC_BODY(bpfjit_jmp_ja, tc) ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == UINT32_MAX); } +ATF_TC(bpfjit_jmp_ja_invalid); +ATF_TC_HEAD(bpfjit_jmp_ja_invalid, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test BPF_JMP+BPF_JA to invalid destination"); +} + +ATF_TC_BODY(bpfjit_jmp_ja_invalid, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_JMP+BPF_JA, 4), + BPF_STMT(BPF_RET+BPF_K, 0), + BPF_STMT(BPF_RET+BPF_K, 1), + BPF_STMT(BPF_RET+BPF_K, 2), + BPF_STMT(BPF_RET+BPF_K, 3), + }; + + bpfjit_func_t code; + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(!prog_validate(insns, insn_count)); + + rump_schedule(); + code = rumpns_bpfjit_generate_code(NULL, insns, insn_count); + rump_unschedule(); + ATF_CHECK(code == NULL); +} + +ATF_TC(bpfjit_jmp_ja_overflow); +ATF_TC_HEAD(bpfjit_jmp_ja_overflow, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test BPF_JMP+BPF_JA with negative offset"); +} + +ATF_TC_BODY(bpfjit_jmp_ja_overflow, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_JMP+BPF_JA, 1), + BPF_STMT(BPF_RET+BPF_K, 777), + BPF_STMT(BPF_JMP+BPF_JA, UINT32_MAX - 1), // -2 + BPF_STMT(BPF_RET+BPF_K, 0) + }; + + bpfjit_func_t code; + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + /* Jumps with negative offsets work only in userspace. */ + ATF_CHECK(!prog_validate(insns, insn_count)); + + rump_schedule(); + code = rumpns_bpfjit_generate_code(NULL, insns, insn_count); + rump_unschedule(); + ATF_CHECK(code == NULL); +} + ATF_TC(bpfjit_jmp_jgt_k); ATF_TC_HEAD(bpfjit_jmp_jgt_k, tc) { @@ -1574,26 +2149,26 @@ ATF_TC_BODY(bpfjit_jmp_jeq_x, tc) BPF_STMT(BPF_LD+BPF_W+BPF_LEN, 0), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 8), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1), - BPF_STMT(BPF_RET+BPF_K, 0), + BPF_STMT(BPF_RET+BPF_K, 1), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 3), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 0), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 9), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1), - BPF_STMT(BPF_RET+BPF_K, 1), - BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 1), BPF_STMT(BPF_RET+BPF_K, 2), + BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 5), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1), + BPF_STMT(BPF_RET+BPF_K, 3), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 7), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 2, 3), - BPF_STMT(BPF_RET+BPF_K, 3), BPF_STMT(BPF_RET+BPF_K, 4), BPF_STMT(BPF_RET+BPF_K, 5), + BPF_STMT(BPF_RET+BPF_K, 6), BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 6), BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 3, 1), - BPF_STMT(BPF_RET+BPF_K, 6), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 1, 0, 0), BPF_STMT(BPF_RET+BPF_K, 7), - BPF_STMT(BPF_RET+BPF_K, 8) + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 1, 0), + BPF_STMT(BPF_RET+BPF_K, 8), + BPF_STMT(BPF_RET+BPF_K, 9) }; bpfjit_func_t code; @@ -1610,14 +2185,14 @@ ATF_TC_BODY(bpfjit_jmp_jeq_x, tc) rump_unschedule(); ATF_REQUIRE(code != NULL); - ATF_CHECK(jitcall(code, pkt, 1, 1) == 7); - ATF_CHECK(jitcall(code, pkt, 2, 2) == 7); - ATF_CHECK(jitcall(code, pkt, 3, 3) == 1); - ATF_CHECK(jitcall(code, pkt, 4, 4) == 7); - ATF_CHECK(jitcall(code, pkt, 5, 5) == 7); - ATF_CHECK(jitcall(code, pkt, 6, 6) == 8); - ATF_CHECK(jitcall(code, pkt, 7, 7) == 5); - ATF_CHECK(jitcall(code, pkt, 8, 8) == 0); + ATF_CHECK(jitcall(code, pkt, 1, 1) == 8); + ATF_CHECK(jitcall(code, pkt, 2, 2) == 8); + ATF_CHECK(jitcall(code, pkt, 3, 3) == 2); + ATF_CHECK(jitcall(code, pkt, 4, 4) == 8); + ATF_CHECK(jitcall(code, pkt, 5, 5) == 3); + ATF_CHECK(jitcall(code, pkt, 6, 6) == 9); + ATF_CHECK(jitcall(code, pkt, 7, 7) == 6); + ATF_CHECK(jitcall(code, pkt, 8, 8) == 1); rump_schedule(); rumpns_bpfjit_free_code(code); @@ -1687,6 +2262,116 @@ ATF_TC_BODY(bpfjit_jmp_jset_x, tc) rump_unschedule(); } +ATF_TC(bpfjit_jmp_jeq_x_noinit_ax); +ATF_TC_HEAD(bpfjit_jmp_jeq_x_noinit_ax, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test JIT compilation " + "of BPF_JMP+BPF_EQ+BPF_X with uninitialised A and X"); +} + +ATF_TC_BODY(bpfjit_jmp_jeq_x_noinit_ax, tc) +{ + static struct bpf_insn insns[] = { + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1), + BPF_STMT(BPF_RET+BPF_K, 10), + BPF_STMT(BPF_RET+BPF_K, 11) + }; + + bpfjit_func_t code; + uint8_t pkt[8]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + + rump_schedule(); + code = rumpns_bpfjit_generate_code(NULL, insns, insn_count); + rump_unschedule(); + ATF_REQUIRE(code != NULL); + + ATF_CHECK(jitcall(code, pkt, 1, 1) == 10); + + rump_schedule(); + rumpns_bpfjit_free_code(code); + rump_unschedule(); +} + +ATF_TC(bpfjit_jmp_jeq_x_noinit_a); +ATF_TC_HEAD(bpfjit_jmp_jeq_x_noinit_a, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test JIT compilation " + "of BPF_JMP+BPF_EQ+BPF_X with uninitialised A"); +} + +ATF_TC_BODY(bpfjit_jmp_jeq_x_noinit_a, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LDX+BPF_W+BPF_LEN, 0), /* X > 0 */ + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1), + BPF_STMT(BPF_RET+BPF_K, 10), + BPF_STMT(BPF_RET+BPF_K, 11) + }; + + bpfjit_func_t code; + uint8_t pkt[8]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + + rump_schedule(); + code = rumpns_bpfjit_generate_code(NULL, insns, insn_count); + rump_unschedule(); + ATF_REQUIRE(code != NULL); + + ATF_CHECK(jitcall(code, pkt, 1, 1) == 11); + + rump_schedule(); + rumpns_bpfjit_free_code(code); + rump_unschedule(); +} + +ATF_TC(bpfjit_jmp_jeq_x_noinit_x); +ATF_TC_HEAD(bpfjit_jmp_jeq_x_noinit_x, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test JIT compilation " + "of BPF_JMP+BPF_EQ+BPF_X with uninitialised X"); +} + +ATF_TC_BODY(bpfjit_jmp_jeq_x_noinit_x, tc) +{ + static struct bpf_insn insns[] = { + BPF_STMT(BPF_LD+BPF_LEN, 0), /* A > 0 */ + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_X, 0, 0, 1), + BPF_STMT(BPF_RET+BPF_K, 10), + BPF_STMT(BPF_RET+BPF_K, 11) + }; + + bpfjit_func_t code; + uint8_t pkt[8]; /* the program doesn't read any data */ + + size_t insn_count = sizeof(insns) / sizeof(insns[0]); + + RZ(rump_init()); + + ATF_CHECK(prog_validate(insns, insn_count)); + + rump_schedule(); + code = rumpns_bpfjit_generate_code(NULL, insns, insn_count); + rump_unschedule(); + ATF_REQUIRE(code != NULL); + + ATF_CHECK(jitcall(code, pkt, 1, 1) == 11); + + rump_schedule(); + rumpns_bpfjit_free_code(code); + rump_unschedule(); +} + ATF_TC(bpfjit_jmp_modulo_x); ATF_TC_HEAD(bpfjit_jmp_modulo_x, tc) { @@ -3887,6 +4572,8 @@ ATF_TP_ADD_TCS(tp) * to ../../lib/libbpfjit/t_bpfjit.c */ ATF_TP_ADD_TC(tp, bpfjit_empty); + ATF_TP_ADD_TC(tp, bpfjit_ret_k); + ATF_TP_ADD_TC(tp, bpfjit_bad_ret_k); ATF_TP_ADD_TC(tp, bpfjit_alu_add_k); ATF_TP_ADD_TC(tp, bpfjit_alu_sub_k); ATF_TP_ADD_TC(tp, bpfjit_alu_mul_k); @@ -3898,8 +4585,17 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bpfjit_alu_div10000_k); ATF_TP_ADD_TC(tp, bpfjit_alu_div7609801_k); ATF_TP_ADD_TC(tp, bpfjit_alu_div80000000_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod0_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod1_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod2_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod4_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod10_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod10000_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod7609801_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod80000000_k); ATF_TP_ADD_TC(tp, bpfjit_alu_and_k); ATF_TP_ADD_TC(tp, bpfjit_alu_or_k); + ATF_TP_ADD_TC(tp, bpfjit_alu_xor_k); ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_k); ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_k); ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_k); @@ -3916,8 +4612,17 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bpfjit_alu_div10000_x); ATF_TP_ADD_TC(tp, bpfjit_alu_div7609801_x); ATF_TP_ADD_TC(tp, bpfjit_alu_div80000000_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod0_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod1_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod2_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod4_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod10_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod10000_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod7609801_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_mod80000000_x); ATF_TP_ADD_TC(tp, bpfjit_alu_and_x); ATF_TP_ADD_TC(tp, bpfjit_alu_or_x); + ATF_TP_ADD_TC(tp, bpfjit_alu_xor_x); ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_x); ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_x); ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_x); @@ -3925,6 +4630,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bpfjit_alu_modulo_x); ATF_TP_ADD_TC(tp, bpfjit_alu_neg); ATF_TP_ADD_TC(tp, bpfjit_jmp_ja); + ATF_TP_ADD_TC(tp, bpfjit_jmp_ja_invalid); + ATF_TP_ADD_TC(tp, bpfjit_jmp_ja_overflow); ATF_TP_ADD_TC(tp, bpfjit_jmp_jgt_k); ATF_TP_ADD_TC(tp, bpfjit_jmp_jge_k); ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_k); @@ -3934,6 +4641,9 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bpfjit_jmp_jge_x); ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_x); ATF_TP_ADD_TC(tp, bpfjit_jmp_jset_x); + ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_x_noinit_ax); + ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_x_noinit_a); + ATF_TP_ADD_TC(tp, bpfjit_jmp_jeq_x_noinit_x); ATF_TP_ADD_TC(tp, bpfjit_jmp_modulo_x); ATF_TP_ADD_TC(tp, bpfjit_ld_abs); ATF_TP_ADD_TC(tp, bpfjit_ld_abs_k_overflow); -- cgit v1.1