samples/bpf: use preferred getters/setters instead of deprecated ones

Use preferred setter and getter APIs instead of deprecated ones.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220124194254.2051434-7-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/samples/bpf/map_perf_test_user.c b/samples/bpf/map_perf_test_user.c
index 319fd31522f353de3354a1ee1321ccff18534a98..e69651a6902f13be96350046994015e9ec714759 100644 (file)
--- a/samples/bpf/map_perf_test_user.c
+++ b/samples/bpf/map_perf_test_user.c
@@ -413,7 +413,7 @@ static void fixup_map(struct bpf_object *obj)
                for (i = 0; i < NR_TESTS; i++) {
                        if (!strcmp(test_map_names[i], name) &&
                            (check_test_flags(i))) {
-                               bpf_map__resize(map, num_map_entries);
+                               bpf_map__set_max_entries(map, num_map_entries);
                                continue;
                        }
                }

diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c
index a81704d3317ba1f01b03966d184d4dda6050e36e..5f74a70a902123224f7322958ad4fcc28ed7bd72 100644 (file)
--- a/samples/bpf/xdp_redirect_cpu_user.c
+++ b/samples/bpf/xdp_redirect_cpu_user.c
@@ -70,7 +70,7 @@ static void print_avail_progs(struct bpf_object *obj)
 
        printf(" Programs to be used for -p/--progname:\n");
        bpf_object__for_each_program(pos, obj) {
-               if (bpf_program__is_xdp(pos)) {
+               if (bpf_program__type(pos) == BPF_PROG_TYPE_XDP) {
                        if (!strncmp(bpf_program__name(pos), "xdp_prognum",
                                     sizeof("xdp_prognum") - 1))
                                printf(" %s\n", bpf_program__name(pos));

diff --git a/samples/bpf/xdp_sample_user.c b/samples/bpf/xdp_sample_user.c
index ae70a7943d85f0e76014999eca5d5d31f123eef9..c4332d068b9199ea3fb8a4df03cc16cdaa6216e5 100644 (file)
--- a/samples/bpf/xdp_sample_user.c
+++ b/samples/bpf/xdp_sample_user.c
@@ -1218,7 +1218,7 @@ int sample_setup_maps(struct bpf_map **maps)
                default:
                        return -EINVAL;
                }
-               if (bpf_map__resize(sample_map[i], sample_map_count[i]) < 0)
+               if (bpf_map__set_max_entries(sample_map[i], sample_map_count[i]) < 0)
                        return -errno;
        }
        sample_map[MAP_DEVMAP_XMIT_MULTI] = maps[MAP_DEVMAP_XMIT_MULTI];

diff --git a/samples/bpf/xdp_sample_user.h b/samples/bpf/xdp_sample_user.h
index 5f44b877ecf5f20cddf7c0add36fb4c8862806a0..f45051679977ed549546833c51f1284aa36ca3c9 100644 (file)
--- a/samples/bpf/xdp_sample_user.h
+++ b/samples/bpf/xdp_sample_user.h
@@ -61,7 +61,7 @@ static inline char *safe_strncpy(char *dst, const char *src, size_t size)
 
 #define __attach_tp(name)                                                      \
        ({                                                                     \
-               if (!bpf_program__is_tracing(skel->progs.name))                \
+               if (bpf_program__type(skel->progs.name) != BPF_PROG_TYPE_TRACING)\
                        return -EINVAL;                                        \
                skel->links.name = bpf_program__attach(skel->progs.name);      \
                if (!skel->links.name)                                         \