Re: [PATCH mptcp-next v2 00/14] update bpf patches on export branch

[Geliang Tang <geliang.tang@suse.com>]

On Sat, May 14, 2022 at 01:25:35PM +0200, Matthieu Baerts wrote:
> Hi Geliang, Mat
> 
> On 11/05/2022 09:56, Geliang Tang wrote:
> > v2:
> >  - drop "bpf: expose is_mptcp flag to bpf_tcp_sock" (Martin & Andrii)
> >  - patch 3, use is_mptcp in tcp_sock, instead of bpf_tcp_sock (Martin & Andrii)
> > 
> > base-commit: bcf89bc9c28e ("DO-NOT-MERGE: git markup: features
> > net-next-next") on export/20220510T054929
> > 
> > v1:
> >  - drop bpf_mptcp_helpers.h (Andrii)
> >  - patch 6, skip the test if 'ip mptcp monitor' is not supported (Mat)
> 
> Thank you for the patches.
> 
> I *think* everything is now sync in our tree but feel free to check
> because I had to "manually" compare patches with what was in our tree.
> 
> But in theory, our tree is now ready for a v5.

Thanks Matt, but three patches still need to be updated:

Patch #4, selftests/bpf: test bpf_skc_to_mptcp_sock

if (!tcp_sk->is_mptcp) {

->

if (!is_mptcp) {

Patch #10, mptcp: add sched in mptcp_sock

 struct mptcp_sock {
 	struct inet_connection_sock	sk;
 
-	__u32		token;
-	struct sock	*first;
-	char		ca_name[TCP_CA_NAME_MAX];
+	__u32			token;
+	struct sock		*first;
+	struct mptcp_sched_ops	*sched;
+	char			ca_name[TCP_CA_NAME_MAX];
 } __attribute__((preserve_access_index));
 
->

 	__u32		token;
 	struct sock	*first;
+	struct mptcp_sched_ops *sched;
 	char		ca_name[TCP_CA_NAME_MAX];
 } __attribute__((preserve_access_index));
 

Patch #13, selftests/bpf: add bpf_first scheduler

bpf_mptcp_helpers.h

->

bpf_tcp_helpers.h

Thanks,
-Geliang

> 
> - 82041505ae27: tg:msg: changelog v4
> - a59272c197c5: selftests/bpf: add MPTCP test base
> - e30677603c0a: Squash to "selftests/bpf: add MPTCP test base"
> - 79399587d58f: tg:msg: changelog v4
> - b0d947191559: selftests/bpf: verify token of struct mptcp_sock
> - d84ab981b155: conflict in
> t/selftests-bpf-verify-first-of-struct-mptcp_sock
> - 0c8b3a796796: conflict in t/selftests-bpf-test-bpf_skc_to_mptcp_sock
> - Results: 7809acd805cf..a4159e050cd2 (export)
> 
> Builds and tests are now in progress:
> 
> https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220514T112122
> https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
> 
> Cheers,
> Matt
> -- 
> Tessares | Belgium | Hybrid Access Solutions
> www.tessares.net
>