summaryrefslogtreecommitdiff
path: root/src/xdp/common/common_libbpf.c
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2023-02-12 23:26:32 +0100
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2023-02-13 11:21:23 +0100
commit71f91f08f45c1167743d55b2168a4d45c11c8eae (patch)
treef8dc5838497976f31cff85d740b9023e3f7d252d /src/xdp/common/common_libbpf.c
parent7bacde871bb9c94d302251a54886ce2aac6f329e (diff)
downloadvyos-1x-71f91f08f45c1167743d55b2168a4d45c11c8eae.tar.gz
vyos-1x-71f91f08f45c1167743d55b2168a4d45c11c8eae.zip
debian: T5003: Update XDP for latest libbpf
Diffstat (limited to 'src/xdp/common/common_libbpf.c')
-rw-r--r--src/xdp/common/common_libbpf.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/xdp/common/common_libbpf.c b/src/xdp/common/common_libbpf.c
index 5788ecd9e..443ca4c66 100644
--- a/src/xdp/common/common_libbpf.c
+++ b/src/xdp/common/common_libbpf.c
@@ -24,10 +24,6 @@ static inline bool IS_ERR_OR_NULL(const void *ptr)
int bpf_prog_load_xattr_maps(const struct bpf_prog_load_attr_maps *attr,
struct bpf_object **pobj, int *prog_fd)
{
- struct bpf_object_open_attr open_attr = {
- .file = attr->file,
- .prog_type = attr->prog_type,
- };
struct bpf_program *prog, *first_prog = NULL;
enum bpf_attach_type expected_attach_type;
enum bpf_prog_type prog_type;
@@ -41,10 +37,13 @@ int bpf_prog_load_xattr_maps(const struct bpf_prog_load_attr_maps *attr,
if (!attr->file)
return -EINVAL;
+ obj = bpf_object__open_file(attr->file, NULL);
- obj = bpf_object__open_xattr(&open_attr);
- if (IS_ERR_OR_NULL(obj))
- return -ENOENT;
+ if (libbpf_get_error(obj))
+ return -EINVAL;
+
+ prog = bpf_object__next_program(obj, NULL);
+ bpf_program__set_type(prog, attr->prog_type);
bpf_object__for_each_program(prog, obj) {
/*
@@ -82,7 +81,7 @@ int bpf_prog_load_xattr_maps(const struct bpf_prog_load_attr_maps *attr,
bpf_map__for_each(map, obj) {
const char* mapname = bpf_map__name(map);
- if (!bpf_map__is_offload_neutral(map))
+ if (bpf_map__type(map) != BPF_MAP_TYPE_PERF_EVENT_ARRAY)
bpf_map__set_ifindex(map, attr->ifindex);
/* Was: map->map_ifindex = attr->ifindex; */