Commit 864ab061 authored Nov 06, 2020 by KP Singh Committed by Alexei Starovoitov Nov 06, 2020

bpftool: Add support for task local storage



Updates the binary to handle the BPF_MAP_TYPE_TASK_STORAGE as
"task_storage" for printing and parsing. Also updates the documentation
and bash completion

Signed-off-by: KP Singh <kpsingh@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20201106103747.2780972-5-kpsingh@chromium.org

parent 8885274d

tools/bpf/bpftool/Documentation/bpftool-map.rst

+2 −1

Original line number	Diff line number	Diff line
		@@ -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
		===========

tools/bpf/bpftool/bash-completion/bpftool

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		;;

tools/bpf/bpftool/map.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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]);