From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22E1F2E424F; Mon, 15 Jun 2026 22:20:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781562032; cv=none; b=FaxD6qjHmWYR4bBW+Zczr6Ygt3MC/aPG+42RYvHbIYdO16vINRdglOrLFPhITENBhJIU/oLcERbWf6P3uX45ch/VXaQMr02YYOgY50Q4tpr5jFv2GsovfrjHX5uJif6qDGZTRrsKku4/glUJoLxDuCbrQMCzBBSZtu3GMdn6zSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781562032; c=relaxed/simple; bh=MAgoF0GVfeHrwck+0R9JsdxcWGF3xDXMf6iJ4q5ye7Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LDqMwvspt/umNXMqOT24esKgFa5d5OX0cLyde+FEbZUBpI/Mq/DRjEMPEv9hC45GG1TVCYA1WzOPhfgU2W+hF0scJbBWlT9nWlqiTDlPGBNSrDa1xqOod7cXIwbQiYmKJ3kbvPUdXrquqRZkLOM0bnJLBDheBL8NGfVPHoyUWN8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=queasysnail.net; spf=pass smtp.mailfrom=queasysnail.net; dkim=pass (2048-bit key) header.d=queasysnail.net header.i=@queasysnail.net header.b=RfQt3rOc; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=aYlMd4pz; arc=none smtp.client-ip=103.168.172.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=queasysnail.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=queasysnail.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=queasysnail.net header.i=@queasysnail.net header.b="RfQt3rOc"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="aYlMd4pz" Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 3FC7FEC0187; Mon, 15 Jun 2026 18:20:29 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Mon, 15 Jun 2026 18:20:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=queasysnail.net; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1781562029; x= 1781648429; bh=b1PFnsUgRaLHFda7C6QAgcMr/WZozGHAvkozYIIaKgI=; b=R fQt3rOcmrCAknmuBI1oIK+wh91RGzwoElu0VWJlp8fyqY9NDxMWSTGdTtH1LfhKn ysSAom6x6msctd5hb155I0sjPZl9WlnVfll7ZWHXi1vLDmZbBp5zldz3LkXA17Ug odY8J+EYoVq4cAz3wc++VmUc3ZC1W9lvKrej1f9evoNGuxbKOxsu9o4wR/oRgsL/ T/dWhNCQ++cqh1pHxwO/e1+vtWNaUvD+FSrxok0swTQH/ztCJnCG7Ykap+7RlwOf Z7UH51MUWsSz/7bhKZe3ZZcYgqVDJT7nr3k27ze2VOMhJu6joM7W5zEVfwhIGptr 5MPFUb4HpvTdM7I0C4wyQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1781562029; x=1781648429; bh=b1PFnsUgRaLHFda7C6QAgcMr/WZozGHAvko zYIIaKgI=; b=aYlMd4pzKcK8Qc68sc2agXlH6h5wDqn35W/Qy+4mrK53O3u871j vTdD5GgZRGoZk1KPf559eaz2gtNvp7NBXzOel0O7tWmCs8eUmBT3OwHU/G3KcNdK FYahu9T6VQv2iOJiuHieHl+ZPnRmu+168PlqxWNBmPz90zl1j6rq0iAQnBRstGaP oa5iM3MZGca5wKppgMO01qQBd9R9M39NS/0GxMvatAF808fEZNHc9OIXQvw7K/Ro NoZk4fYAsow3ctaHucEv2PDoTf9KAlk4VZ9XeXwhnH2WlUwr5SN513AS0brRIocV j6hNgPjUcyp3sHAFk+6Ulufrwn0p9nftiNg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTFflWFTg5W6e891k+laAd9uEF8YgaM1qzCarsez+ZDzoDBnwbW64wZZ9indZ+we5c yOcWmrsILi7ZO87B6ZNANarpDv4BCukX1+bZUEUVYSgHusUmFKeeO+6Y/4UFH2vEGWjFJG kuIwvzXTMAcEvs361XXlVu7C3LSRZ3YpnVu+iE9u6SbZUjxWP6CGRm6dnCNlHJLvXKMeqH EVRCDLrOR5tAD2FublBoKRL6yVkWM1iTvBcTg2ZdYfqAu/TfOcSJO9BamLkzE6jzU4t6xi FV5ulDePpSKge+6SQUG2FXHnILZD8xM3VXuFZT6+zg+ABUAuy4UgTlgedCru7JISaISHqy 6h8WkOLYHn0IfF1q7AtcNQ8GD1ckT4uLL35iX5Hwtl05AT2ASitS8hyfouUuevpB/Ue8li QlGinpgCiutucyM21F0MVU3tguc2koZDOebVgE7WFV9RZt/V4mDmXGCH+hESP56XLlvEN6 LMMpPSYVDPXL1ROx2KQKiIDIgF5kk/Z3AqARXoTMCKqrbb+xA/TzicA4aQ6M51O2XMcX53 GSLBmQ5YXJ6x6XNjvb/13HlkrtKRG+rFDGx0cqXj+caMzlw0SIhF8CD2VEhnTNOCoaOv/Q DgWrNR4QGjxWfHUPQKHGJ9eGwoc836Gkhi5pQlgxH5iOrIq8nTtEtKM55JWw X-ME-Proxy: Feedback-ID: i934648bf:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Jun 2026 18:20:28 -0400 (EDT) Date: Tue, 16 Jun 2026 00:20:26 +0200 From: Sabrina Dubroca To: Jakub Kicinski Cc: davem@davemloft.net, netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, bpf@vger.kernel.org, jakub@cloudflare.com, john.fastabend@gmail.com Subject: Re: [PATCH net-next 2/5] tls: remove dead sockmap (psock) handling from the SW path Message-ID: References: <20260614014102.461064-1-kuba@kernel.org> <20260614014102.461064-3-kuba@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260614014102.461064-3-kuba@kernel.org> 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 > --- > 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 > @@ -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