Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b911c5e8 authored by Lorenz Bauer's avatar Lorenz Bauer Committed by Greg Kroah-Hartman
Browse files

selftests: bpf: Reset global state between reuseport test runs 



[ 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: 91134d84 ("bpf: Test BPF_PROG_TYPE_SK_REUSEPORT")
Signed-off-by: default avatarLorenz Bauer <lmb@cloudflare.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20200124112754.19664-5-lmb@cloudflare.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 251c53a9

tools/testing/selftests/bpf/test_select_reuseport.c

+14 −2
Original line number Diff line number Diff line
@@ -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]);