diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2021-12-01 15:28:21 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2021-12-02 15:23:40 -0800 |
| commit | 186d1a86003ddcf0ec9e85e17ece868663106639 (patch) | |
| tree | 3d5cbe7ae03605ed244657b169fd6d70d9b04689 /tools/testing/selftests/bpf/prog_tests/sockopt_multi.c | |
| parent | selftests/bpf: Mute xdpxceiver.c's deprecation warnings (diff) | |
| download | linux-dev-186d1a86003ddcf0ec9e85e17ece868663106639.tar.xz linux-dev-186d1a86003ddcf0ec9e85e17ece868663106639.zip | |
selftests/bpf: Remove all the uses of deprecated bpf_prog_load_xattr()
Migrate all the selftests that were still using bpf_prog_load_xattr().
Few are converted to skeleton, others will use bpf_object__open_file()
API.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211201232824.3166325-7-andrii@kernel.org
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/sockopt_multi.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/sockopt_multi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c b/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c index bc34f7773444..abce12ddcc37 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c @@ -297,14 +297,10 @@ detach: void test_sockopt_multi(void) { - struct bpf_prog_load_attr attr = { - .file = "./sockopt_multi.o", - }; int cg_parent = -1, cg_child = -1; struct bpf_object *obj = NULL; int sock_fd = -1; int err = -1; - int ignored; cg_parent = test__join_cgroup("/parent"); if (CHECK_FAIL(cg_parent < 0)) @@ -314,8 +310,12 @@ void test_sockopt_multi(void) if (CHECK_FAIL(cg_child < 0)) goto out; - err = bpf_prog_load_xattr(&attr, &obj, &ignored); - if (CHECK_FAIL(err)) + obj = bpf_object__open_file("sockopt_multi.o", NULL); + if (!ASSERT_OK_PTR(obj, "obj_load")) + goto out; + + err = bpf_object__load(obj); + if (!ASSERT_OK(err, "obj_load")) goto out; sock_fd = socket(AF_INET, SOCK_STREAM, 0); |