From: Toke Høiland-Jørgensen <t...@redhat.com>

Adds bash completion and definition types for the xdp_chain map type to
bpftool.

Signed-off-by: Toke Høiland-Jørgensen <t...@redhat.com>
---
 tools/bpf/bpftool/Documentation/bpftool-map.rst |    4 ++--
 tools/bpf/bpftool/bash-completion/bpftool       |    2 +-
 tools/bpf/bpftool/map.c                         |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst 
b/tools/bpf/bpftool/Documentation/bpftool-map.rst
index 1c0f7146aab0..9aefcef50b53 100644
--- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
+++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst
@@ -47,8 +47,8 @@ MAP COMMANDS
 |      *TYPE* := { **hash** | **array** | **prog_array** | 
**perf_event_array** | **percpu_hash**
 |              | **percpu_array** | **stack_trace** | **cgroup_array** | 
**lru_hash**
 |              | **lru_percpu_hash** | **lpm_trie** | **array_of_maps** | 
**hash_of_maps**
-|              | **devmap** | **devmap_hash** | **sockmap** | **cpumap** | 
**xskmap** | **sockhash**
-|              | **cgroup_storage** | **reuseport_sockarray** | 
**percpu_cgroup_storage**
+|              | **devmap** | **devmap_hash** | **xdp_chain** | **sockmap** | 
**cpumap** | **xskmap**
+|              | **sockhash** | **cgroup_storage** | **reuseport_sockarray** | 
**percpu_cgroup_storage**
 |              | **queue** | **stack** }
 
 DESCRIPTION
diff --git a/tools/bpf/bpftool/bash-completion/bpftool 
b/tools/bpf/bpftool/bash-completion/bpftool
index 70493a6da206..95f19191b8d1 100644
--- a/tools/bpf/bpftool/bash-completion/bpftool
+++ b/tools/bpf/bpftool/bash-completion/bpftool
@@ -489,7 +489,7 @@ _bpftool()
                                 perf_event_array percpu_hash percpu_array \
                                 stack_trace cgroup_array lru_hash \
                                 lru_percpu_hash lpm_trie array_of_maps \
-                                hash_of_maps devmap devmap_hash sockmap cpumap 
\
+                                hash_of_maps devmap devmap_hash xdp_chain 
sockmap cpumap \
                                 xskmap sockhash cgroup_storage 
reuseport_sockarray \
                                 percpu_cgroup_storage queue stack' -- \
                                                    "$cur" ) )
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index de61d73b9030..97b5b42df79c 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -38,6 +38,7 @@ const char * const map_type_name[] = {
        [BPF_MAP_TYPE_HASH_OF_MAPS]             = "hash_of_maps",
        [BPF_MAP_TYPE_DEVMAP]                   = "devmap",
        [BPF_MAP_TYPE_DEVMAP_HASH]              = "devmap_hash",
+       [BPF_MAP_TYPE_XDP_CHAIN]                = "xdp_chain",
        [BPF_MAP_TYPE_SOCKMAP]                  = "sockmap",
        [BPF_MAP_TYPE_CPUMAP]                   = "cpumap",
        [BPF_MAP_TYPE_XSKMAP]                   = "xskmap",
@@ -1326,7 +1327,7 @@ static int do_help(int argc, char **argv)
                "       TYPE := { hash | array | prog_array | perf_event_array 
| percpu_hash |\n"
                "                 percpu_array | stack_trace | cgroup_array | 
lru_hash |\n"
                "                 lru_percpu_hash | lpm_trie | array_of_maps | 
hash_of_maps |\n"
-               "                 devmap | devmap_hash | sockmap | cpumap | 
xskmap | sockhash |\n"
+               "                 devmap | devmap_hash | xdp_chain | sockmap | 
cpumap | xskmap | sockhash |\n"
                "                 cgroup_storage | reuseport_sockarray | 
percpu_cgroup_storage }\n"
                "       " HELP_SPEC_OPTIONS "\n"
                "",

Reply via email to