Re: pull-request: bpf-next 2024-05-13

Re: pull-request: bpf-next 2024-05-13

[Matthieu Baerts]

Hi Geliang,

On 13/05/2024 15:41, Daniel Borkmann wrote:
> Hi David, hi Jakub, hi Paolo, hi Eric,
> 
> The following pull-request contains BPF updates for your *net-next* tree.
> 
> We've added 119 non-merge commits during the last 14 day(s) which contain
> a total of 134 files changed, 9462 insertions(+), 4742 deletions(-).
> 
> The main changes are:

(...)

> 8) Another batch of improvements to BPF selftests to retire obsolete bpf_tcp_helpers.h as
>    everything is available vmlinux.h, from Martin KaFai Lau.

These modifications are causing issues on our side: bpf_tcp_helpers.h
was modified, mainly to access to more items from structures. The prefer
way is to rely on vmlinux.h, see [1]:

For the sync, I then resolved conflicts:

- 5a4748274773: conflict in t/selftests-bpf-Add-mptcp-sched-structs
- 16e27bc205f2: conflict in t/selftests-bpf-Add-bpf_rr-scheduler
- 6e4457a51a02: conflict in t/selftests-bpf-Add-bpf_burst-scheduler

But then we need to adapt the code, not to rely on bpf_tcp_helpers.h. I
started that, see [2]. The code compiles, but the tests fail to run. It
is too late for me to investigate. If by chance you have an idea what's
wrong, don't hesitate to share that with me. If not, I will try to
continue looking at that tomorrow.

[1]
https://lore.kernel.org/all/20240509175026.3423614-1-martin.lau@linux.dev/T/
[2]
https://github.com/matttbe/mptcp_net-next/commit/6625e70093708eb4d8729927f802fd99d0e8d41c

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: pull-request: bpf-next 2024-05-13

[Matthieu Baerts]

Hi Geliang,

On 14/05/2024 22:47, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 13/05/2024 15:41, Daniel Borkmann wrote:
>> Hi David, hi Jakub, hi Paolo, hi Eric,
>>
>> The following pull-request contains BPF updates for your *net-next* tree.
>>
>> We've added 119 non-merge commits during the last 14 day(s) which contain
>> a total of 134 files changed, 9462 insertions(+), 4742 deletions(-).
>>
>> The main changes are:
> 
> (...)
> 
>> 8) Another batch of improvements to BPF selftests to retire obsolete bpf_tcp_helpers.h as
>>    everything is available vmlinux.h, from Martin KaFai Lau.
> 
> These modifications are causing issues on our side: bpf_tcp_helpers.h
> was modified, mainly to access to more items from structures. The prefer
> way is to rely on vmlinux.h, see [1]:
> 
> For the sync, I then resolved conflicts:
> 
> - 5a4748274773: conflict in t/selftests-bpf-Add-mptcp-sched-structs
> - 16e27bc205f2: conflict in t/selftests-bpf-Add-bpf_rr-scheduler
> - 6e4457a51a02: conflict in t/selftests-bpf-Add-bpf_burst-scheduler
> 
> But then we need to adapt the code, not to rely on bpf_tcp_helpers.h. I
> started that, see [2]. The code compiles, but the tests fail to run. It
> is too late for me to investigate. If by chance you have an idea what's
> wrong, don't hesitate to share that with me. If not, I will try to
> continue looking at that tomorrow.

When doing something else, I think I found what I did wrong. Please tell
me if you see any issues with the new version:

  https://github.com/matttbe/mptcp_net-next/commit/b2fa488b5155

Except that now, I think we hit issue #487 quicker:

  https://github.com/multipath-tcp/mptcp_net-next/issues/487

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: pull-request: bpf-next 2024-05-13

[Matthieu Baerts]

Hi Geliang,

On 14/05/2024 23:11, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 14/05/2024 22:47, Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> On 13/05/2024 15:41, Daniel Borkmann wrote:
>>> Hi David, hi Jakub, hi Paolo, hi Eric,
>>>
>>> The following pull-request contains BPF updates for your *net-next* tree.
>>>
>>> We've added 119 non-merge commits during the last 14 day(s) which contain
>>> a total of 134 files changed, 9462 insertions(+), 4742 deletions(-).
>>>
>>> The main changes are:
>>
>> (...)
>>
>>> 8) Another batch of improvements to BPF selftests to retire obsolete bpf_tcp_helpers.h as
>>>    everything is available vmlinux.h, from Martin KaFai Lau.
>>
>> These modifications are causing issues on our side: bpf_tcp_helpers.h
>> was modified, mainly to access to more items from structures. The prefer
>> way is to rely on vmlinux.h, see [1]:
>>
>> For the sync, I then resolved conflicts:
>>
>> - 5a4748274773: conflict in t/selftests-bpf-Add-mptcp-sched-structs
>> - 16e27bc205f2: conflict in t/selftests-bpf-Add-bpf_rr-scheduler
>> - 6e4457a51a02: conflict in t/selftests-bpf-Add-bpf_burst-scheduler
>>
>> But then we need to adapt the code, not to rely on bpf_tcp_helpers.h. I
>> started that, see [2]. The code compiles, but the tests fail to run. It
>> is too late for me to investigate. If by chance you have an idea what's
>> wrong, don't hesitate to share that with me. If not, I will try to
>> continue looking at that tomorrow.
> 
> When doing something else, I think I found what I did wrong. Please tell
> me if you see any issues with the new version:
> 
>   https://github.com/matttbe/mptcp_net-next/commit/b2fa488b5155
> 
> Except that now, I think we hit issue #487 quicker:
> 
>   https://github.com/multipath-tcp/mptcp_net-next/issues/487
> 
> Cheers,
> Matt

FYI, I applied the modifications I mentioned yesterday:

New patches for t/upstream:
- 6230ad832665: Squash to "selftests/bpf: Add bpf_burst scheduler & test"
- ba3ecdaf92cb: Squash to "selftests/bpf: Add bpf_red scheduler & test"
- 35a380d607e2: Squash to "selftests/bpf: Add bpf_rr scheduler & test"
- 9d02753016db: Squash to "selftests/bpf: Add bpf_bkup scheduler & test"
- 2a5d1cc0f94d: Squash to "selftests/bpf: Add bpf_first scheduler & test"
- 6d95ed488ed7: Squash to "selftests/bpf: Add mptcp subflow example"
- 66bf28c373b7: Squash to "selftests/bpf: Add bpf_bkup scheduler & test"
- 86633312c116: Squash to "selftests/bpf: Add bpf_rr scheduler & test"
- Results: 4acefa5512f7..9f74a6a496f0 (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/97f78c2162df282f42f76396dca8cd956394eeec/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/37fd4264f8873115d66b6c5d7e8b864e817c1938/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.