[v1] Squash to "mptcp: add sched in mptcp_sock"

[PATCH mptcp-next] Squash to "mptcp: add sched in mptcp_sock"

Geliang Tang posted 1 patch 1 year, 11 months ago

Diff against v1
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/550c72ef0be9d4c25874c997370dbe541d2b28fd.1652667282.git.geliang.tang@suse.com

Maintainers: John Fastabend <john.fastabend@gmail.com>, Daniel Borkmann <daniel@iogearbox.net>, KP Singh <kpsingh@kernel.org>, Martin KaFai Lau <kafai@fb.com>, Alexei Starovoitov <ast@kernel.org>, Shuah Khan <shuah@kernel.org>, Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andrii@kernel.org>

tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "mptcp: add sched in mptcp_sock"

Posted by Geliang Tang 1 year, 11 months ago

Keep the alignment of members of mptcp_sock in bpf_tcp_helpers.h as the
same as the alignment of mptcp_sock in net/mptcp/protocol.h.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 for export/20220514T172044
---
 tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index f7765a5be329..aca4e3c6ac48 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -251,10 +251,10 @@ struct mptcp_sched_ops {
 struct mptcp_sock {
 	struct inet_connection_sock	sk;
 
-	__u32			token;
-	struct sock		*first;
+	__u32		token;
+	struct sock	*first;
 	struct mptcp_sched_ops	*sched;
-	char			ca_name[TCP_CA_NAME_MAX];
+	char		ca_name[TCP_CA_NAME_MAX];
 } __attribute__((preserve_access_index));
 
 #endif
-- 
2.34.1

Re: [PATCH mptcp-next] Squash to "mptcp: add sched in mptcp_sock"

Posted by Matthieu Baerts 1 year, 11 months ago

Hi Geliang,

On 16/05/2022 04:16, Geliang Tang wrote:
> Keep the alignment of members of mptcp_sock in bpf_tcp_helpers.h as the
> same as the alignment of mptcp_sock in net/mptcp/protocol.h.

Thank you for the patch, I didn't know you were following this
alignment, fine for me.

- 99c3f5a71174: "squashed" in "mptcp: add sched in mptcp_sock"
- Results: c53189ad917e..fb1b9f5009c4 (export)

Builds and tests are now in progress:



https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220516T162639

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