Skip to contentSkip to conversation

selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

PATCH Applied Ihor Solodrai 3 participants 3 messages Apr 16, 2025

Subsystems (5)
lore
Share & tools
lore

Ihor Solodrai

author reviewer
#0 lore raw

PATCH 1/1 selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

"sockmap_ktls disconnect_after_delete" test has been failing on BPF CI after recent merges from netdev:
* https://github.com/kernel-patches/bpf/actions/runs/14458537639
* https://github.com/kernel-patches/bpf/actions/runs/14457178732

It happens because disconnect has been disabled for TLS [1], and it renders the test case invalid.

Removing all the test code creates a conflict between bpf and bpf-next, so for now only remove the offending assert [2].

The test will be removed later on bpf-next.

[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/bpf/[email protected]/

---
 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 -
 1 file changed, 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +0 -1
index 2d0796314862..0a99fd404f6d 100644
@@ -68,7 +68,6 @@ static void test_sockmap_ktls_disconnect_after_delete(int family, int map)
 		goto close_cli;
 
 	err = disconnect(cli);
-	ASSERT_OK(err, "disconnect");
 
 close_cli:
 	close(cli);
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Ihor Solodrai

"sockmap_ktls disconnect_after_delete" test has been failing on BPF CI

after recent merges from netdev:

* https://github.com/kernel-patches/bpf/actions/runs/14458537639

* https://github.com/kernel-patches/bpf/actions/runs/14457178732

It happens because disconnect has been disabled for TLS [1], and it

renders the test case invalid.

Removing all the test code creates a conflict between bpf and

bpf-next, so for now only remove the offending assert [2].

Quoted 7 lines

The test will be removed later on bpf-next.

[1] https://lore.kernel.org/netdev/[email protected]/

[2] https://lore.kernel.org/bpf/[email protected]/

Thanks.

Quoted 34 lines

---

 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 -
 1 file changed, 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +0 -0

index 2d0796314862..0a99fd404f6d 100644

--- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c

+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c

tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +0 -1
@@ -68,7 +68,6 @@ static void test_sockmap_ktls_disconnect_after_delete(int family, int map)
 
 goto close_cli;
 
 
 
 err = disconnect(cli);
 
- ASSERT_OK(err, "disconnect");
 
 
 
 close_cli:
 
 close(cli);
Signature · 3 lines
-- 

2.49.0
#2 lore raw
In reply to Ihor Solodrai
This patch was applied to bpf/bpf.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Andrii Nakryiko <[email protected]>:

Quoted 9 lines · On Wed, 16 Apr 2025 10:02:46 -0700 you wrote:

"sockmap_ktls disconnect_after_delete" test has been failing on BPF CI after recent merges from netdev:
* https://github.com/kernel-patches/bpf/actions/runs/14458537639
* https://github.com/kernel-patches/bpf/actions/runs/14457178732

It happens because disconnect has been disabled for TLS [1], and it renders the test case invalid.

[...]

Here is the summary with links:
- [bpf] selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

    https://git.kernel.org/bpf/bpf/c/82303a059aab

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html