Commit 05ee19c1 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf, bpftool: Enable get{peer, sock}name attach types 



Make bpftool aware and add the new get{peer,sock}name attach types to its
cli, documentation and bash completion to allow attachment/detachment of
sock_addr programs there.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Link: https://lore.kernel.org/bpf/9765b3d03e4c29210c4df56a9cc7e52f5f7bb5ef.1589841594.git.daniel@iogearbox.net
parent f15ed018

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

+7 −3
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 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** | **recvmsg4** | **recvmsg6** | **sysctl** |

|		**getsockopt** | **setsockopt** }

|               **getpeername4** | **getpeername6** | **getsockname4** | **getsockname6** | **sendmsg4** |

|               **sendmsg6** | **recvmsg4** | **recvmsg6** | **sysctl** | **getsockopt** | **setsockopt** }

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



DESCRIPTION
@@ -101,7 +101,11 @@ DESCRIPTION 
                  an unconnected udp6 socket (since 5.2);

		  **sysctl** sysctl access (since 5.2);

		  **getsockopt** call to getsockopt (since 5.3);

		  **setsockopt** call to setsockopt (since 5.3).

		  **setsockopt** call to setsockopt (since 5.3);

		  **getpeername4** call to getpeername(2) for an inet4 socket (since 5.8);

		  **getpeername6** call to getpeername(2) for an inet6 socket (since 5.8);

		  **getsockname4** call to getsockname(2) for an inet4 socket (since 5.8);

		  **getsockname6** call to getsockname(2) for an inet6 socket (since 5.8).



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

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

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

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ PROG COMMANDS 
|		**cgroup/sock** | **cgroup/dev** | **lwt_in** | **lwt_out** | **lwt_xmit** |

|		**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/connect4** | **cgroup/connect6** | **cgroup/getpeername4** | **cgroup/getpeername6** |

|               **cgroup/getsockname4** | **cgroup/getsockname6** | **cgroup/sendmsg4** | **cgroup/sendmsg6** |

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

|		**cgroup/getsockopt** | **cgroup/setsockopt** |

|		**struct_ops** | **fentry** | **fexit** | **freplace**

tools/bpf/bpftool/bash-completion/bpftool

+9 −6
Original line number Diff line number Diff line
@@ -472,6 +472,8 @@ _bpftool() 
                                lwt_seg6local sockops sk_skb sk_msg \

                                lirc_mode2 cgroup/bind4 cgroup/bind6 \

                                cgroup/connect4 cgroup/connect6 \

                                cgroup/getpeername4 cgroup/getpeername6 \

                                cgroup/getsockname4 cgroup/getsockname6 \

                                cgroup/sendmsg4 cgroup/sendmsg6 \

                                cgroup/recvmsg4 cgroup/recvmsg6 \

                                cgroup/post_bind4 cgroup/post_bind6 \
@@ -966,9 +968,10 @@ _bpftool() 
                    ;;

                attach|detach)

                    local ATTACH_TYPES='ingress egress sock_create sock_ops \

                        device bind4 bind6 post_bind4 post_bind6 connect4 \

                        connect6 sendmsg4 sendmsg6 recvmsg4 recvmsg6 sysctl \

                        getsockopt setsockopt'

                        device bind4 bind6 post_bind4 post_bind6 connect4 connect6 \

                        getpeername4 getpeername6 getsockname4 getsockname6 \

                        sendmsg4 sendmsg6 recvmsg4 recvmsg6 sysctl getsockopt \

                        setsockopt'

                    local ATTACH_FLAGS='multi override'

                    local PROG_TYPE='id pinned tag name'

                    case $prev in
@@ -977,9 +980,9 @@ _bpftool() 
                            return 0

                            ;;

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

                        post_bind4|post_bind6|connect4|connect6|sendmsg4|\

                        sendmsg6|recvmsg4|recvmsg6|sysctl|getsockopt|\

                        setsockopt)

                        post_bind4|post_bind6|connect4|connect6|getpeername4|\

                        getpeername6|getsockname4|getsockname6|sendmsg4|sendmsg6|\

                        recvmsg4|recvmsg6|sysctl|getsockopt|setsockopt)

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

                                "$cur" ) )

                            return 0

tools/bpf/bpftool/cgroup.c

+4 −3
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
	"       ATTACH_TYPE := { ingress | egress | sock_create |\n"	       \

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

	"                        post_bind4 | post_bind6 | connect4 |\n"       \

	"                        connect6 | sendmsg4 | sendmsg6 |\n"           \

	"                        recvmsg4 | recvmsg6 | sysctl |\n"	       \

	"                        getsockopt | setsockopt }"

	"                        connect6 | getpeername4 | getpeername6 |\n"   \

	"                        getsockname4 | getsockname6 | sendmsg4 |\n"   \

	"                        sendmsg6 | recvmsg4 | recvmsg6 |\n"           \

	"                        sysctl | getsockopt | setsockopt }"



static unsigned int query_flags;

tools/bpf/bpftool/main.h

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ static const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] = { 
	[BPF_CGROUP_INET6_CONNECT] = "connect6",

	[BPF_CGROUP_INET4_POST_BIND] = "post_bind4",

	[BPF_CGROUP_INET6_POST_BIND] = "post_bind6",

	[BPF_CGROUP_INET4_GETPEERNAME] = "getpeername4",

	[BPF_CGROUP_INET6_GETPEERNAME] = "getpeername6",

	[BPF_CGROUP_INET4_GETSOCKNAME] = "getsockname4",

	[BPF_CGROUP_INET6_GETSOCKNAME] = "getsockname6",

	[BPF_CGROUP_UDP4_SENDMSG] = "sendmsg4",

	[BPF_CGROUP_UDP6_SENDMSG] = "sendmsg6",

	[BPF_CGROUP_SYSCTL] = "sysctl",

CRA Git | Maintained and supported by SUSTech CRA and CCSE