Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0934dfa6 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-libbpf-add-types' 



Andrey Ignatov says:

====================
v1->v2:
- add new types to bpftool-cgroup man page;
- add new types to bash completion for bpftool;
- don't add types that should not be in bpftool cgroup.

Add support for various BPF prog types and attach types that have been
added to kernel recently but not to bpftool or libbpf yet.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents a2d481b3 e14c93fd

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

+9 −2
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ MAP COMMANDS 
|	**bpftool** **cgroup help**

|

|	*PROG* := { **id** *PROG_ID* | **pinned** *FILE* | **tag** *PROG_TAG* }

|	*ATTACH_TYPE* := { **ingress** | **egress** | **sock_create** | **sock_ops** | **device** }

|	*ATTACH_TYPE* := { **ingress** | **egress** | **sock_create** | **sock_ops** | **device** |

|		**bind4** | **bind6** | **post_bind4** | **post_bind6** | **connect4** | **connect6** }

|	*ATTACH_FLAGS* := { **multi** | **override** }



DESCRIPTION
@@ -63,7 +64,13 @@ DESCRIPTION 
		  **egress** egress path of the inet socket (since 4.10);

		  **sock_create** opening of an inet socket (since 4.10);

		  **sock_ops** various socket operations (since 4.12);

		  **device** device access (since 4.15).

		  **device** device access (since 4.15);

		  **bind4** call to bind(2) for an inet4 socket (since 4.17);

		  **bind6** call to bind(2) for an inet6 socket (since 4.17);

		  **post_bind4** return from bind(2) for an inet4 socket (since 4.17);

		  **post_bind6** return from bind(2) for an inet6 socket (since 4.17);

		  **connect4** call to connect(2) for an inet4 socket (since 4.17);

		  **connect6** call to connect(2) for an inet6 socket (since 4.17).



	**bpftool cgroup detach** *CGROUP* *ATTACH_TYPE* *PROG*

		  Detach *PROG* from the cgroup *CGROUP* and attach type

tools/bpf/bpftool/bash-completion/bpftool

+4 −2
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ _bpftool() 
                    ;;

                attach|detach)

                    local ATTACH_TYPES='ingress egress sock_create sock_ops \

                        device'

                        device bind4 bind6 post_bind4 post_bind6 connect4 \

                        connect6'

                    local ATTACH_FLAGS='multi override'

                    local PROG_TYPE='id pinned tag'

                    case $prev in
@@ -380,7 +381,8 @@ _bpftool() 
                            _filedir

                            return 0

                            ;;

                        ingress|egress|sock_create|sock_ops|device)

                        ingress|egress|sock_create|sock_ops|device|bind4|bind6|\

                        post_bind4|post_bind6|connect4|connect6)

                            COMPREPLY=( $( compgen -W "$PROG_TYPE" -- \

                                "$cur" ) )

                            return 0

tools/bpf/bpftool/cgroup.c

+12 −3
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
	"ATTACH_FLAGS := { multi | override }"



#define HELP_SPEC_ATTACH_TYPES						       \

	"ATTACH_TYPE := { ingress | egress | sock_create | sock_ops | device }"

	"       ATTACH_TYPE := { ingress | egress | sock_create |\n"	       \

	"                        sock_ops | device | bind4 | bind6 |\n"	       \

	"                        post_bind4 | post_bind6 | connect4 |\n"       \

	"                        connect6 }"



static const char * const attach_type_strings[] = {

	[BPF_CGROUP_INET_INGRESS] = "ingress",
@@ -25,6 +28,12 @@ static const char * const attach_type_strings[] = { 
	[BPF_CGROUP_INET_SOCK_CREATE] = "sock_create",

	[BPF_CGROUP_SOCK_OPS] = "sock_ops",

	[BPF_CGROUP_DEVICE] = "device",

	[BPF_CGROUP_INET4_BIND] = "bind4",

	[BPF_CGROUP_INET6_BIND] = "bind6",

	[BPF_CGROUP_INET4_CONNECT] = "connect4",

	[BPF_CGROUP_INET6_CONNECT] = "connect6",

	[BPF_CGROUP_INET4_POST_BIND] = "post_bind4",

	[BPF_CGROUP_INET6_POST_BIND] = "post_bind6",

	[__MAX_BPF_ATTACH_TYPE] = NULL,

};
@@ -282,7 +291,7 @@ static int do_help(int argc, char **argv) 
		"       %s %s detach CGROUP ATTACH_TYPE PROG\n"

		"       %s %s help\n"

		"\n"

		"       " HELP_SPEC_ATTACH_TYPES "\n"

		HELP_SPEC_ATTACH_TYPES "\n"

		"       " HELP_SPEC_ATTACH_FLAGS "\n"

		"       " HELP_SPEC_PROGRAM "\n"

		"       " HELP_SPEC_OPTIONS "\n"

tools/bpf/bpftool/prog.c

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static const char * const prog_type_name[] = { 
	[BPF_PROG_TYPE_SOCK_OPS]	= "sock_ops",

	[BPF_PROG_TYPE_SK_SKB]		= "sk_skb",

	[BPF_PROG_TYPE_CGROUP_DEVICE]	= "cgroup_device",

	[BPF_PROG_TYPE_SK_MSG]		= "sk_msg",

	[BPF_PROG_TYPE_RAW_TRACEPOINT]	= "raw_tracepoint",

	[BPF_PROG_TYPE_CGROUP_SOCK_ADDR] = "cgroup_sock_addr",

};



static void print_boot_time(__u64 nsecs, char *buf, unsigned int size)

tools/lib/bpf/libbpf.c

+8 −0
Original line number Diff line number Diff line
@@ -1845,6 +1845,7 @@ BPF_PROG_TYPE_FNS(kprobe, BPF_PROG_TYPE_KPROBE); 
BPF_PROG_TYPE_FNS(sched_cls, BPF_PROG_TYPE_SCHED_CLS);

BPF_PROG_TYPE_FNS(sched_act, BPF_PROG_TYPE_SCHED_ACT);

BPF_PROG_TYPE_FNS(tracepoint, BPF_PROG_TYPE_TRACEPOINT);

BPF_PROG_TYPE_FNS(raw_tracepoint, BPF_PROG_TYPE_RAW_TRACEPOINT);

BPF_PROG_TYPE_FNS(xdp, BPF_PROG_TYPE_XDP);

BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT);
@@ -1859,6 +1860,9 @@ static void bpf_program__set_expected_attach_type(struct bpf_program *prog, 


#define BPF_PROG_SEC(string, ptype) BPF_PROG_SEC_FULL(string, ptype, 0)



#define BPF_S_PROG_SEC(string, ptype) \

	BPF_PROG_SEC_FULL(string, BPF_PROG_TYPE_CGROUP_SOCK, ptype)



#define BPF_SA_PROG_SEC(string, ptype) \

	BPF_PROG_SEC_FULL(string, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, ptype)
@@ -1874,6 +1878,7 @@ static const struct { 
	BPF_PROG_SEC("classifier",	BPF_PROG_TYPE_SCHED_CLS),

	BPF_PROG_SEC("action",		BPF_PROG_TYPE_SCHED_ACT),

	BPF_PROG_SEC("tracepoint/",	BPF_PROG_TYPE_TRACEPOINT),

	BPF_PROG_SEC("raw_tracepoint/",	BPF_PROG_TYPE_RAW_TRACEPOINT),

	BPF_PROG_SEC("xdp",		BPF_PROG_TYPE_XDP),

	BPF_PROG_SEC("perf_event",	BPF_PROG_TYPE_PERF_EVENT),

	BPF_PROG_SEC("cgroup/skb",	BPF_PROG_TYPE_CGROUP_SKB),
@@ -1889,10 +1894,13 @@ static const struct { 
	BPF_SA_PROG_SEC("cgroup/bind6",	BPF_CGROUP_INET6_BIND),

	BPF_SA_PROG_SEC("cgroup/connect4", BPF_CGROUP_INET4_CONNECT),

	BPF_SA_PROG_SEC("cgroup/connect6", BPF_CGROUP_INET6_CONNECT),

	BPF_S_PROG_SEC("cgroup/post_bind4", BPF_CGROUP_INET4_POST_BIND),

	BPF_S_PROG_SEC("cgroup/post_bind6", BPF_CGROUP_INET6_POST_BIND),

};



#undef BPF_PROG_SEC

#undef BPF_PROG_SEC_FULL

#undef BPF_S_PROG_SEC

#undef BPF_SA_PROG_SEC



static int bpf_program__identify_section(struct bpf_program *prog)