From nobody Fri Apr 22 22:55:21 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 E53051997737; Fri, 22 Apr 2022 22:55:21 +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 4KlV9j65YHz4pgf; Fri, 22 Apr 2022 22:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650668121; 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=2xqGvUeHRJFl8w86lBCK5inr8s/gfmG+2jb0FsMluOQ=; b=G+biQX58qzMnMY1MVa3uq21N+8q7rqeSqhf0uMiuCLhdyen5OfWSy0RbOyP0VXbi0o50Ae Xgs4qSWsouD+GRGzMdYr+zQfmwatctDTaiKEvgqzrgcFrCNFUAhHSuGkKJVLEvb1JUELFt wuyy4yoBgMlU1585AOxm4Ap7rt/V3K0N9AegEk9tniBQmfSo5rst9+NM1L0rBXOb8r0108 iRZr9WSB9nUPljb9i7jZG5MIPz75RQfHDTpU7xrQ14S7g9PIaC2n9v/nxgv7IfkM1pv9xK Uv7qhV/503+knUlB2/1TQznvk+Loh6tVJdsHDNGYY3I0IBMdzX2ALnyBBC1ybg== 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 AD1D02621B; Fri, 22 Apr 2022 22:55:21 +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 23MMtLqn093214; Fri, 22 Apr 2022 22:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MMtLpv093213; Fri, 22 Apr 2022 22:55:21 GMT (envelope-from git) Date: Fri, 22 Apr 2022 22:55:21 GMT Message-Id: <202204222255.23MMtLpv093213@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: a4c5d490f6be - main - KTLS: Move OCF function pointers out of ktls_session. 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: a4c5d490f6be56468b2a088a5f6169846e39bd84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650668121; 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=2xqGvUeHRJFl8w86lBCK5inr8s/gfmG+2jb0FsMluOQ=; b=voZTvwQzhSAetQSH+JSxHoQHTIcePrvLP9iM0NeS/2BmVDD/d+Fr0XYaIBK2oKnmgL+H0P 37AF4njEHlfiUctlp6BBVChdc1L/O85h7ki7mHlrJmXJ+0um6CJZDAlMLKCAyv5CmzdJod wwuiDi91AgDU6MG3e6ov5mqBA842mv1s2/WOoTgPkZ/JT9zcMPeNI4GJe+tzEGrW8pPDiP yiges9twIGHo0eSSwfvZHRuI4oyYyDQfPHFfzoU7BB48rwzgmcsauIcoJUDblTjPp68mAm d79DyJqyDXHGi9OHRla7BKkQIm+CVCnr1s05mgs/LrlYbZ+OI7LnbLMCLjkNug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650668121; a=rsa-sha256; cv=none; b=j4GLjc6yIKtDErxnWHrqUcNcPX3GpHhnRkXend1hZoD5nv7pOcPmkOpyqgveyoyt5Of+uJ qdgID5z7KVr3+lE0bAU1/qUKyM76flU/KM8NYAhQflfyrgWwhFLjCZdTAaAjQXo32qbjVV KL7UyDkw9AyWDRDLg3VNd/j2W2Nja/9hOs+OyimwQwwy7jiHiWENv8QRh2VGXvAxvxtTr9 YlPb8PmmiiYLEP63qKPE9CP11hN9Ow2Xof8s3FwEf3Gy8+ot6+mG1m6elA4V1YgcSkbnEI pIKUZihiJ6y8XcYFvgiZZa2DV1OdPP6CnB0Si6orlx5wwr6Pc7aRzT0eNYXOKw== 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=a4c5d490f6be56468b2a088a5f6169846e39bd84 commit a4c5d490f6be56468b2a088a5f6169846e39bd84 Author: John Baldwin AuthorDate: 2022-04-22 22:52:12 +0000 Commit: John Baldwin CommitDate: 2022-04-22 22:52:12 +0000 KTLS: Move OCF function pointers out of ktls_session. Instead, create a switch structure private to ktls_ocf.c and store a pointer to the switch in the ocf_session. This will permit adding an additional function pointer needed for NIC TLS RX without further bloating ktls_session. Reviewed by: hselasky Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35011 --- sys/kern/uipc_ktls.c | 6 ++--- sys/opencrypto/ktls.h | 6 +++++ sys/opencrypto/ktls_ocf.c | 60 +++++++++++++++++++++++++++++++++++++---------- sys/sys/ktls.h | 10 +------- 4 files changed, 58 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 466b64d01386..7b99c460e8de 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2073,7 +2073,7 @@ ktls_decrypt(struct socket *so) SBCHECK(sb); SOCKBUF_UNLOCK(sb); - error = tls->sw_decrypt(tls, hdr, data, seqno, &trail_len); + error = ktls_ocf_decrypt(tls, hdr, data, seqno, &trail_len); if (error == 0) { if (tls13) error = tls13_find_record_type(tls, data, @@ -2262,7 +2262,7 @@ ktls_encrypt_record(struct ktls_wq *wq, struct mbuf *m, /* Anonymous mbufs are encrypted in place. */ if ((m->m_epg_flags & EPG_FLAG_ANON) != 0) - return (tls->sw_encrypt(state, tls, m, NULL, 0)); + return (ktls_ocf_encrypt(state, tls, m, NULL, 0)); /* * For file-backed mbufs (from sendfile), anonymous wired @@ -2292,7 +2292,7 @@ ktls_encrypt_record(struct ktls_wq *wq, struct mbuf *m, state->dst_iov[i].iov_base = m->m_epg_trail; state->dst_iov[i].iov_len = m->m_epg_trllen; - error = tls->sw_encrypt(state, tls, m, state->dst_iov, i + 1); + error = ktls_ocf_encrypt(state, tls, m, state->dst_iov, i + 1); if (__predict_false(error != 0)) { /* Free the anonymous pages. */ diff --git a/sys/opencrypto/ktls.h b/sys/opencrypto/ktls.h index 9eb01c9b02a5..b97f589fecb4 100644 --- a/sys/opencrypto/ktls.h +++ b/sys/opencrypto/ktls.h @@ -49,5 +49,11 @@ struct ktls_ocf_encrypt_state { void ktls_encrypt_cb(struct ktls_ocf_encrypt_state *state, int error); void ktls_ocf_free(struct ktls_session *tls); int ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction); +int ktls_ocf_encrypt(struct ktls_ocf_encrypt_state *state, + struct ktls_session *tls, struct mbuf *m, struct iovec *outiov, + int outiovcnt); +int ktls_ocf_decrypt(struct ktls_session *tls, + const struct tls_record_layer *hdr, struct mbuf *m, uint64_t seqno, + int *trailer_len); #endif /* !__OPENCRYPTO_KTLS_H__ */ diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c index 34e76556fccc..575a91f9fe3f 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -47,7 +47,20 @@ __FBSDID("$FreeBSD$"); #include #include +struct ktls_ocf_sw { + /* Encrypt a single outbound TLS record. */ + int (*encrypt)(struct ktls_ocf_encrypt_state *state, + struct ktls_session *tls, struct mbuf *m, + struct iovec *outiov, int outiovcnt); + + /* Decrypt a received TLS record. */ + int (*decrypt)(struct ktls_session *tls, + const struct tls_record_layer *hdr, struct mbuf *m, + uint64_t seqno, int *trailer_len); +}; + struct ktls_ocf_session { + const struct ktls_ocf_sw *sw; crypto_session_t sid; crypto_session_t mac_sid; struct mtx lock; @@ -386,6 +399,10 @@ ktls_ocf_tls_cbc_encrypt(struct ktls_ocf_encrypt_state *state, return (error); } +static const struct ktls_ocf_sw ktls_ocf_tls_cbc_sw = { + .encrypt = ktls_ocf_tls_cbc_encrypt +}; + static int ktls_ocf_tls12_aead_encrypt(struct ktls_ocf_encrypt_state *state, struct ktls_session *tls, struct mbuf *m, struct iovec *outiov, @@ -532,6 +549,11 @@ ktls_ocf_tls12_aead_decrypt(struct ktls_session *tls, return (error); } +static const struct ktls_ocf_sw ktls_ocf_tls12_aead_sw = { + .encrypt = ktls_ocf_tls12_aead_encrypt, + .decrypt = ktls_ocf_tls12_aead_decrypt, +}; + static int ktls_ocf_tls13_aead_encrypt(struct ktls_ocf_encrypt_state *state, struct ktls_session *tls, struct mbuf *m, struct iovec *outiov, @@ -662,6 +684,11 @@ ktls_ocf_tls13_aead_decrypt(struct ktls_session *tls, return (error); } +static const struct ktls_ocf_sw ktls_ocf_tls13_aead_sw = { + .encrypt = ktls_ocf_tls13_aead_encrypt, + .decrypt = ktls_ocf_tls13_aead_decrypt, +}; + void ktls_ocf_free(struct ktls_session *tls) { @@ -806,19 +833,12 @@ ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction) tls->ocf_session = os; if (tls->params.cipher_algorithm == CRYPTO_AES_NIST_GCM_16 || tls->params.cipher_algorithm == CRYPTO_CHACHA20_POLY1305) { - if (direction == KTLS_TX) { - if (tls->params.tls_vminor == TLS_MINOR_VER_THREE) - tls->sw_encrypt = ktls_ocf_tls13_aead_encrypt; - else - tls->sw_encrypt = ktls_ocf_tls12_aead_encrypt; - } else { - if (tls->params.tls_vminor == TLS_MINOR_VER_THREE) - tls->sw_decrypt = ktls_ocf_tls13_aead_decrypt; - else - tls->sw_decrypt = ktls_ocf_tls12_aead_decrypt; - } + if (tls->params.tls_vminor == TLS_MINOR_VER_THREE) + os->sw = &ktls_ocf_tls13_aead_sw; + else + os->sw = &ktls_ocf_tls12_aead_sw; } else { - tls->sw_encrypt = ktls_ocf_tls_cbc_encrypt; + os->sw = &ktls_ocf_tls_cbc_sw; if (tls->params.tls_vminor == TLS_MINOR_VER_ZERO) { os->implicit_iv = true; memcpy(os->iv, tls->params.iv, AES_BLOCK_LEN); @@ -837,3 +857,19 @@ ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction) tls->params.cipher_algorithm == CRYPTO_AES_CBC; return (0); } + +int +ktls_ocf_encrypt(struct ktls_ocf_encrypt_state *state, + struct ktls_session *tls, struct mbuf *m, struct iovec *outiov, + int outiovcnt) +{ + return (tls->ocf_session->sw->encrypt(state, tls, m, outiov, + outiovcnt)); +} + +int +ktls_ocf_decrypt(struct ktls_session *tls, const struct tls_record_layer *hdr, + struct mbuf *m, uint64_t seqno, int *trailer_len) +{ + return (tls->ocf_session->sw->decrypt(tls, hdr, m, seqno, trailer_len)); +} diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index 4fa52f13e127..6d0b391ee0a5 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -167,8 +167,8 @@ struct tls_session_params { #define KTLS_RX 2 struct iovec; -struct ktls_ocf_session; struct ktls_ocf_encrypt_state; +struct ktls_ocf_session; struct ktls_session; struct m_snd_tag; struct mbuf; @@ -176,14 +176,6 @@ struct sockbuf; struct socket; struct ktls_session { - union { - int (*sw_encrypt)(struct ktls_ocf_encrypt_state *state, - struct ktls_session *tls, struct mbuf *m, - struct iovec *outiov, int outiovcnt); - int (*sw_decrypt)(struct ktls_session *tls, - const struct tls_record_layer *hdr, struct mbuf *m, - uint64_t seqno, int *trailer_len); - }; struct ktls_ocf_session *ocf_session; struct m_snd_tag *snd_tag; struct tls_session_params params;