Commit 47f7cf63 authored Oct 07, 2020 by Andrii Nakryiko Committed by Alexei Starovoitov Oct 07, 2020

libbpf: Skip CO-RE relocations for not loaded BPF programs

Bypass CO-RE relocations step for BPF programs that are not going to be
loaded. This allows to have BPF programs compiled in and disabled dynamically
if kernel is not supposed to provide enough relocation information. In such
case, there won't be unnecessary warnings about failed relocations.

Fixes: d9297581 ("libbpf: Support disabling auto-loading BPF programs")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201008001025.292064-2-andrii@kernel.org

parent 80348d88

tools/lib/bpf/libbpf.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -5765,6 +5765,11 @@ bpf_object__relocate_core(struct bpf_object obj, const char targ_btf_path)
		err = -EINVAL;
		goto out;
		}
		/* no need to apply CO-RE relocation if the program is
		* not going to be loaded
		*/
		if (!prog->load)
		continue;

		err = bpf_core_apply_relo(prog, rec, i, obj->btf,
		targ_btf, cand_cache);