[PATCH stable 6.12 6.14 1/1] selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure
From: Ihor Solodrai ihor.solodrai@linux.dev
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
"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.d...
Signed-off-by: Ihor Solodrai ihor.solodrai@linux.dev Signed-off-by: Andrii Nakryiko andrii@kernel.org Reviewed-by: Jiayuan Chen jiayuan.chen@linux.dev Link: https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev [ shung-hsi.yu: needed because upstream commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") is backported ] Signed-off-by: Shung-Hsi Yu shung-hsi.yu@suse.com --- 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);
On Fri, Apr 25, 2025 at 01:57:01PM +0800, Shung-Hsi Yu wrote:
From: Ihor Solodrai ihor.solodrai@linux.dev
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
"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.d...
Signed-off-by: Ihor Solodrai ihor.solodrai@linux.dev Signed-off-by: Andrii Nakryiko andrii@kernel.org Reviewed-by: Jiayuan Chen jiayuan.chen@linux.dev Link: https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev [ shung-hsi.yu: needed because upstream commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") is backported ] Signed-off-by: Shung-Hsi Yu shung-hsi.yu@suse.com
I missed that 5071a1e606b3 was added to 6.1 and 6.6, too. Please apply this one for 6.14, 6.12, 6.6, and 6.1.
Thanks! Shung-hsi Yu
On Fri, Apr 25, 2025 at 02:35:59PM +0800, Shung-Hsi Yu wrote:
On Fri, Apr 25, 2025 at 01:57:01PM +0800, Shung-Hsi Yu wrote:
From: Ihor Solodrai ihor.solodrai@linux.dev
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
"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.d...
Signed-off-by: Ihor Solodrai ihor.solodrai@linux.dev Signed-off-by: Andrii Nakryiko andrii@kernel.org Reviewed-by: Jiayuan Chen jiayuan.chen@linux.dev Link: https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev [ shung-hsi.yu: needed because upstream commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") is backported ] Signed-off-by: Shung-Hsi Yu shung-hsi.yu@suse.com
I missed that 5071a1e606b3 was added to 6.1 and 6.6, too. Please apply this one for 6.14, 6.12, 6.6, and 6.1.
It's already queued up for the next 6.6.y, 6.1.y, 5.15.y and 5.10.y releases, and is already in the 6.14.3 and 6.12.24 releases.
Did I miss anywhere else that it needs to go?
thanks,
greg k-h
On Fri, Apr 25, 2025 at 09:17:13AM +0200, Greg KH wrote:
On Fri, Apr 25, 2025 at 02:35:59PM +0800, Shung-Hsi Yu wrote:
On Fri, Apr 25, 2025 at 01:57:01PM +0800, Shung-Hsi Yu wrote:
From: Ihor Solodrai ihor.solodrai@linux.dev
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
"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.d...
Signed-off-by: Ihor Solodrai ihor.solodrai@linux.dev Signed-off-by: Andrii Nakryiko andrii@kernel.org Reviewed-by: Jiayuan Chen jiayuan.chen@linux.dev Link: https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev [ shung-hsi.yu: needed because upstream commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") is backported ] Signed-off-by: Shung-Hsi Yu shung-hsi.yu@suse.com
I missed that 5071a1e606b3 was added to 6.1 and 6.6, too. Please apply this one for 6.14, 6.12, 6.6, and 6.1.
It's already queued up for the next 6.6.y, 6.1.y, 5.15.y and 5.10.y releases, and is already in the 6.14.3 and 6.12.24 releases.
Did I miss anywhere else that it needs to go?
My bad, the patches I sent and I want to have backported is 82303a059aab, the first line in the patch
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
is wrong.
I'll send v2. Hopefully that will be easier for you.
Shung-Hsi
On Fri, Apr 25, 2025 at 4:59 PM Shung-Hsi Yu shung-hsi.yu@suse.com wrote:
On Fri, Apr 25, 2025 at 09:17:13AM +0200, Greg KH wrote:
On Fri, Apr 25, 2025 at 02:35:59PM +0800, Shung-Hsi Yu wrote:
On Fri, Apr 25, 2025 at 01:57:01PM +0800, Shung-Hsi Yu wrote:
From: Ihor Solodrai ihor.solodrai@linux.dev
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
"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.d...
Signed-off-by: Ihor Solodrai ihor.solodrai@linux.dev Signed-off-by: Andrii Nakryiko andrii@kernel.org Reviewed-by: Jiayuan Chen jiayuan.chen@linux.dev Link: https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev [ shung-hsi.yu: needed because upstream commit 5071a1e606b3 ("net: tls: explicitly disallow disconnect") is backported ] Signed-off-by: Shung-Hsi Yu shung-hsi.yu@suse.com
I missed that 5071a1e606b3 was added to 6.1 and 6.6, too. Please apply this one for 6.14, 6.12, 6.6, and 6.1.
It's already queued up for the next 6.6.y, 6.1.y, 5.15.y and 5.10.y releases, and is already in the 6.14.3 and 6.12.24 releases.
Did I miss anywhere else that it needs to go?
My bad, the patches I sent and I want to have backported is 82303a059aab, the first line in the patch
commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 upstream.
is wrong.
I'll send v2. Hopefully that will be easier for you.
Actually 82303a059aab hasn't made its way to Linus' tree yet. Will wait for that to happen before sending.
Shung-Hsi
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 5071a1e606b30c0c11278d3c6620cd6a24724cf6
WARNING: Author mismatch between patch and upstream commit: Backport author: Shung-Hsi Yushung-hsi.yu@suse.com Commit author: Jakub Kicinskikuba@kernel.org
Status in newer kernel trees: 6.14.y | Present (different SHA1: 8513411ec321)
Note: The patch differs from the upstream commit: --- 1: 5071a1e606b30 < -: ------------- net: tls: explicitly disallow disconnect -: ------------- > 1: ce5593c27c33f selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.14.y | Success | Success |
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Sasha Levin -
Shung-Hsi Yu