Commit 93a3545d authored Jul 17, 2020 by Jakub Sitnicki Committed by Alexei Starovoitov Jul 17, 2020

tools/bpftool: Add name mappings for SK_LOOKUP prog and attach type

Make bpftool show human-friendly identifiers for newly introduced program
and attach type, BPF_PROG_TYPE_SK_LOOKUP and BPF_SK_LOOKUP, respectively.

Also, add the new prog type bash-completion, man page and help message.

Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200717103536.397595-14-jakub@cloudflare.com

parent 499dd29d

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ PROG COMMANDS
		\| cgroup/getsockname4 \| cgroup/getsockname6 \| cgroup/sendmsg4 \| cgroup/sendmsg6 \|
		\| cgroup/recvmsg4 \| cgroup/recvmsg6 \| cgroup/sysctl \|
		\| cgroup/getsockopt \| cgroup/setsockopt \|
		\| struct_ops \| fentry \| fexit \| freplace
		\| struct_ops \| fentry \| fexit \| freplace \| sk_lookup
		\| }
		\| ATTACH_TYPE := {
		\| msg_verdict \| stream_verdict \| stream_parser \| flow_dissector

tools/bpf/bpftool/bash-completion/bpftool

+1 −1

Original line number	Diff line number	Diff line
		@@ -479,7 +479,7 @@ _bpftool()
		cgroup/post_bind4 cgroup/post_bind6 \
		cgroup/sysctl cgroup/getsockopt \
		cgroup/setsockopt struct_ops \
		fentry fexit freplace" -- \
		fentry fexit freplace sk_lookup" -- \
		"$cur" ) )
		return 0
		;;

tools/bpf/bpftool/common.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = {
		[BPF_TRACE_FEXIT] = "fexit",
		[BPF_MODIFY_RETURN] = "mod_ret",
		[BPF_LSM_MAC] = "lsm_mac",
		[BPF_SK_LOOKUP] = "sk_lookup",
		};

		void p_err(const char *fmt, ...)

tools/bpf/bpftool/prog.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ const char * const prog_type_name[] = {
		[BPF_PROG_TYPE_TRACING] = "tracing",
		[BPF_PROG_TYPE_STRUCT_OPS] = "struct_ops",
		[BPF_PROG_TYPE_EXT] = "ext",
		[BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup",
		};

		const size_t prog_type_name_size = ARRAY_SIZE(prog_type_name);
		@@ -1905,7 +1906,7 @@ static int do_help(int argc, char **argv)
		" cgroup/getsockname4 \| cgroup/getsockname6 \| cgroup/sendmsg4 \|\n"
		" cgroup/sendmsg6 \| cgroup/recvmsg4 \| cgroup/recvmsg6 \|\n"
		" cgroup/getsockopt \| cgroup/setsockopt \|\n"
		" struct_ops \| fentry \| fexit \| freplace }\n"
		" struct_ops \| fentry \| fexit \| freplace \| sk_lookup }\n"
		" ATTACH_TYPE := { msg_verdict \| stream_verdict \| stream_parser \|\n"
		" flow_dissector }\n"
		" METRIC := { cycles \| instructions \| l1d_loads \| llc_misses }\n"