[PATCH bpf] selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

[PATCH bpf] selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

[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].

The test will be removed later on bpf-next.

[1] https://lore.kernel.org/netdev/20250404180334.3224206-1-kuba@kernel.org/
[2] https://lore.kernel.org/bpf/cfc371285323e1a3f3b006bfcf74e6cf7ad65258@linux.dev/

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
index 2d0796314862..0a99fd404f6d 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
@@ -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);
-- 
2.49.0

Re: [PATCH bpf] selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

[Jiayuan Chen]

April 17, 2025 at 01:02, "Ihor Solodrai" <ihor.solodrai@linux.dev> 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.
> 
> 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/20250404180334.3224206-1-kuba@kernel.org/
> 
> [2] https://lore.kernel.org/bpf/cfc371285323e1a3f3b006bfcf74e6cf7ad65258@linux.dev/
> 
> Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>

Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>

Thanks.

> ---
> 
>  tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c | 1 -
> 
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> 
> index 2d0796314862..0a99fd404f6d 100644
> 
> --- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> 
> +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
> 
> @@ -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);
> 
> -- 
> 
> 2.49.0
>

Re: [PATCH bpf] selftests/bpf: mitigate sockmap_ktls disconnect_after_delete failure

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html