]> www.infradead.org Git - users/dwmw2/linux.git/commit
selftests/bpf: Fix arg parsing in veristat, test_progs
authorTony Ambardar <tony.ambardar@gmail.com>
Mon, 29 Jul 2024 09:24:18 +0000 (02:24 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 30 Jul 2024 20:45:44 +0000 (13:45 -0700)
commit03bfcda1fbc37ef34aa21d2b9e09138335afc6ee
treed2dbecd67c820836f51e1a8f4b73460261874b7c
parentc0247800ee7da5bc067b2916cf2722f755072307
selftests/bpf: Fix arg parsing in veristat, test_progs

Current code parses arguments with strtok_r() using a construct like

    char *state = NULL;
    while ((next = strtok_r(state ? NULL : input, ",", &state))) {
        ...
    }

where logic assumes the 'state' var can distinguish between first and
subsequent strtok_r() calls, and adjusts parameters accordingly. However,
'state' is strictly internal context for strtok_r() and no such assumptions
are supported in the man page. Moreover, the exact behaviour of 'state'
depends on the libc implementation, making the above code fragile.

Indeed, invoking "./test_progs -t <test_name>" on mips64el/musl will hang,
with the above code in an infinite loop.

Similarly, we see strange behaviour running 'veristat' on mips64el/musl:

    $ ./veristat -e file,prog,verdict,insns -C two-ok add-failure
    Can't specify more than 9 stats

Rewrite code using a counter to distinguish between strtok_r() calls.

Fixes: 61ddff373ffa ("selftests/bpf: Improve by-name subtest selection logic in prog_tests")
Fixes: 394169b079b5 ("selftests/bpf: add comparison mode to veristat")
Fixes: c8bc5e050976 ("selftests/bpf: Add veristat tool for mass-verifying BPF object files")
Signed-off-by: Tony Ambardar <tony.ambardar@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/392d8bf5559f85fa37926c1494e62312ef252c3d.1722244708.git.tony.ambardar@gmail.com
tools/testing/selftests/bpf/testing_helpers.c
tools/testing/selftests/bpf/veristat.c