Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85165C43334 for ; Tue, 19 Jul 2022 23:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240675AbiGSXLv (ORCPT ); Tue, 19 Jul 2022 19:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237543AbiGSXLq (ORCPT ); Tue, 19 Jul 2022 19:11:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E15DC62A7A for ; Tue, 19 Jul 2022 16:11:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7A33AB81DB1 for ; Tue, 19 Jul 2022 23:11:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6D1FC341CF; Tue, 19 Jul 2022 23:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1658272300; bh=s6E/FmdFf7uYZwJleMpbevIzKUkMazRJEgfzE7WY2Qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zp2jGMbeZC0ZQogYsK4ZVzot88RB7GPp3fotoxNkU79VyH011Su3O9lP+Z/QakqSK LO/DRgPi7vRsiWLm7xPgeZSewq59v3QJlQ+EIANxGSjdD0OswxxoQNSwSOEBHG8/Gm 2mBHpf7TQq6x6Yu5vkJNWsict51FgGd4jGbnfKA30F9D3P27wA804W4a7B2fnQgusk 0XxtxDvu821IB9CdHH/J6S7Ci8jp35iTkIfLLkPpMiLKAn5xpPgTWvYEFtBYjskBRY E2I4MbBd5pctXSJXaHYwd2fthS1KQrbyKd7Wsz+KGg8/96de6SPndVPtPZSfEV/WRk Fo1yjYr7gFOvQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, borisp@nvidia.com, john.fastabend@gmail.com, maximmi@nvidia.com, tariqt@nvidia.com, vfedorenko@novek.ru, Jakub Kicinski , yoshfuji@linux-ipv6.org, dsahern@kernel.org Subject: [PATCH net-next v2 5/7] tcp: allow tls to decrypt directly from the tcp rcv queue Date: Tue, 19 Jul 2022 16:11:27 -0700 Message-Id: <20220719231129.1870776-6-kuba@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220719231129.1870776-1-kuba@kernel.org> References: <20220719231129.1870776-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Expose TCP rx queue accessor and cleanup, so that TLS can decrypt directly from the TCP queue. The expectation is that the caller can access the skb returned from tcp_recv_skb() and up to inq bytes worth of data (some of which may be in ->next skbs) and then call tcp_read_done() when data has been consumed. The socket lock must be held continuously across those two operations. Signed-off-by: Jakub Kicinski --- CC: yoshfuji@linux-ipv6.org CC: dsahern@kernel.org --- include/net/tcp.h | 2 ++ net/ipv4/tcp.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 8e48dc56837b..90340d66b731 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -673,6 +673,8 @@ void tcp_get_info(struct sock *, struct tcp_info *); int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, sk_read_actor_t recv_actor); int tcp_read_skb(struct sock *sk, skb_read_actor_t recv_actor); +struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off); +void tcp_read_done(struct sock *sk, size_t len); void tcp_initialize_rcv_mss(struct sock *sk); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 96b6e9c22068..155251a6c5a6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1625,7 +1625,7 @@ static void tcp_eat_recv_skb(struct sock *sk, struct sk_buff *skb) __kfree_skb(skb); } -static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off) +struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off) { struct sk_buff *skb; u32 offset; @@ -1648,6 +1648,7 @@ static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off) } return NULL; } +EXPORT_SYMBOL(tcp_recv_skb); /* * This routine provides an alternative to tcp_recvmsg() for routines @@ -1778,6 +1779,47 @@ int tcp_read_skb(struct sock *sk, skb_read_actor_t recv_actor) } EXPORT_SYMBOL(tcp_read_skb); +void tcp_read_done(struct sock *sk, size_t len) +{ + struct tcp_sock *tp = tcp_sk(sk); + u32 seq = tp->copied_seq; + struct sk_buff *skb; + size_t left; + u32 offset; + + if (sk->sk_state == TCP_LISTEN) + return; + + left = len; + while (left && (skb = tcp_recv_skb(sk, seq, &offset)) != NULL) { + int used; + + used = min_t(size_t, skb->len - offset, left); + seq += used; + left -= used; + + if (skb->len > offset + used) + break; + + if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) { + tcp_eat_recv_skb(sk, skb); + ++seq; + break; + } + tcp_eat_recv_skb(sk, skb); + } + WRITE_ONCE(tp->copied_seq, seq); + + tcp_rcv_space_adjust(sk); + + /* Clean up data we have read: This will do ACK frames. */ + if (left != len) { + tcp_recv_skb(sk, seq, &offset); + tcp_cleanup_rbuf(sk, len - left); + } +} +EXPORT_SYMBOL(tcp_read_done); + int tcp_peek_len(struct socket *sock) { return tcp_inq(sock->sk); -- 2.36.1