Commit 32e608f8 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann

selftests/bpf: Remove usage of deprecated feature probing APIs

Switch to libbpf_probe_*() APIs instead of the deprecated ones.
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarQuentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20220202225916.3313522-5-andrii@kernel.org
parent a9a8ac59
...@@ -738,7 +738,7 @@ static void test_sockmap(unsigned int tasks, void *data) ...@@ -738,7 +738,7 @@ static void test_sockmap(unsigned int tasks, void *data)
sizeof(key), sizeof(value), sizeof(key), sizeof(value),
6, NULL); 6, NULL);
if (fd < 0) { if (fd < 0) {
if (!bpf_probe_map_type(BPF_MAP_TYPE_SOCKMAP, 0)) { if (!libbpf_probe_bpf_map_type(BPF_MAP_TYPE_SOCKMAP, NULL)) {
printf("%s SKIP (unsupported map type BPF_MAP_TYPE_SOCKMAP)\n", printf("%s SKIP (unsupported map type BPF_MAP_TYPE_SOCKMAP)\n",
__func__); __func__);
skips++; skips++;
......
...@@ -456,7 +456,7 @@ static int probe_filter_length(const struct bpf_insn *fp) ...@@ -456,7 +456,7 @@ static int probe_filter_length(const struct bpf_insn *fp)
static bool skip_unsupported_map(enum bpf_map_type map_type) static bool skip_unsupported_map(enum bpf_map_type map_type)
{ {
if (!bpf_probe_map_type(map_type, 0)) { if (!libbpf_probe_bpf_map_type(map_type, NULL)) {
printf("SKIP (unsupported map type %d)\n", map_type); printf("SKIP (unsupported map type %d)\n", map_type);
skips++; skips++;
return true; return true;
...@@ -1180,7 +1180,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, ...@@ -1180,7 +1180,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
* bpf_probe_prog_type won't give correct answer * bpf_probe_prog_type won't give correct answer
*/ */
if (fd_prog < 0 && prog_type != BPF_PROG_TYPE_TRACING && if (fd_prog < 0 && prog_type != BPF_PROG_TYPE_TRACING &&
!bpf_probe_prog_type(prog_type, 0)) { !libbpf_probe_bpf_prog_type(prog_type, NULL)) {
printf("SKIP (unsupported program type %d)\n", prog_type); printf("SKIP (unsupported program type %d)\n", prog_type);
skips++; skips++;
goto close_fds; goto close_fds;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment