Commit be24a895 authored by Quentin Monnet's avatar Quentin Monnet Committed by Alexei Starovoitov
Browse files

bpftool: Enable libbpf logs when loading pid_iter in debug mode 



When trying to load the pid_iter BPF program used to iterate over the
PIDs of the processes holding file descriptors to BPF links, we would
unconditionally silence libbpf in order to keep the output clean if the
kernel does not support iterators and loading fails.

Although this is the desirable behaviour in most cases, this may hide
bugs in the pid_iter program that prevent it from loading, and it makes
it hard to debug such load failures, even in "debug" mode. Instead, it
makes more sense to print libbpf's logs when we pass the -d|--debug flag
to bpftool, so that users get the logs to investigate failures without
having to edit bpftool's source code.

Signed-off-by: default avatarQuentin Monnet <qmo@kernel.org>
Message-ID: <20240320012241.42991-1-qmo@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 2e244a72

tools/bpf/bpftool/pids.c

+12 −7
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) 
	char buf[4096 / sizeof(*e) * sizeof(*e)];

	struct pid_iter_bpf *skel;

	int err, ret, fd = -1, i;

	libbpf_print_fn_t default_print;



	*map = hashmap__new(hash_fn_for_key_as_id, equal_fn_for_key_as_id, NULL);

	if (IS_ERR(*map)) {
@@ -118,12 +117,18 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) 


	skel->rodata->obj_type = type;



	/* we don't want output polluted with libbpf errors if bpf_iter is not

	 * supported

	if (!verifier_logs) {

		libbpf_print_fn_t default_print;



		/* Unless debug information is on, we don't want the output to

		 * be polluted with libbpf errors if bpf_iter is not supported.

		 */

		default_print = libbpf_set_print(libbpf_print_none);

		err = pid_iter_bpf__load(skel);

		libbpf_set_print(default_print);

	} else {

		err = pid_iter_bpf__load(skel);

	}

	if (err) {

		/* too bad, kernel doesn't support BPF iterators yet */

		err = 0;