bpftool: Respect the -d option in struct_ops cmd (32e4c6f4) · Commits · 戴 / test

In the prog cmd, the "-d" option turns on the verifier log. This is missed in the "struct_ops" cmd and this patch fixes it. Fixes: ("bpftool: Add struct_ops support") Signed-off-by:

Martin KaFai Lau <kafai@fb.com> Signed-off-by:

Alexei Starovoitov <ast@kernel.org> Reviewed-by:

Quentin Monnet <quentin@isovalent.com> Link: https://lore.kernel.org/bpf/20200424182911.1259355-1-kafai@fb.com

tools/bpf/bpftool/struct_ops.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -479,6 +479,7 @@ static int do_unregister(int argc, char **argv)

		static int do_register(int argc, char **argv)
		{
		struct bpf_object_load_attr load_attr = {};
		const struct bpf_map_def *def;
		struct bpf_map_info info = {};
		__u32 info_len = sizeof(info);
		@@ -499,7 +500,12 @@ static int do_register(int argc, char **argv)

		set_max_rlimit();

		if (bpf_object__load(obj)) {
		load_attr.obj = obj;
		if (verifier_logs)
		/* log_level1 + log_level2 + stats, but not stable UAPI */
		load_attr.log_level = 1 + 2 + 4;

		if (bpf_object__load_xattr(&load_attr)) {
		bpf_object__close(obj);
		return -1;
		}

Admin message