From 3d03c8a8e0a9033be8c1ab020129db7790cc7493 Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Tue, 10 Jan 2023 17:39:08 +0800 Subject: [PATCH] aya-obj: Add new map types Include all new map types which were included in the last libbpf update (5d13fd5acaa9). Fixes: cb28533e2f9e ("aya-obj: Update `BPF_MAP_TYPE_CGROUP_STORAGE` name to `BPF_MAP_TYPE_CGRP_STORAGE`") Signed-off-by: Michal Rostecki --- aya-obj/src/maps.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aya-obj/src/maps.rs b/aya-obj/src/maps.rs index f7706667..aa2d213c 100644 --- a/aya-obj/src/maps.rs +++ b/aya-obj/src/maps.rs @@ -37,6 +37,9 @@ impl TryFrom for crate::generated::bpf_map_type { x if x == BPF_MAP_TYPE_CPUMAP as u32 => BPF_MAP_TYPE_CPUMAP, x if x == BPF_MAP_TYPE_XSKMAP as u32 => BPF_MAP_TYPE_XSKMAP, x if x == BPF_MAP_TYPE_SOCKHASH as u32 => BPF_MAP_TYPE_SOCKHASH, + x if x == BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED as u32 => { + BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED + } x if x == BPF_MAP_TYPE_CGRP_STORAGE as u32 => BPF_MAP_TYPE_CGRP_STORAGE, x if x == BPF_MAP_TYPE_REUSEPORT_SOCKARRAY as u32 => BPF_MAP_TYPE_REUSEPORT_SOCKARRAY, x if x == BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE as u32 => { @@ -50,6 +53,9 @@ impl TryFrom for crate::generated::bpf_map_type { x if x == BPF_MAP_TYPE_RINGBUF as u32 => BPF_MAP_TYPE_RINGBUF, x if x == BPF_MAP_TYPE_INODE_STORAGE as u32 => BPF_MAP_TYPE_INODE_STORAGE, x if x == BPF_MAP_TYPE_TASK_STORAGE as u32 => BPF_MAP_TYPE_TASK_STORAGE, + x if x == BPF_MAP_TYPE_BLOOM_FILTER as u32 => BPF_MAP_TYPE_BLOOM_FILTER, + x if x == BPF_MAP_TYPE_USER_RINGBUF as u32 => BPF_MAP_TYPE_USER_RINGBUF, + x if x == BPF_MAP_TYPE_CGRP_STORAGE as u32 => BPF_MAP_TYPE_CGRP_STORAGE, _ => return Err(InvalidMapTypeError { map_type }), }) }