Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Remove the only use of deprecated bpf_object__load_xattr()

Switch from bpf_object__load_xattr() to bpf_object__load() and
kernel_log_level in bpf_object_open_opts.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211209193840.1248570-12-andrii@kernel.org

+5 -5
+5 -5
tools/testing/selftests/bpf/testing_helpers.c
··· 88 88 int bpf_prog_test_load(const char *file, enum bpf_prog_type type, 89 89 struct bpf_object **pobj, int *prog_fd) 90 90 { 91 - struct bpf_object_load_attr attr = {}; 91 + LIBBPF_OPTS(bpf_object_open_opts, opts, 92 + .kernel_log_level = extra_prog_load_log_flags, 93 + ); 92 94 struct bpf_object *obj; 93 95 struct bpf_program *prog; 94 96 __u32 flags; 95 97 int err; 96 98 97 - obj = bpf_object__open(file); 99 + obj = bpf_object__open_file(file, &opts); 98 100 if (!obj) 99 101 return -errno; 100 102 ··· 112 110 flags = bpf_program__flags(prog) | BPF_F_TEST_RND_HI32; 113 111 bpf_program__set_flags(prog, flags); 114 112 115 - attr.obj = obj; 116 - attr.log_level = extra_prog_load_log_flags; 117 - err = bpf_object__load_xattr(&attr); 113 + err = bpf_object__load(obj); 118 114 if (err) 119 115 goto err_out; 120 116