merged.

Bruce

In message: [linux-yocto][v6.6/standard/base][PATCH] bpftool: Fix undefined bpf 
macro for unix socket
on 24/07/2024 He Zhe wrote:

> 42b2eec2e503 ("bpftool: Query only cgroup-related attach types") is for the
> latest mainline, in which the following marcos were introduced since v6.7
> while we're at v6.6. Since 42b2eec2e503 will not be back-ported to uptream
> stable tree, let's remove the marcos.
> 
> | cgroup.c:33:9: error: 'BPF_CGROUP_UNIX_CONNECT' undeclared here
> (not in a function); did you mean 'BPF_CGROUP_INET6_CONNECT'?
> |    33 |         BPF_CGROUP_UNIX_CONNECT,
> |       |         ^~~~~~~~~~~~~~~~~~~~~~~
> |       |         BPF_CGROUP_INET6_CONNECT
> | cgroup.c:36:9: error: 'BPF_CGROUP_UNIX_GETPEERNAME' undeclared here
> (not in a function); did you mean 'BPF_CGROUP_INET6_GETPEERNAME'?
> |    36 |         BPF_CGROUP_UNIX_GETPEERNAME,
> |       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> |       |         BPF_CGROUP_INET6_GETPEERNAME
> | cgroup.c:39:9: error: 'BPF_CGROUP_UNIX_GETSOCKNAME' undeclared here
> (not in a function); did you mean 'BPF_CGROUP_INET6_GETSOCKNAME'?
> |    39 |         BPF_CGROUP_UNIX_GETSOCKNAME,
> |       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> |       |         BPF_CGROUP_INET6_GETSOCKNAME
> | cgroup.c:42:9: error: 'BPF_CGROUP_UNIX_SENDMSG' undeclared here
> (not in a function); did you mean 'BPF_CGROUP_UDP6_SENDMSG'?
> |    42 |         BPF_CGROUP_UNIX_SENDMSG,
> |       |         ^~~~~~~~~~~~~~~~~~~~~~~
> |       |         BPF_CGROUP_UDP6_SENDMSG
> | cgroup.c:45:9: error: 'BPF_CGROUP_UNIX_RECVMSG' undeclared here
> (not in a function); did you mean 'BPF_CGROUP_UDP6_RECVMSG'?
> |    45 |         BPF_CGROUP_UNIX_RECVMSG,
> |       |         ^~~~~~~~~~~~~~~~~~~~~~~
> |       |         BPF_CGROUP_UDP6_RECVMSG
> 
> Fixes: 42b2eec2e503 ("bpftool: Query only cgroup-related attach types")
> Signed-off-by: He Zhe <zhe...@windriver.com>
> ---
>  tools/bpf/bpftool/cgroup.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
> index e19e296841d7..ae1c69d06f3d 100644
> --- a/tools/bpf/bpftool/cgroup.c
> +++ b/tools/bpf/bpftool/cgroup.c
> @@ -30,19 +30,14 @@ static const int cgroup_attach_types[] = {
>       BPF_CGROUP_INET6_POST_BIND,
>       BPF_CGROUP_INET4_CONNECT,
>       BPF_CGROUP_INET6_CONNECT,
> -     BPF_CGROUP_UNIX_CONNECT,
>       BPF_CGROUP_INET4_GETPEERNAME,
>       BPF_CGROUP_INET6_GETPEERNAME,
> -     BPF_CGROUP_UNIX_GETPEERNAME,
>       BPF_CGROUP_INET4_GETSOCKNAME,
>       BPF_CGROUP_INET6_GETSOCKNAME,
> -     BPF_CGROUP_UNIX_GETSOCKNAME,
>       BPF_CGROUP_UDP4_SENDMSG,
>       BPF_CGROUP_UDP6_SENDMSG,
> -     BPF_CGROUP_UNIX_SENDMSG,
>       BPF_CGROUP_UDP4_RECVMSG,
>       BPF_CGROUP_UDP6_RECVMSG,
> -     BPF_CGROUP_UNIX_RECVMSG,
>       BPF_CGROUP_SOCK_OPS,
>       BPF_CGROUP_DEVICE,
>       BPF_CGROUP_SYSCTL,
> -- 
> 2.25.1
> 
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14198): 
https://lists.yoctoproject.org/g/linux-yocto/message/14198
Mute This Topic: https://lists.yoctoproject.org/mt/107518664/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to