[v1] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

[PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

Geliang Tang posted 1 patch 1 year, 11 months ago

Diff against v1 v1
Download mbox

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

Maintainers: Daniel Borkmann <daniel@iogearbox.net>, KP Singh <kpsingh@kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Yonghong Song <yhs@fb.com>, Shuah Khan <shuah@kernel.org>, Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <mathew.j.martineau@linux.intel.com>, John Fastabend <john.fastabend@gmail.com>, Alexei Starovoitov <ast@kernel.org>, Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>

There is a newer version of this series

tools/testing/selftests/bpf/progs/mptcp_sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

Posted by Geliang Tang 1 year, 11 months ago

Fix mptcp bpf tests failures on export/20220514T172044.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/progs/mptcp_sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
index 25e1c8e6f905..ab135edf3ae3 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_sock.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
@@ -48,7 +48,7 @@ int _sockops(struct bpf_sock_ops *ctx)
 		return 1;
 
 	is_mptcp = bpf_core_field_exists(tsk->is_mptcp) ? tsk->is_mptcp : 0;
-	if (is_mptcp) {
+	if (!is_mptcp) {
 		storage = bpf_sk_storage_get(&socket_storage_map, sk, 0,
 					     BPF_SK_STORAGE_GET_F_CREATE);
 		if (!storage)
-- 
2.34.1

Re: [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

Posted by Matthieu Baerts 1 year, 11 months ago

Hi Geliang,

On 16/05/2022 07:50, Geliang Tang wrote:
> Fix mptcp bpf tests failures on export/20220514T172044.

Oops, good catch!

Now in our tree!

- 6aaf2c9e55dd: "squashed" in "selftests/bpf: test bpf_skc_to_mptcp_sock"
- Results: cd3c57373965..c53189ad917e (export)

Builds and tests are now in progress:



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

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