Re: [PATCH net-next 2/5] tls: remove dead sockmap (psock) handling from the SW path

[Sabrina Dubroca <sd@queasysnail.net>]

2026-06-13, 18:40:57 -0700, Jakub Kicinski wrote:
> TLS and sockmap are now mutually exclusive. Try to delete the code
> from sendmsg and recvmsg path which is now obviously dead.
> 
> The main goal is to delete enough code for AI security scanners
> to no longer bother us with sockmap related bugs. At the same
> time retain the code in case someone has the cycles to fix
> all of this and make the integration work, again.
> 
> If the integration does not get restored we can wipe the rest
> of the skmsg code from TLS in two or three releases.
> 
> The changes on the Tx side are deeper since that's where most
> of the bugs are, Rx side simply takes the data from sockmap
> and gives it to the user. On Tx split record handling and
> rolling back the iterator were the two problem areas.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
>  include/linux/skmsg.h |   9 -
>  net/core/skmsg.c      |  52 +-----
>  net/tls/tls_main.c    |   8 +-
>  net/tls/tls_sw.c      | 399 +++---------------------------------------
>  4 files changed, 31 insertions(+), 437 deletions(-)

Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>


> @@ -2417,7 +2088,7 @@ int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
>  		} else {
>  			struct tls_decrypt_arg darg;
>  
> -			err = tls_rx_rec_wait(sk, NULL, true, released, !!copied);
> +			err = tls_rx_rec_wait(sk, true, released, !!copied);

nit: There's also a leftover sk_psock_get in that function. We can
clean it up later, let's get this series in.

-- 
Sabrina