From: Matthieu Baerts <matttbe@kernel.org>
To: Geliang Tang <geliang@kernel.org>
Cc: MPTCP Upstream <mptcp@lists.linux.dev>
Subject: Re: pull-request: bpf-next 2024-05-13
Date: Wed, 15 May 2024 11:44:28 +0200 [thread overview]
Message-ID: <ccac119e-0bb5-45c6-aa22-d373f95be8be@kernel.org> (raw)
In-Reply-To: <f8a1596d-77d1-409e-9dfb-c43462e3f968@kernel.org>
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.
prev parent reply other threads:[~2024-05-15 9:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240513134114.17575-1-daniel@iogearbox.net>
2024-05-14 20:47 ` pull-request: bpf-next 2024-05-13 Matthieu Baerts
2024-05-14 21:11 ` Matthieu Baerts
2024-05-15 9:44 ` Matthieu Baerts [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ccac119e-0bb5-45c6-aa22-d373f95be8be@kernel.org \
--to=matttbe@kernel.org \
--cc=geliang@kernel.org \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).