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

Commit 000aa125 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf, bpftool: enable recvmsg attach types 



Trivial patch to bpftool in order to complete enabling attaching programs
to BPF_CGROUP_UDP{4,6}_RECVMSG.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 9bb59ac1

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

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ CGROUP COMMANDS 
|	*PROG* := { **id** *PROG_ID* | **pinned** *FILE* | **tag** *PROG_TAG* }

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

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

|		**sendmsg4** | **sendmsg6** | **sysctl** }

|		**sendmsg4** | **sendmsg6** | **recvmsg4** | **recvmsg6** | **sysctl** }

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



DESCRIPTION
@@ -86,6 +86,10 @@ DESCRIPTION 
		  unconnected udp4 socket (since 4.18);

		  **sendmsg6** call to sendto(2), sendmsg(2), sendmmsg(2) for an

		  unconnected udp6 socket (since 4.18);

		  **recvmsg4** call to recvfrom(2), recvmsg(2), recvmmsg(2) for

                  an unconnected udp4 socket (since 5.2);

		  **recvmsg6** call to recvfrom(2), recvmsg(2), recvmmsg(2) for

                  an unconnected udp6 socket (since 5.2);

		  **sysctl** sysctl access (since 5.2).



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

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ PROG COMMANDS 
|		**lwt_seg6local** | **sockops** | **sk_skb** | **sk_msg** | **lirc_mode2** |

|		**cgroup/bind4** | **cgroup/bind6** | **cgroup/post_bind4** | **cgroup/post_bind6** |

|		**cgroup/connect4** | **cgroup/connect6** | **cgroup/sendmsg4** | **cgroup/sendmsg6** |

|		**cgroup/sysctl**

|		**cgroup/recvmsg4** | **cgroup/recvmsg6** | **cgroup/sysctl**

|	}

|       *ATTACH_TYPE* := {

|		**msg_verdict** | **stream_verdict** | **stream_parser** | **flow_dissector**

tools/bpf/bpftool/bash-completion/bpftool

+3 −2
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ _bpftool() 
                                lirc_mode2 cgroup/bind4 cgroup/bind6 \

                                cgroup/connect4 cgroup/connect6 \

                                cgroup/sendmsg4 cgroup/sendmsg6 \

                                cgroup/recvmsg4 cgroup/recvmsg6 \

                                cgroup/post_bind4 cgroup/post_bind6 \

                                cgroup/sysctl" -- \

                                                   "$cur" ) )
@@ -666,7 +667,7 @@ _bpftool() 
                attach|detach)

                    local ATTACH_TYPES='ingress egress sock_create sock_ops \

                        device bind4 bind6 post_bind4 post_bind6 connect4 \

                        connect6 sendmsg4 sendmsg6 sysctl'

                        connect6 sendmsg4 sendmsg6 recvmsg4 recvmsg6 sysctl'

                    local ATTACH_FLAGS='multi override'

                    local PROG_TYPE='id pinned tag'

                    case $prev in
@@ -676,7 +677,7 @@ _bpftool() 
                            ;;

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

                        post_bind4|post_bind6|connect4|connect6|sendmsg4|\

                        sendmsg6|sysctl)

                        sendmsg6|recvmsg4|recvmsg6|sysctl)

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

                                "$cur" ) )

                            return 0

tools/bpf/bpftool/cgroup.c

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
	"       ATTACH_TYPE := { ingress | egress | sock_create |\n"	       \

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

	"                        post_bind4 | post_bind6 | connect4 |\n"       \

	"                        connect6 | sendmsg4 | sendmsg6 | sysctl }"

	"                        connect6 | sendmsg4 | sendmsg6 |\n"           \

	"                        recvmsg4 | recvmsg6 | sysctl }"



static const char * const attach_type_strings[] = {

	[BPF_CGROUP_INET_INGRESS] = "ingress",
@@ -42,6 +43,8 @@ static const char * const attach_type_strings[] = { 
	[BPF_CGROUP_UDP4_SENDMSG] = "sendmsg4",

	[BPF_CGROUP_UDP6_SENDMSG] = "sendmsg6",

	[BPF_CGROUP_SYSCTL] = "sysctl",

	[BPF_CGROUP_UDP4_RECVMSG] = "recvmsg4",

	[BPF_CGROUP_UDP6_RECVMSG] = "recvmsg6",

	[__MAX_BPF_ATTACH_TYPE] = NULL,

};

tools/bpf/bpftool/prog.c

+2 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,8 @@ static int do_help(int argc, char **argv) 
		"                 sk_reuseport | flow_dissector | cgroup/sysctl |\n"

		"                 cgroup/bind4 | cgroup/bind6 | cgroup/post_bind4 |\n"

		"                 cgroup/post_bind6 | cgroup/connect4 | cgroup/connect6 |\n"

		"                 cgroup/sendmsg4 | cgroup/sendmsg6 }\n"

		"                 cgroup/sendmsg4 | cgroup/sendmsg6 | cgroup/recvmsg4 |\n"

		"                 cgroup/recvmsg6 }\n"

		"       ATTACH_TYPE := { msg_verdict | stream_verdict | stream_parser |\n"

		"                        flow_dissector }\n"

		"       " HELP_SPEC_OPTIONS "\n"