2022-08-25 21:58:40

by Andrii Nakryiko

[permalink] [raw]
Subject: Re: [PATCH bpf-next 0/2] Add CGROUP prefix to cgroup_iter_order

On Thu, Aug 25, 2022 at 2:39 PM Hao Luo <[email protected]> wrote:
>
> As suggested by Andrii, add 'CGROUP' to cgroup_iter_order. This fix is
> divided into two patches. Patch 1/2 fixes the commit that introduced
> cgroup_iter. Patch 2/2 fixes the selftest that uses the
> cgroup_iter_order. This is because the selftest was introduced in a

but if you split rename into two patches, you break selftests build
and thus potentially bisectability of selftests regressions. So I
think you have to keep both in the same patch.

With that:

Acked-by: Andrii Nakryiko <[email protected]>

> different commit. I tested this patchset via the following command:
>
> test_progs -t cgroup,iter,btf_dump
>
> Hao Luo (2):
> bpf: Add CGROUP to cgroup_iter order
> selftests/bpf: Fix test that uses cgroup_iter order
>
> include/uapi/linux/bpf.h | 10 +++---
> kernel/bpf/cgroup_iter.c | 32 +++++++++----------
> tools/include/uapi/linux/bpf.h | 10 +++---
> .../selftests/bpf/prog_tests/btf_dump.c | 2 +-
> .../prog_tests/cgroup_hierarchical_stats.c | 2 +-
> .../selftests/bpf/prog_tests/cgroup_iter.c | 10 +++---
> 6 files changed, 33 insertions(+), 33 deletions(-)
>
> --
> 2.37.2.672.g94769d06f0-goog
>


2022-08-25 22:44:05

by Hao Luo

[permalink] [raw]
Subject: Re: [PATCH bpf-next 0/2] Add CGROUP prefix to cgroup_iter_order

On Thu, Aug 25, 2022 at 2:56 PM Andrii Nakryiko
<[email protected]> wrote:
>
> On Thu, Aug 25, 2022 at 2:39 PM Hao Luo <[email protected]> wrote:
> >
> > As suggested by Andrii, add 'CGROUP' to cgroup_iter_order. This fix is
> > divided into two patches. Patch 1/2 fixes the commit that introduced
> > cgroup_iter. Patch 2/2 fixes the selftest that uses the
> > cgroup_iter_order. This is because the selftest was introduced in a
>
> but if you split rename into two patches, you break selftests build
> and thus potentially bisectability of selftests regressions. So I
> think you have to keep both in the same patch.
>
> With that:
>
> Acked-by: Andrii Nakryiko <[email protected]>
>

Yeah. I wasn't sure what to do. Then we need bundle this fix with
those two commits together. Will squash the commits into one and send
a v2.

> > different commit. I tested this patchset via the following command:
> >
> > test_progs -t cgroup,iter,btf_dump
> >
> > Hao Luo (2):
> > bpf: Add CGROUP to cgroup_iter order
> > selftests/bpf: Fix test that uses cgroup_iter order
> >
> > include/uapi/linux/bpf.h | 10 +++---
> > kernel/bpf/cgroup_iter.c | 32 +++++++++----------
> > tools/include/uapi/linux/bpf.h | 10 +++---
> > .../selftests/bpf/prog_tests/btf_dump.c | 2 +-
> > .../prog_tests/cgroup_hierarchical_stats.c | 2 +-
> > .../selftests/bpf/prog_tests/cgroup_iter.c | 10 +++---
> > 6 files changed, 33 insertions(+), 33 deletions(-)
> >
> > --
> > 2.37.2.672.g94769d06f0-goog
> >

2022-08-25 23:46:02

by Yosry Ahmed

[permalink] [raw]
Subject: Re: [PATCH bpf-next 0/2] Add CGROUP prefix to cgroup_iter_order

On Thu, Aug 25, 2022 at 2:56 PM Andrii Nakryiko
<[email protected]> wrote:
>
> On Thu, Aug 25, 2022 at 2:39 PM Hao Luo <[email protected]> wrote:
> >
> > As suggested by Andrii, add 'CGROUP' to cgroup_iter_order. This fix is
> > divided into two patches. Patch 1/2 fixes the commit that introduced
> > cgroup_iter. Patch 2/2 fixes the selftest that uses the
> > cgroup_iter_order. This is because the selftest was introduced in a
>
> but if you split rename into two patches, you break selftests build
> and thus potentially bisectability of selftests regressions. So I
> think you have to keep both in the same patch.

I thought fixes to commits still in bpf-next would get squashed. Would
you mind elaborating why we don't do this?

>
> With that:
>
> Acked-by: Andrii Nakryiko <[email protected]>
>
> > different commit. I tested this patchset via the following command:
> >
> > test_progs -t cgroup,iter,btf_dump
> >
> > Hao Luo (2):
> > bpf: Add CGROUP to cgroup_iter order
> > selftests/bpf: Fix test that uses cgroup_iter order
> >
> > include/uapi/linux/bpf.h | 10 +++---
> > kernel/bpf/cgroup_iter.c | 32 +++++++++----------
> > tools/include/uapi/linux/bpf.h | 10 +++---
> > .../selftests/bpf/prog_tests/btf_dump.c | 2 +-
> > .../prog_tests/cgroup_hierarchical_stats.c | 2 +-
> > .../selftests/bpf/prog_tests/cgroup_iter.c | 10 +++---
> > 6 files changed, 33 insertions(+), 33 deletions(-)
> >
> > --
> > 2.37.2.672.g94769d06f0-goog
> >

2022-08-26 02:42:37

by Andrii Nakryiko

[permalink] [raw]
Subject: Re: [PATCH bpf-next 0/2] Add CGROUP prefix to cgroup_iter_order

On Thu, Aug 25, 2022 at 4:20 PM Yosry Ahmed <[email protected]> wrote:
>
> On Thu, Aug 25, 2022 at 2:56 PM Andrii Nakryiko
> <[email protected]> wrote:
> >
> > On Thu, Aug 25, 2022 at 2:39 PM Hao Luo <[email protected]> wrote:
> > >
> > > As suggested by Andrii, add 'CGROUP' to cgroup_iter_order. This fix is
> > > divided into two patches. Patch 1/2 fixes the commit that introduced
> > > cgroup_iter. Patch 2/2 fixes the selftest that uses the
> > > cgroup_iter_order. This is because the selftest was introduced in a
> >
> > but if you split rename into two patches, you break selftests build
> > and thus potentially bisectability of selftests regressions. So I
> > think you have to keep both in the same patch.
>
> I thought fixes to commits still in bpf-next would get squashed. Would
> you mind elaborating why we don't do this?
>

We don't amend follow up fixes into original commits and preserve history.

> >
> > With that:
> >
> > Acked-by: Andrii Nakryiko <[email protected]>
> >
> > > different commit. I tested this patchset via the following command:
> > >
> > > test_progs -t cgroup,iter,btf_dump
> > >
> > > Hao Luo (2):
> > > bpf: Add CGROUP to cgroup_iter order
> > > selftests/bpf: Fix test that uses cgroup_iter order
> > >
> > > include/uapi/linux/bpf.h | 10 +++---
> > > kernel/bpf/cgroup_iter.c | 32 +++++++++----------
> > > tools/include/uapi/linux/bpf.h | 10 +++---
> > > .../selftests/bpf/prog_tests/btf_dump.c | 2 +-
> > > .../prog_tests/cgroup_hierarchical_stats.c | 2 +-
> > > .../selftests/bpf/prog_tests/cgroup_iter.c | 10 +++---
> > > 6 files changed, 33 insertions(+), 33 deletions(-)
> > >
> > > --
> > > 2.37.2.672.g94769d06f0-goog
> > >