diff options
| author |  Andrii Nakryiko <andrii@kernel.org>
| 2021-11-03 15:08:42 -0700 |
|---|---|---|
| committer |  Alexei Starovoitov <ast@kernel.org>
| 2021-11-07 08:34:23 -0800 |
| commit | d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60 (patch) | |
| tree | 10cdc155805f3669350e38914fe6bb9c7eb11481 /tools/testing/selftests/bpf/prog_tests/sockopt.c | |
| parent | selftests/bpf: Fix non-strict SEC() program sections (diff) | |
| download | linux-d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60.tar.gz linux-d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60.tar.bz2 linux-d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60.zip | |
selftests/bpf: Convert legacy prog load APIs to bpf_prog_load()
Convert all the uses of legacy low-level BPF program loading APIs
(mostly bpf_load_program_xattr(), but also some bpf_verify_program()) to
bpf_prog_load() uses.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211103220845.2676888-10-andrii@kernel.org
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/sockopt.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/sockopt.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt.c b/tools/testing/selftests/bpf/prog_tests/sockopt.c index 3e8517a8395a..cd09f4c7dd92 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt.c @@ -852,22 +852,21 @@ static struct sockopt_test { static int load_prog(const struct bpf_insn *insns, enum bpf_attach_type expected_attach_type) { - struct bpf_load_program_attr attr = { - .prog_type = BPF_PROG_TYPE_CGROUP_SOCKOPT, + LIBBPF_OPTS(bpf_prog_load_opts, opts, .expected_attach_type = expected_attach_type, - .insns = insns, - .license = "GPL", .log_level = 2, - }; - int fd; + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); + int fd, insns_cnt = 0; for (; - insns[attr.insns_cnt].code != (BPF_JMP | BPF_EXIT); - attr.insns_cnt++) { + insns[insns_cnt].code != (BPF_JMP | BPF_EXIT); + insns_cnt++) { } - attr.insns_cnt++; + insns_cnt++; - fd = bpf_load_program_xattr(&attr, bpf_log_buf, sizeof(bpf_log_buf)); + fd = bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCKOPT, NULL, "GPL", insns, insns_cnt, &opts); if (verbose && fd < 0) fprintf(stderr, "%s\n", bpf_log_buf); |