> On Nov 3, 2020, at 7:31 AM, KP Singh <kpsi...@chromium.org> wrote:
>
> From: KP Singh <kpsi...@google.com>
>
> Signed-off-by: KP Singh <kpsi...@google.com>
LGTM, except that commit log is missing (also for 2/8).
Acked-by: Song Liu <songliubrav...@fb.com>
> ---
> tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 ++-
> tools/bpf/bpftool/bash-completion/bpftool | 2 +-
> tools/bpf/bpftool/map.c | 4 +++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst
> b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> index dade10cdf295..3d52256ba75f 100644
> --- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
> +++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> @@ -50,7 +50,8 @@ MAP COMMANDS
> | | **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**
> -| | **queue** | **stack** | **sk_storage** | **struct_ops** |
> **ringbuf** | **inode_storage** }
> +| | **queue** | **stack** | **sk_storage** | **struct_ops** |
> **ringbuf** | **inode_storage**
> + | **task_storage** }
>
> DESCRIPTION
> ===========
> diff --git a/tools/bpf/bpftool/bash-completion/bpftool
> b/tools/bpf/bpftool/bash-completion/bpftool
> index 3f1da30c4da6..fdffbc64c65c 100644
> --- a/tools/bpf/bpftool/bash-completion/bpftool
> +++ b/tools/bpf/bpftool/bash-completion/bpftool
> @@ -705,7 +705,7 @@ _bpftool()
> hash_of_maps devmap devmap_hash sockmap
> cpumap \
> xskmap sockhash cgroup_storage
> reuseport_sockarray \
> percpu_cgroup_storage queue stack sk_storage \
> - struct_ops inode_storage' -- \
> + struct_ops inode_storage task_storage' -- \
> "$cur" ) )
> return 0
> ;;
> diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
> index a7efbd84fbcc..b400364ee054 100644
> --- a/tools/bpf/bpftool/map.c
> +++ b/tools/bpf/bpftool/map.c
> @@ -51,6 +51,7 @@ const char * const map_type_name[] = {
> [BPF_MAP_TYPE_STRUCT_OPS] = "struct_ops",
> [BPF_MAP_TYPE_RINGBUF] = "ringbuf",
> [BPF_MAP_TYPE_INODE_STORAGE] = "inode_storage",
> + [BPF_MAP_TYPE_TASK_STORAGE] = "task_storage",
> };
>
> const size_t map_type_name_size = ARRAY_SIZE(map_type_name);
> @@ -1464,7 +1465,8 @@ static int do_help(int argc, char **argv)
> " lru_percpu_hash | lpm_trie | array_of_maps |
> hash_of_maps |\n"
> " devmap | devmap_hash | sockmap | cpumap |
> xskmap | sockhash |\n"
> " cgroup_storage | reuseport_sockarray |
> percpu_cgroup_storage |\n"
> - " queue | stack | sk_storage | struct_ops |
> ringbuf | inode_storage }\n"
> + " queue | stack | sk_storage | struct_ops |
> ringbuf | inode_storage |\n"
> + " task_storage }\n"
> " " HELP_SPEC_OPTIONS "\n"
> "",
> bin_name, argv[-2]);
> --
> 2.29.1.341.ge80a0c044ae-goog
>
