From nobody Thu Aug 25 17:31:34 2022 X-Original-To: dev-commits-src-all@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 4MD94Q61xYz4b33h; Thu, 25 Aug 2022 17:31:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MD94Q43ylz3KbF; Thu, 25 Aug 2022 17:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448694; 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=SCiC5dQs49iNPylW560ag9yzLCcJ6FJbbeOLCP/z2Rw=; b=fD4uFUXC2jmfJUIARpwyc/633CKtGjePVp0iz/WiTEysHP5BUZouRaZXXB6vITKnCpvfDB m2BW1JsB9eGYWg01E56GOcV4wv57SYSjtiBfTyAzhG/5PRyB9G58l/XQM8DOIV7dEkS4j0 36HU7pDMetIpmEWBj6czHAzRpolKb8ypVIFmym2pwLTVCxcjRRXLdWzQINPAIoGDCy+GST zRQkxY7WbKMbvlsRZbnN1/kC+NnMCXhmWeKEVY2rtd/xcHSgSYuf48+zGOKHTTaJRWpQst 8QdcCrAPOMsn8cUSd1Fe4QagryuqV5JseBgIbbQB9VlTgHWya25RAN+6QvEiyw== 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 4MD94Q38Ynzwsf; Thu, 25 Aug 2022 17:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PHVYJm041534; Thu, 25 Aug 2022 17:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHVYcP041533; Thu, 25 Aug 2022 17:31:34 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:31:34 GMT Message-Id: <202208251731.27PHVYcP041533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 39b724b72775 - stable/13 - cxgbe TOE TLS: Fix handling of unusual record types. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 39b724b72775bcb328ac1c220c67b288ff6f6aee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448694; 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=SCiC5dQs49iNPylW560ag9yzLCcJ6FJbbeOLCP/z2Rw=; b=DJFOlRStbUJXY9dNsbAmeH/SnWAGJ2JtR4/hpoAnPETVxHppqQ1jUF0MEWhTITc7sKAyWm 42rKBV8bBGIpr/zduOVBUT8PRz0GM8/EYWTuABYi1dTbAlh7B1Tk/RHgdKeaVlqCXGUnFx o5FoSEYQBy8OciW/ru/Dz+eeW5mNDiyZ+dEuvUiWL3J3uIslzpqR43nx6fR6pPOPTL//Pl O1ODwmuf/8Np+q1uJs6FIlds7XYdBQ6+3CBC+6CezAn+a1AduWIEEyYRrAgBfaLytzaybQ hagtoTzZf44/10TyeWvHVqgpsC4OqY6kN6CbOlbcd0qv79Jfa1IQSI0aANCN8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448694; a=rsa-sha256; cv=none; b=jzWhKDrLYVjQml6MiZvlQTOkIHNv6/bx9A40sgSwJv3VAliaKnB+FoX30jzJ6gzV8WsYk0 +2/vxBE0mqeGnngZwKmQv333h26HY8Uw5LDGbDoSZKb+klPez5o3UVVdD2TEKr+FCK9Yqr RNj7oZlRSqK3CVxhW815pJGIZwRD0ilWWHRo8uYwPsAWj+9PvlCC8m8JV9apVdxXaPh3YW 3kTgtakLGQE9cQgbdKMbkzMQWFHU8jt4RDo8CkjxWhXi37CRN09qOci9Po/jlSXJRx/8Sn Vp31QQyqPgyC0wfr80+2rfo5pNt2gQ+Ww+zWk4n7duhQbO3gsPgWncRwfMlAtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=39b724b72775bcb328ac1c220c67b288ff6f6aee commit 39b724b72775bcb328ac1c220c67b288ff6f6aee Author: John Baldwin AuthorDate: 2022-08-08 18:21:54 +0000 Commit: John Baldwin CommitDate: 2022-08-25 16:33:04 +0000 cxgbe TOE TLS: Fix handling of unusual record types. This doesn't matter for real traffic but fixes failures in the KTLS unit tests that use unusual record types. Sponsored by: Chelsio Communications (cherry picked from commit 782db2881b6b9c8460f7f311e0e4bbbab36eb88a) --- sys/dev/cxgbe/tom/t4_tls.c | 14 +++++--------- sys/dev/cxgbe/tom/t4_tls.h | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 97bf3a016fb2..0a97d020eb94 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -268,11 +268,6 @@ tls_copy_tx_key(struct toepcb *toep, void *dst) static inline unsigned char tls_content_type(unsigned char content_type) { - /* - * XXX: Shouldn't this map CONTENT_TYPE_APP_DATA to DATA and - * default to "CUSTOM" for all other types including - * heartbeat? - */ switch (content_type) { case CONTENT_TYPE_CCS: return CPL_TX_TLS_SFO_TYPE_CCS; @@ -280,10 +275,11 @@ tls_content_type(unsigned char content_type) return CPL_TX_TLS_SFO_TYPE_ALERT; case CONTENT_TYPE_HANDSHAKE: return CPL_TX_TLS_SFO_TYPE_HANDSHAKE; - case CONTENT_TYPE_HEARTBEAT: - return CPL_TX_TLS_SFO_TYPE_HEARTBEAT; + case CONTENT_TYPE_APP_DATA: + return CPL_TX_TLS_SFO_TYPE_DATA; + default: + return CPL_TX_TLS_SFO_TYPE_CUSTOM; } - return CPL_TX_TLS_SFO_TYPE_DATA; } static unsigned char @@ -1277,7 +1273,7 @@ write_tlstx_cpl(struct cpl_tx_tls_sfo *cpl, struct toepcb *toep, V_CPL_TX_TLS_SFO_DATA_TYPE(data_type) | V_CPL_TX_TLS_SFO_CPL_LEN(2) | V_CPL_TX_TLS_SFO_SEG_LEN(seglen)); cpl->pld_len = htobe32(plen); - if (data_type == CPL_TX_TLS_SFO_TYPE_HEARTBEAT) + if (data_type == CPL_TX_TLS_SFO_TYPE_CUSTOM) cpl->type_protover = htobe32( V_CPL_TX_TLS_SFO_TYPE(tls_hdr->type)); cpl->seqno_numivs = htobe32(tls_ofld->scmd0.seqno_numivs | diff --git a/sys/dev/cxgbe/tom/t4_tls.h b/sys/dev/cxgbe/tom/t4_tls.h index 37266206c31f..1950e6f927da 100644 --- a/sys/dev/cxgbe/tom/t4_tls.h +++ b/sys/dev/cxgbe/tom/t4_tls.h @@ -230,7 +230,7 @@ enum { CPL_TX_TLS_SFO_TYPE_ALERT, CPL_TX_TLS_SFO_TYPE_HANDSHAKE, CPL_TX_TLS_SFO_TYPE_DATA, - CPL_TX_TLS_SFO_TYPE_HEARTBEAT, /* XXX: Shouldn't this be "CUSTOM"? */ + CPL_TX_TLS_SFO_TYPE_CUSTOM, }; enum {