lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 338/399] selftests: bpf: Reset global state between reuseport test runs
    Date
    From: Lorenz Bauer <lmb@cloudflare.com>

    [ Upstream commit 51bad0f05616c43d6d34b0a19bcc9bdab8e8fb39 ]

    Currently, there is a lot of false positives if a single reuseport test
    fails. This is because expected_results and the result map are not cleared.

    Zero both after individual test runs, which fixes the mentioned false
    positives.

    Fixes: 91134d849a0e ("bpf: Test BPF_PROG_TYPE_SK_REUSEPORT")
    Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
    Acked-by: Martin KaFai Lau <kafai@fb.com>
    Acked-by: John Fastabend <john.fastabend@gmail.com>
    Link: https://lore.kernel.org/bpf/20200124112754.19664-5-lmb@cloudflare.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../selftests/bpf/test_select_reuseport.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c
    index 7566c13eb51a7..079d0f5a29091 100644
    --- a/tools/testing/selftests/bpf/test_select_reuseport.c
    +++ b/tools/testing/selftests/bpf/test_select_reuseport.c
    @@ -30,7 +30,7 @@
    #define REUSEPORT_ARRAY_SIZE 32

    static int result_map, tmp_index_ovr_map, linum_map, data_check_map;
    -static enum result expected_results[NR_RESULTS];
    +static __u32 expected_results[NR_RESULTS];
    static int sk_fds[REUSEPORT_ARRAY_SIZE];
    static int reuseport_array, outer_map;
    static int select_by_skb_data_prog;
    @@ -662,7 +662,19 @@ static void setup_per_test(int type, unsigned short family, bool inany)

    static void cleanup_per_test(void)
    {
    - int i, err;
    + int i, err, zero = 0;
    +
    + memset(expected_results, 0, sizeof(expected_results));
    +
    + for (i = 0; i < NR_RESULTS; i++) {
    + err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY);
    + RET_IF(err, "reset elem in result_map",
    + "i:%u err:%d errno:%d\n", i, err, errno);
    + }
    +
    + err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY);
    + RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n",
    + err, errno);

    for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++)
    close(sk_fds[i]);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-21 08:58    [W:4.040 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site