Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH bpf v4 0/2] Fix wrong cgroup attach flags being assigned
 to effective progs
To:     bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Quentin Monnet <quentin@isovalent.com>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Pu Lehui <pulehui@huawei.com>
References: <20220920154233.1494352-1-pulehui@huaweicloud.com>
From:   Pu Lehui <pulehui@huaweicloud.com>
Message-ID: <35405b07-76db-1d34-fdf2-9066ad21d142@huaweicloud.com>
Date:   Wed, 21 Sep 2022 10:41:10 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <20220920154233.1494352-1-pulehui@huaweicloud.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 2022/9/20 23:42, Pu Lehui wrote:
> From: Pu Lehui <pulehui@huawei.com>
> 
> When root-cgroup attach multi progs and sub-cgroup attach a
> override prog, bpftool will display incorrectly for the attach
> flags of the sub-cgroup’s effective progs:
> 
> $ bpftool cgroup tree /sys/fs/cgroup effective
> CgroupPath
> ID       AttachType      AttachFlags     Name
> /sys/fs/cgroup
> 6        cgroup_sysctl   multi           sysctl_tcp_mem
> 13       cgroup_sysctl   multi           sysctl_tcp_mem
> /sys/fs/cgroup/cg1
> 20       cgroup_sysctl   override        sysctl_tcp_mem
> 6        cgroup_sysctl   override        sysctl_tcp_mem <- wrong
> 13       cgroup_sysctl   override        sysctl_tcp_mem <- wrong
> /sys/fs/cgroup/cg1/cg2
> 20       cgroup_sysctl                   sysctl_tcp_mem
> 6        cgroup_sysctl                   sysctl_tcp_mem
> 13       cgroup_sysctl                   sysctl_tcp_mem
> 
> For cg1, obviously, the attach flags of prog6 and prog13 can not be
> OVERRIDE. And for query with EFFECTIVE flags, exporting attach flags
> does not make sense. So let's remove the AttachFlags field and the
> associated logic. After these patches, the above effective cgroup
> tree will show as bellow:
> 
> # bpftool cgroup tree /sys/fs/cgroup effective
> CgroupPath
> ID       AttachType      Name
> /sys/fs/cgroup
> 6        cgroup_sysctl   sysctl_tcp_mem
> 13       cgroup_sysctl   sysctl_tcp_mem
> /sys/fs/cgroup/cg1
> 20       cgroup_sysctl   sysctl_tcp_mem
> 6        cgroup_sysctl   sysctl_tcp_mem
> 13       cgroup_sysctl   sysctl_tcp_mem
> /sys/fs/cgroup/cg1/cg2
> 20       cgroup_sysctl   sysctl_tcp_mem
> 6        cgroup_sysctl   sysctl_tcp_mem
> 13       cgroup_sysctl   sysctl_tcp_mem
> 
> v4:
> - Reject prog_attach_flags array when effective query. (Martin)
> - Target to bpf tree. (Martin)
> 
> v3:
> https://lore.kernel.org/bpf/20220914161742.3180731-1-pulehui@huaweicloud.com
> - Don't show attach flags when effective query. (John, sdf, Martin)
> 
> v2:
> https://lore.kernel.org/bpf/20220908145304.3436139-1-pulehui@huaweicloud.com
> - Limit prog_cnt to avoid overflow. (John)
> - Add more detail message.
> 
> v1:
> https://lore.kernel.org/bpf/20220820120234.2121044-1-pulehui@huawei.com
> 
> Pu Lehui (2):
>    bpf, cgroup: Reject prog_attach_flags array when effective query
>    bpftool: Fix wrong cgroup attach flags being assigned to effective
>      progs
> 
>   include/uapi/linux/bpf.h       |  7 +++--
>   kernel/bpf/cgroup.c            | 28 +++++++++++-------
>   tools/bpf/bpftool/cgroup.c     | 54 ++++++++++++++++++++++++++++++----
>   tools/include/uapi/linux/bpf.h |  7 +++--
>   4 files changed, 77 insertions(+), 19 deletions(-)
> 

selftest no pass, sorry, will fix.
https://github.com/kernel-patches/bpf/actions/runs/3088351905/jobs/4995009382