On 22/11/18 20:59, David Calavera wrote:
> I noticed that these two new BPF Maps are not defined in bpftool.
> This patch defines those two maps and adds their names to the
> bpftool-map documentation.
>
> Signed-off-by: David Calavera <david.calav...@gmail.com>
> ---
Subject line says 'QUEUE' twice, should one of those be 'STACK'?
> tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 ++-
> tools/bpf/bpftool/map.c | 2 ++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst
> b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> index f55a2daed59b..9e827e342d9e 100644
> --- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
> +++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> @@ -42,7 +42,8 @@ MAP COMMANDS
> | | **percpu_array** | **stack_trace** | **cgroup_array** |
> **lru_hash**
> | | **lru_percpu_hash** | **lpm_trie** | **array_of_maps** |
> **hash_of_maps**
> | | **devmap** | **sockmap** | **cpumap** | **xskmap** |
> **sockhash**
> -| | **cgroup_storage** | **reuseport_sockarray** |
> **percpu_cgroup_storage** }
> +| | **cgroup_storage** | **reuseport_sockarray** |
> **percpu_cgroup_storage**
> +| | **queue** | **stack** }
>
> DESCRIPTION
> ===========
> diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
> index 7bf38f0e152e..68b656b6edcc 100644
> --- a/tools/bpf/bpftool/map.c
> +++ b/tools/bpf/bpftool/map.c
> @@ -74,6 +74,8 @@ static const char * const map_type_name[] = {
> [BPF_MAP_TYPE_CGROUP_STORAGE] = "cgroup_storage",
> [BPF_MAP_TYPE_REUSEPORT_SOCKARRAY] = "reuseport_sockarray",
> [BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE] = "percpu_cgroup_storage",
> + [BPF_MAP_TYPE_QUEUE] = "queue",
> + [BPF_MAP_TYPE_STACK] = "stack",
> };
>
> static bool map_is_per_cpu(__u32 type)
