From nobody Mon Jun 9 23:47:58 2025 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 4bGTBQ4fNHz5yh8J; Mon, 09 Jun 2025 23:47:58 +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 4bGTBQ42wDz3DpV; Mon, 09 Jun 2025 23:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749512878; 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=Gf3wiXqtotXNp+eavBrSTaTk+LFMT4b/OlDdTEvs08M=; b=H8zW1X/IhNM3DIbB8qS0A6GdaDTyZUnI4lxhFxYviPOowh4cmLRXBuWtkZHFKcu6fUzf23 4a5C0ieehzvxRcfLvwb78neMCqODU++9AIGXQ7YdJ5if4bBLjaR9+sk1/vkqt1253rZHca kJY90FEhWyC0wXliOw5Fx7tcuH+gc9xLKeQZbEiqX+0wou1nZoW/Re6tGmUg8c9xpi49aU jdU0W8Ix4L8I6oWxLPO0KEm8dyhmE6NeKaDP7nfcZpYjN1qXN/3JeMAxwJ8DUs6kllx+v2 QQ3umkZVt1bE30PZXqzdpD65y4Hi0NCgiT7Kz4IQbxt9TsenDCyWvKNTedX0sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749512878; 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=Gf3wiXqtotXNp+eavBrSTaTk+LFMT4b/OlDdTEvs08M=; b=VcP4jzO824NyaFaqqnUfQZPrJgEk7pri5dUU1ugxXWos3W0KiGXEC0JaRVA7YI5/9j4VKr mRn39pyom86wwydvIHOl1vV2I91HdTv7miukmPAxtJVx+Msd3fwsT+CQgjAOfOON1Io2fc 1u8H1LK6CHgr5k9Ud6p8sxYUdnxAXQ7q52wbP5NQU4QEJLJYZyShLSC8BET5LwVahd1WxU Iz+UZjTIVR6T1M9+vt9sOAm5tCaR5su51cBMShSR8jjkMx1JVQGAUEK2vtFe3uy1Y1i78b lXGY+X9rKg0wbfdNB3uCVB8Uu9485Gj+lN/x9wWL446nzfWca+WYzAkoQcWUug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749512878; a=rsa-sha256; cv=none; b=KQmdXIQ9H7fxFm2PiQsWHW3JaJYTr7zEysc1sNZm/wxfwWS8yu/BQxHNiIuzXRe3984bO6 ZMSynMEUrlyoC0cDPfBpzSEwVOuK/r3CSA4w5CW6otivLt7wJqVC/anMr606DiNvf/LHKg VNtSH9NV8px6HL/+pvPlsSVL87m6QuJTwB0lkwI9Rug8cQAdecRql1qMcLQSDTFABXx04C gKRPQpodBtZYYI/qTiXepiq9IMp6eosb8q1hMEYXVl+XU/JLvCgWnHHgREVpnkJ7vyQicO 7EIDAsdZyCxYTBimgrGLV6kn3ATuQAULGi564iiKvz4nhfGc8mWpa21HKPQS0g== 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 4bGTBQ3dVyz2P1; Mon, 09 Jun 2025 23:47:58 +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 559NlwQo088639; Mon, 9 Jun 2025 23:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559NlwaF088636; Mon, 9 Jun 2025 23:47:58 GMT (envelope-from git) Date: Mon, 9 Jun 2025 23:47:58 GMT Message-Id: <202506092347.559NlwaF088636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b471d23a6a66 - main - ktls: add global generation count 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b471d23a6a667f54c84b3bb7ed04ea75931ef2b8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b471d23a6a667f54c84b3bb7ed04ea75931ef2b8 commit b471d23a6a667f54c84b3bb7ed04ea75931ef2b8 Author: Konstantin Belousov AuthorDate: 2025-05-21 01:03:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-09 23:47:12 +0000 ktls: add global generation count Reviewed by: jhb, markj Sponsored by: NVidia networking Differential revision: https://reviews.freebsd.org/D50653 --- sys/kern/uipc_ktls.c | 8 ++++++++ sys/sys/ktls.h | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 5e9dd254debd..b479ca9c3ed7 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -595,6 +595,8 @@ start: return (error); } +uint64_t ktls_glob_gen = 1; + static int ktls_create_session(struct socket *so, struct tls_enable *en, struct ktls_session **tlsp, int direction) @@ -819,6 +821,8 @@ ktls_create_session(struct socket *so, struct tls_enable *en, arc4rand(tls->params.iv + 8, sizeof(uint64_t), 0); } + atomic_thread_fence_rel(); + tls->gen = atomic_fetchadd_64(&ktls_glob_gen, 1); *tlsp = tls; return (0); } @@ -861,6 +865,8 @@ ktls_clone_session(struct ktls_session *tls, int direction) memcpy(tls_new->params.cipher_key, tls->params.cipher_key, tls->params.cipher_key_len); + atomic_thread_fence_rel(); + tls_new->gen = atomic_fetchadd_64(&ktls_glob_gen, 1); return (tls_new); } @@ -1940,6 +1946,8 @@ ktls_destroy(struct ktls_session *tls) MPASS(tls->refcount == 0); + atomic_add_acq_64(&ktls_glob_gen, 1); + inp = tls->inp; if (tls->tx) { wlocked = INP_WLOCKED(inp); diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index 0e52d643fe3b..8dad53868686 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -206,9 +206,12 @@ struct ktls_session { /* Used to destroy any kTLS session */ struct task destroy_task; + + uint64_t gen; } __aligned(CACHE_LINE_SIZE); extern unsigned int ktls_ifnet_max_rexmit_pct; +extern uint64_t ktls_glob_gen; typedef enum { KTLS_MBUF_CRYPTO_ST_MIXED = 0, @@ -258,5 +261,11 @@ ktls_free(struct ktls_session *tls) ktls_destroy(tls); } +static inline bool +ktls_session_genvis(const struct ktls_session *ks, uint64_t gen) +{ + return (ks != NULL && ks->gen <= gen); +} + #endif /* !_KERNEL */ #endif /* !_SYS_KTLS_H_ */