diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2021-11-04 01:08:42 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-11-07 19:34:23 +0300 |
| commit | d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60 (patch) | |
| tree | 10cdc155805f3669350e38914fe6bb9c7eb11481 /tools/testing/selftests/bpf/test_sock.c | |
| parent | 3d1d62397f4a12dedee09727b26cd5a4b254ebb7 (diff) | |
| download | linux-d8e86407e5fc6c3da1e336f89bd3e9bbc1c0cf60.tar.xz | |
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/test_sock.c')
| -rw-r--r-- | tools/testing/selftests/bpf/test_sock.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c index 9613f7538840..e8edd3dd3ec2 100644 --- a/tools/testing/selftests/bpf/test_sock.c +++ b/tools/testing/selftests/bpf/test_sock.c @@ -328,18 +328,17 @@ static size_t probe_prog_length(const struct bpf_insn *fp) static int load_sock_prog(const struct bpf_insn *prog, enum bpf_attach_type attach_type) { - struct bpf_load_program_attr attr; - int ret; - - memset(&attr, 0, sizeof(struct bpf_load_program_attr)); - attr.prog_type = BPF_PROG_TYPE_CGROUP_SOCK; - attr.expected_attach_type = attach_type; - attr.insns = prog; - attr.insns_cnt = probe_prog_length(attr.insns); - attr.license = "GPL"; - attr.log_level = 2; - - ret = bpf_load_program_xattr(&attr, bpf_log_buf, BPF_LOG_BUF_SIZE); + LIBBPF_OPTS(bpf_prog_load_opts, opts); + int ret, insn_cnt; + + insn_cnt = probe_prog_length(prog); + + opts.expected_attach_type = attach_type; + opts.log_buf = bpf_log_buf; + opts.log_size = BPF_LOG_BUF_SIZE; + opts.log_level = 2; + + ret = bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCK, NULL, "GPL", prog, insn_cnt, &opts); if (verbose && ret < 0) fprintf(stderr, "%s\n", bpf_log_buf); |