Commit af2d0d09 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Daniel Borkmann
Browse files

bpf: Disable bh in bpf_test_run for xdp and tc prog 



Some of the bpf helpers require bh disabled. eg. The bpf_fib_lookup
helper that will be used in a latter selftest. In particular, it
calls ___neigh_lookup_noref that expects the bh disabled.

This patch disables bh before calling bpf_prog_run[_xdp], so
the testing prog can also use those helpers.

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230217004150.2980689-2-martin.lau@linux.dev
parent 1596dae2

net/bpf/test_run.c

+2 −0
Original line number Diff line number Diff line
@@ -413,10 +413,12 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, 
	old_ctx = bpf_set_run_ctx(&run_ctx.run_ctx);

	do {

		run_ctx.prog_item = &item;

		local_bh_disable();

		if (xdp)

			*retval = bpf_prog_run_xdp(prog, ctx);

		else

			*retval = bpf_prog_run(prog, ctx);

		local_bh_enable();

	} while (bpf_test_timer_continue(&t, 1, repeat, &ret, time));

	bpf_reset_run_ctx(old_ctx);

	bpf_test_timer_leave(&t);