From nobody Fri Oct 3 00:04:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cd86m5f6Hz6BN3h; Fri, 03 Oct 2025 00:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cd86m3Jztz3syw; Fri, 03 Oct 2025 00:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JGAHeyHOh/p4vQgD7hzZstH7z0Mz1WqqaIkE5uaZuaI=; b=QM0RoV4Dj3kBaA6SUaLxrjVYdICKjTH/Md/iYTlCCGvk/e+le0xr3UVdcem73Bg9ctmodQ Ea+3LUwlsZUUwxEt46Dk/AyqXp/TbTUXSDjbQarkmnFNIufNRoC9A+KDhea+vVCKepMPho gVoFJMAyNLKVutwr3pra/HvOkBfxl8rHEZL8Dki9AMmf1l2buGPbYuPsL9TEan2f6WHUIV n6opzEg5INONHeQ/HrDDTUDvfDId+j+EUB7rU1i/3JW038YYHJe7gFXmwrLVpdQlnL+x69 w/dwJWBygFRwcCNMFLjgLmvI1AlGd4QpDpIiI9tRQ+npedQHcaMnGW8Ysk9v1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759449888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JGAHeyHOh/p4vQgD7hzZstH7z0Mz1WqqaIkE5uaZuaI=; b=fO3EUo3LybtD/Lxp4C0u0YHVtwSV0Dx0gQR59MQ6bcOJ23JIJmnMxkvz/wN0Ytk6ZqJQ9N yPjfu+3PbAzH0o8ZUcI7BjYKK36R1N+OpCDSOwzpP3xgTjPGNb6qf0QtpFEUhKFENMu0dj xjAj3f1mhXFqssSh/TMwgPaIj6D1BcpzpZG9rVkOjJCxUhilQUfAl99Y80xkVShndR44ck /ssth5l2QwtzyfXr+96COjNnPVJAyJGUPiPAZdOipHcS+WOOV+af3uayyGza13GfMa+AsJ 4tIa63ovgQc1xDU4GLtZYp7xBr6Tc3PqvsF7u9exc81uFpE5KOYOet91s81MOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759449888; a=rsa-sha256; cv=none; b=UBLj1gFQUSv7zquSaS3aFHY0+mmGf9IPeV4O4EhA8Ca0mYymkIdfbAEZwqHlgcyUJ427Dc pVYE87Vn1SMURCTm2R+QLuv5TT8zDv3Qye1ljOnyFLSSf6TpFGO1kC2dG8kgrORhyCg5Xv NReAdTq7JJxnxLViYLVXPEUNTO/SDD1FikdXiLBoCtVf9YLaGh5mrc+uhg2kYqYRPu2eKr vha5Mje6W1Q6rDhIokl58dXl/HnAqh1Bj5ROolShmiow/VgJ+cJ7gfcsIYH+ZuE2XJ0Ih1 58pxdU75OVbdpx2hviF6in9ltFeYK88B3DTS+NDxj06q0t/QDPVmKOPZcOXFiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cd86m2sp1zVjV; Fri, 03 Oct 2025 00:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59304mm1057592; Fri, 3 Oct 2025 00:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59304mMo057589; Fri, 3 Oct 2025 00:04:48 GMT (envelope-from git) Date: Fri, 3 Oct 2025 00:04:48 GMT Message-Id: <202510030004.59304mMo057589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: f83f48e62222 - stable/15 - cxgbe TOE TLS: Support for TLS 1.3 for receive List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f83f48e62222feec094174e3d27590e9b0eb6c53 Auto-Submitted: auto-generated The branch stable/15 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=f83f48e62222feec094174e3d27590e9b0eb6c53 commit f83f48e62222feec094174e3d27590e9b0eb6c53 Author: John Baldwin AuthorDate: 2025-09-29 15:10:08 +0000 Commit: Navdeep Parhar CommitDate: 2025-10-02 22:09:08 +0000 cxgbe TOE TLS: Support for TLS 1.3 for receive Sponsored by: Chelsio Communications (cherry picked from commit e2fae07e093bf4953ad7359b2aa9ca62b0d76adf) --- sys/dev/cxgbe/tom/t4_tls.c | 51 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 677fd143e248..bbcc1c88c3db 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -240,11 +240,6 @@ tls_alloc_ktls(struct toepcb *toep, struct ktls_session *tls, int direction) if (is_t6(sc)) { return (EPROTONOSUPPORT); } - - /* Only TX for TLS 1.3 for now. */ - if (direction == KTLS_RX) { - return (EPROTONOSUPPORT); - } } /* Sanity check values in *tls. */ @@ -305,8 +300,8 @@ tls_alloc_ktls(struct toepcb *toep, struct ktls_session *tls, int direction) if (error) return (error); + toep->tls.tls13 = tls->params.tls_vminor == TLS_MINOR_VER_THREE; if (direction == KTLS_TX) { - toep->tls.tls13 = tls->params.tls_vminor == TLS_MINOR_VER_THREE; toep->tls.scmd0.seqno_numivs = (V_SCMD_SEQ_NO_CTRL(3) | V_SCMD_PROTO_VERSION(t4_tls_proto_ver(tls)) | @@ -834,8 +829,8 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct sockbuf *sb; struct mbuf *tls_data; struct tls_get_record *tgr; - struct mbuf *control; - int pdu_length, trailer_len; + struct mbuf *control, *n; + int pdu_length, resid, trailer_len; #if defined(KTR) || defined(INVARIANTS) int len; #endif @@ -883,7 +878,9 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) /* * The payload of this CPL is the TLS header followed by - * additional fields. + * additional fields. For TLS 1.3 the type field holds the + * inner record type and the length field has been updated to + * strip the inner record type, padding, and MAC. */ KASSERT(m->m_len >= sizeof(*tls_hdr_pkt), ("%s: payload too small", __func__)); @@ -895,7 +892,14 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) ("%s: sequence mismatch", __func__)); } - /* Report decryption errors as EBADMSG. */ + /* + * Report decryption errors as EBADMSG. + * + * XXX: To support rekeying for TLS 1.3 this will eventually + * have to be updated to recrypt the data with the old key and + * then decrypt with the new key. Punt for now as KTLS + * doesn't yet support rekeying. + */ if ((tls_hdr_pkt->res_to_mac_error & M_TLSRX_HDR_PKT_ERROR) != 0) { CTR4(KTR_CXGBE, "%s: tid %u TLS error %#x ddp_vld %#x", __func__, toep->tid, tls_hdr_pkt->res_to_mac_error, @@ -913,6 +917,33 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) return (0); } + /* For TLS 1.3 trim the header and trailer. */ + if (toep->tls.tls13) { + KASSERT(tls_data != NULL, ("%s: TLS 1.3 record without data", + __func__)); + MPASS(tls_data->m_pkthdr.len == pdu_length); + m_adj(tls_data, sizeof(struct tls_record_layer)); + if (tls_data->m_pkthdr.len > be16toh(tls_hdr_pkt->length)) + tls_data->m_pkthdr.len = be16toh(tls_hdr_pkt->length); + resid = tls_data->m_pkthdr.len; + if (resid == 0) { + m_freem(tls_data); + tls_data = NULL; + } else { + for (n = tls_data;; n = n->m_next) { + if (n->m_len < resid) { + resid -= n->m_len; + continue; + } + + n->m_len = resid; + m_freem(n->m_next); + n->m_next = NULL; + break; + } + } + } + /* Handle data received after the socket is closed. */ sb = &so->so_rcv; SOCKBUF_LOCK(sb);