mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 17:41:09 +00:00
cbdb1461dc
-Dbpf_prog_load_deprecated=bpf_prog_test_load trick is both ugly and breaks when deprecation goes into effect due to macro magic. Convert all the uses to explicit bpf_prog_test_load() calls which avoid deprecation errors and makes everything less magical. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Dave Marchevsky <davemarchevsky@fb.com> Link: https://lore.kernel.org/bpf/20211103220845.2676888-12-andrii@kernel.org
68 lines
1.4 KiB
C
68 lines
1.4 KiB
C
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
|
|
#ifndef FLOW_DISSECTOR_LOAD
|
|
#define FLOW_DISSECTOR_LOAD
|
|
|
|
#include <bpf/bpf.h>
|
|
#include <bpf/libbpf.h>
|
|
#include "testing_helpers.h"
|
|
|
|
static inline int bpf_flow_load(struct bpf_object **obj,
|
|
const char *path,
|
|
const char *prog_name,
|
|
const char *map_name,
|
|
const char *keys_map_name,
|
|
int *prog_fd,
|
|
int *keys_fd)
|
|
{
|
|
struct bpf_program *prog, *main_prog;
|
|
struct bpf_map *prog_array, *keys;
|
|
int prog_array_fd;
|
|
int ret, fd, i;
|
|
|
|
ret = bpf_prog_test_load(path, BPF_PROG_TYPE_FLOW_DISSECTOR, obj,
|
|
prog_fd);
|
|
if (ret)
|
|
return ret;
|
|
|
|
main_prog = bpf_object__find_program_by_name(*obj, prog_name);
|
|
if (!main_prog)
|
|
return -1;
|
|
|
|
*prog_fd = bpf_program__fd(main_prog);
|
|
if (*prog_fd < 0)
|
|
return -1;
|
|
|
|
prog_array = bpf_object__find_map_by_name(*obj, map_name);
|
|
if (!prog_array)
|
|
return -1;
|
|
|
|
prog_array_fd = bpf_map__fd(prog_array);
|
|
if (prog_array_fd < 0)
|
|
return -1;
|
|
|
|
if (keys_map_name && keys_fd) {
|
|
keys = bpf_object__find_map_by_name(*obj, keys_map_name);
|
|
if (!keys)
|
|
return -1;
|
|
|
|
*keys_fd = bpf_map__fd(keys);
|
|
if (*keys_fd < 0)
|
|
return -1;
|
|
}
|
|
|
|
i = 0;
|
|
bpf_object__for_each_program(prog, *obj) {
|
|
fd = bpf_program__fd(prog);
|
|
if (fd < 0)
|
|
return fd;
|
|
|
|
if (fd != *prog_fd) {
|
|
bpf_map_update_elem(prog_array_fd, &i, &fd, BPF_ANY);
|
|
++i;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif /* FLOW_DISSECTOR_LOAD */
|