From nobody Thu Feb 9 19:12:24 2023 X-Original-To: dev-commits-src-main@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 4PCRMD4PWdz3nQkk; Thu, 9 Feb 2023 19:12:24 +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 4PCRMD3vyfz3Q0H; Thu, 9 Feb 2023 19:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675969944; 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=uVPYmlMVBGnPF30QQGPY6VMRftroIt9ddoEprWzDtrI=; b=JxVihUGE3ziNuN0bc7/JHmElFwXfzTIC0fOXYw1tabAYQIahifmydiLOrPim3yInQnfs5N yLGNfyR2z1PhJ8LinQzVECtjMm2pVajIZhLYE6c0UJFydbdlfZDFyvPijLIpM8t+UlAbxt fbqA2fB+pKcr+tkDRFkp0nF8615ARoQt78QnLLzi9AGmVuscVplIYM4+nhlpGhzGN3Meft 5Jcqz1q79t9FTgsxUMAz1yfCG8BV306Db7QwdsEqIraRVGcjzSzUcguXMXqUNty4aqxdV7 to3iwj++u5uYtZR4S9+njn2tSknH8MdebQUbqzEura3pw+LufF7ACl3+/KimKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675969944; 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=uVPYmlMVBGnPF30QQGPY6VMRftroIt9ddoEprWzDtrI=; b=H8pJk2Ih6K26854cym5oQ34x/KDNHhXctqPghFzsZVY5RDD1yexZgIglHFrIHye+8GPLU1 0vNxxmY1VPEnp0rcRdvMPaCJIEpSD1Pyq+hta10XLHkBV3haBU03CKqH2zERBnXNxHycGU O6yI4U40bfzya4+w+QOhceQYRfvvMujf5Zl5ViILrLGahQxmGtxxfYHAte2a7ngjIvEGgw RAyG3qPnLTDZD1Ztz9PysGpfGtFxtLxdS0T0tVUCaZMqtdNmsTKlpnoFd1hOpVoOjzJ667 sG/soWbdTQ1D35NuNpMfiGlmPEodaWkMojRT+6oVfE+TfQyDxHYJWLf+mzGQZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675969944; a=rsa-sha256; cv=none; b=UemLmjULCzJguruG/Rg5oPkvxyXhNWqeoPr6rOtkbY7VkkPqT9FDLPDd6oZ/ynMTMaF40r LP483uCwacEYl4ZH1XaJupaYUxx0MCqIRzBnWUJ4yMwvfKSCrJNf3noc+Fmy7C5YZlZXrN KcbzaLMto5Qan6sqDkKrEhTzKl9w/jcnJsoljI6pSLoD0eVs5TTCvTJNZDHJTloNhgulAi cOvs4j4B3cKJ5n2QukFLrAvlsN7TL1Ohv0SoO1WYrTN07EDtHsFbXdbfSAevrWFBSEhz6k T8YHFU1alWteFri4D9tTJvBTPA8KPz1NiUCbeLbhoZnW53t1wZByMUKP1Eqcbw== 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 4PCRMD2zFVzpj5; Thu, 9 Feb 2023 19:12:24 +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 319JCO7F069463; Thu, 9 Feb 2023 19:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319JCOa8069462; Thu, 9 Feb 2023 19:12:24 GMT (envelope-from git) Date: Thu, 9 Feb 2023 19:12:24 GMT Message-Id: <202302091912.319JCOa8069462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d24b032bec1b - main - ktls: Fix comments & whitespace issues with c0e4090e3d43 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d24b032bec1b868b99fd1f3f23ec8116cd719e94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d24b032bec1b868b99fd1f3f23ec8116cd719e94 commit d24b032bec1b868b99fd1f3f23ec8116cd719e94 Author: Andrew Gallatin AuthorDate: 2023-02-09 19:09:05 +0000 Commit: Andrew Gallatin CommitDate: 2023-02-09 19:11:24 +0000 ktls: Fix comments & whitespace issues with c0e4090e3d43 Address some last minute review feedback on c0e4090e3d43 by fixing spacing around comments, and clarifying that the newly added destroy_task is not related to tls 1.0. No functional change intended. Pointed out by: jhb Sponsored by: Netflix --- sys/kern/uipc_ktls.c | 3 ++- sys/sys/ktls.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index b3895aee9249..cb2e3f272774 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1478,6 +1478,7 @@ ktls_set_tx_mode(struct socket *so, int mode) /* Don't allow enabling ifnet ktls multiple times */ if (tp->t_nic_ktls_xmit) return (EALREADY); + /* * Don't enable ifnet ktls if we disabled it due to an * excessive retransmission rate @@ -1850,7 +1851,6 @@ ktls_destroy(struct ktls_session *tls) * know that we don't hold the inp rlock, and * can safely take the wlock */ - if (curthread->td_rw_rlocks == 0) { INP_WLOCK(inp); } else { @@ -3335,6 +3335,7 @@ ktls_disable_ifnet(void *arg) SOCK_UNLOCK(so); return; } + /* * note that t_nic_ktls_xmit_dis is never cleared; disabling * ifnet can only be done once per connection, so we never want diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index 909d5347bc47..549ce3ee869d 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -201,6 +201,8 @@ struct ktls_session { /* Only used for TLS 1.0. */ uint64_t next_seqno; STAILQ_HEAD(, mbuf) pending_records; + + /* Used to destroy any kTLS session */ struct task destroy_task; } __aligned(CACHE_LINE_SIZE);