From nobody Tue Feb 01 00:44:33 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 107A8197CCD3; Tue, 1 Feb 2022 00:44: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 4JnmR573FVz4YLm; Tue, 1 Feb 2022 00:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643676274; 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=vMDyTfYcZGNXjrA6FIqqzLScGv9i5W6YcpZrgem0KwU=; b=Xjf/4TgKNq20MnRHz4jhJ7fL7li3tLOHL6gYfT+oVgKODCxz9LqsRQZbrlPP2cq1BW3LMi AmJ39Z9tCZwUXYARpYKK6vmi0MugjthGskPVHrCpOSLClZlyRjnrpza+rc97X5znaWbpXr V3BSN6wM3n0LKKwz+eJbkiI70qLvmwOg0EjAanQ7S7YSjta5HxPQgW4yDsjV/NCpOto+PT Fhqzn1FNer0hEp6xJIQQ4uq0n80aikhIHQh4DGL8bwUYMS2RmGX2gzwbQd89Vo2vG/PCyB kOMq7+fUPKLbwRPF2/ObEOkoD6jCd0XshicJ24CxEWMlGF9fEJHZ9qyNuaYd5A== 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 D1D0E26567; Tue, 1 Feb 2022 00:44:33 +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 2110iXaD072616; Tue, 1 Feb 2022 00:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2110iXIn072615; Tue, 1 Feb 2022 00:44:33 GMT (envelope-from git) Date: Tue, 1 Feb 2022 00:44:33 GMT Message-Id: <202202010044.2110iXIn072615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d958bc7963d4 - main - ktls: Try to enable TOE TLS after marking existing data not ready. 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/main X-Git-Reftype: branch X-Git-Commit: d958bc7963d415d6745abf3e6829f05dabf4c9ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643676274; 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=vMDyTfYcZGNXjrA6FIqqzLScGv9i5W6YcpZrgem0KwU=; b=upP7mYQIKljvIh9gjfCH2XpJkMT/o4ykDdLbbob1G+FSOBiIBJl+U35fIp7lIatVJNLXMi D662OnBjIkBj9XY7abDh1VLX5hMbdtt0RzDvbZs7vrFEnvLNCyH4KP27RfAjh+NKGdHwyQ McqPFpV3WX8p0MYjanmvm0tJZDXcrNnLP06SGajVHoV26S164Zfz7IJ+XH6WkiI4t6NdSz kAClc73BqF/ISL9tXb3uIV/PkG7DcDqNVR7hHEPYDGD33lXgpuHMpT0MXSZSlm+c7x90hg a0qPcyeZqT13Tpx9evl9Dq5noI354U+hsWM9h5JiSAPmQC2b34yq/7Y3XBHtvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643676274; a=rsa-sha256; cv=none; b=wPGbFLAS8C4zl4vTyexmQP0Hbf/6xwjuWll4h7h8HnBiHKMZ/hJVymwtvcp5bF9+2/ZB+l YDj/tFz2l51n6ee7ZGo+30xv32Gd9Vm+KyY6W9im+OXNCdGSadPPpEw4vt+G8jT3R/355P U4aQb2J73dyG8hkBwvb92rJWNy2+iCEO8X27D2kpTnOUwWcOdX/KPl8xeICE34wBiRJRUH mfGRSDjvA+MUlU6U2N9qkUEElT3rIgSDtTs8wBrR7AjZVcbbUUwZ3eKQ0o4+QKs18tXnQw J2uM9H58BketLNNDBSxWW2oabIOwWnmqdCIfA3vhX38eeve+Ex0j5hay4e1awg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d958bc7963d415d6745abf3e6829f05dabf4c9ed commit d958bc7963d415d6745abf3e6829f05dabf4c9ed Author: John Baldwin AuthorDate: 2022-02-01 00:39:21 +0000 Commit: John Baldwin CommitDate: 2022-02-01 00:39:21 +0000 ktls: Try to enable TOE TLS after marking existing data not ready. At the moment this is mostly a no-op but in the future there will be in-flight encrypted data which requires software decryption. This same setup is also needed for NIC TLS RX. Note that this does break TOE TLS RX for AES-CBC ciphers since there is no software fallback for AES-CBC receive. This will be resolved one way or another before 14.0 is released. Reviewed by: hselasky Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34082 --- sys/kern/uipc_ktls.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 620536f28b34..b3235e8a1e0c 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1195,12 +1195,6 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) return (error); } -#ifdef TCP_OFFLOAD - error = ktls_try_toe(so, tls, KTLS_RX); - if (error) -#endif - ktls_use_sw(tls); - /* Mark the socket as using TLS offload. */ SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_tls_seqno = be64dec(en->rec_seq); @@ -1208,12 +1202,16 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) so->so_rcv.sb_flags |= SB_TLS_RX; /* Mark existing data as not ready until it can be decrypted. */ - if (tls->mode != TCP_TLS_MODE_TOE) { - sb_mark_notready(&so->so_rcv); - ktls_check_rx(&so->so_rcv); - } + sb_mark_notready(&so->so_rcv); + ktls_check_rx(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_rcv); +#ifdef TCP_OFFLOAD + error = ktls_try_toe(so, tls, KTLS_RX); + if (error) +#endif + ktls_use_sw(tls); + counter_u64_add(ktls_offload_total, 1); return (0);