From nobody Mon Jul 8 16:10:59 2024 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 4WHpyD2pzmz5Q30D; Mon, 08 Jul 2024 16:11:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHpyC6zktz46B7; Mon, 8 Jul 2024 16:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720455060; 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=42VAn1ujTvfyf4AosxUOX01mcFfkE0lJ6m9/71/ELYg=; b=v+TPecpwLf/4Q5zQLxKq4WBfSpqhp35YVBpblPljki0frTsOJFOC2vlCRFY1sB3O64yH14 lR408ri/r7WJSSDn5e0uG02bPSlPOw3AxmRlZqf9urtbTxBBI13vm9Wmv7cwu9UR2Z/pQ6 m2obxDPni87779MgckKXs/gxYC4/5TYGtrM6SEKHgkgZ6NcW66eOZKhtkoaTGxdGIvgrNf FapPq7QW7lC1vmckNtQLa0MK4YjF39AH2qTaqLIbcR/2FWsX4JJhupSxwQ4nTNo4jif79A pztnDnqrd5I5uE7K+p9S7GnQbSXbi3X0O8cvwjO7z3drb5cAdkZwFxM04MJ4IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720455060; a=rsa-sha256; cv=none; b=Nm1BMfItEXpp3XPe642HinppIXTXm9NTZMdcSIq21Ifu4JoWgpA99EhFpUuf1nFDHzT9C4 Ys4ewf8d3z5CdSH8embs2htqz1jCku25N56I/oVOtUoA2keMTd9UfDiYL8XvWYV3hnJblF nJaC2gSLEdPZhkjOfGgMjNGYOl7k6NMYxCvN9qTymXeAdkjVBtcofoM/MF/n0znxFcCwXf FVOVsGcSnFzpRLk3xtlfxkIetvvX204mFBqczlwz7VblmUxzaJcsYqTLOEF0U6vGUJPpin B/ulamCytlQQ+eq/6vjN7YDmv/JjloOvV4GRFoAQnvtGj2La0AfzoBWQYLKzYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720455060; 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=42VAn1ujTvfyf4AosxUOX01mcFfkE0lJ6m9/71/ELYg=; b=ZWBhDdaZIHAOPW5yT38D5P3sZHzgPmIPUWD0zctCjYuQVZ/eZVKZdYXnCoMEgfYmSfZgHb rm4kw46FYwQWloEL9SGYpaMIz5RuhjcUtCuTHdsCN4SZIa1UKJ2ElfHuo1zh8vs7cjzYUE ko093YSoY81uYfL2zr6ZDQwXDIZmkCpzmSfwPwzBlwdvMKsJLaSUnqTbunhS3md8IrVNHq Vi/QV1P0ERtn6gaBMH9OwxU0kNbnSP4vIamZ90KJNfwdSMHoPkZ1Z1WOswTESB5bGJBNFw Zf6KVBQamDMJfI75KKThc9g9ZHFt15e9a3iAzwwnN6Wk6AZijzUF0ObXxzoWDw== 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 4WHpyC259qzxp6; Mon, 8 Jul 2024 16:10:59 +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 468GAx4L077361; Mon, 8 Jul 2024 16:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 468GAxN9077358; Mon, 8 Jul 2024 16:10:59 GMT (envelope-from git) Date: Mon, 8 Jul 2024 16:10:59 GMT Message-Id: <202407081610.468GAxN9077358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5dfca6c375d5 - main - ktls: Remove the socket parameter to ktls_ocf_try() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5dfca6c375d530908eedb7f103681c2493cf0ca3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5dfca6c375d530908eedb7f103681c2493cf0ca3 commit 5dfca6c375d530908eedb7f103681c2493cf0ca3 Author: Mark Johnston AuthorDate: 2024-07-08 15:52:07 +0000 Commit: Mark Johnston CommitDate: 2024-07-08 16:10:48 +0000 ktls: Remove the socket parameter to ktls_ocf_try() The socket is unused, and not passing it means that there's less to think about when considering how KTLS is synchronized with the rest of the socket code. No functional change intended. Reviewed by: gallatin MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D45675 --- sys/kern/uipc_ktls.c | 10 +++++----- sys/opencrypto/ktls.h | 2 +- sys/opencrypto/ktls_ocf.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 5ea99966bf13..1e4a933d4e4f 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1153,11 +1153,11 @@ ktls_use_sw(struct ktls_session *tls) } static int -ktls_try_sw(struct socket *so, struct ktls_session *tls, int direction) +ktls_try_sw(struct ktls_session *tls, int direction) { int error; - error = ktls_ocf_try(so, tls, direction); + error = ktls_ocf_try(tls, direction); if (error) return (error); ktls_use_sw(tls); @@ -1314,7 +1314,7 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) if (error) return (error); - error = ktls_ocf_try(so, tls, KTLS_RX); + error = ktls_ocf_try(tls, KTLS_RX); if (error) { ktls_free(tls); return (error); @@ -1407,7 +1407,7 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) #endif error = ktls_try_ifnet(so, tls, KTLS_TX, false); if (error) - error = ktls_try_sw(so, tls, KTLS_TX); + error = ktls_try_sw(tls, KTLS_TX); if (error) { ktls_free(tls); @@ -1599,7 +1599,7 @@ ktls_set_tx_mode(struct socket *so, int mode) if (mode == TCP_TLS_MODE_IFNET) error = ktls_try_ifnet(so, tls_new, KTLS_TX, true); else - error = ktls_try_sw(so, tls_new, KTLS_TX); + error = ktls_try_sw(tls_new, KTLS_TX); if (error) { counter_u64_add(ktls_switch_failed, 1); ktls_free(tls_new); diff --git a/sys/opencrypto/ktls.h b/sys/opencrypto/ktls.h index 0fe02b7f50f5..efba25e17013 100644 --- a/sys/opencrypto/ktls.h +++ b/sys/opencrypto/ktls.h @@ -48,7 +48,7 @@ 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_try(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); diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c index 5f0339e82962..74b48f2366c1 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -982,7 +982,7 @@ ktls_ocf_free(struct ktls_session *tls) } int -ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction) +ktls_ocf_try(struct ktls_session *tls, int direction) { struct crypto_session_params csp, mac_csp, recrypt_csp; struct ktls_ocf_session *os;