From nobody Tue Nov 23 23:12:48 2021 X-Original-To: dev-commits-src-branches@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 BC8B318A13E1; Tue, 23 Nov 2021 23:12:51 +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 4HzKg56nmkz3vgh; Tue, 23 Nov 2021 23:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9F3041F59B; Tue, 23 Nov 2021 23:12:48 +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 1ANNCmJc037561; Tue, 23 Nov 2021 23:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNCmor037560; Tue, 23 Nov 2021 23:12:48 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:12:48 GMT Message-Id: <202111232312.1ANNCmor037560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6afc00ed139d - stable/13 - ktls: Use COUNTER_U64_DEFINE_EARLY for the ktls_toe_chacha20 counter. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6afc00ed139d9cfa63d6f99a24d34622e1b6b792 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709170; 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=qxE5L7AUAQsvHc10wDQKULGFzec/1skZkal+93kAXJs=; b=NUw3cmcPs4ciuqjRi4N1mD4QimW/NQBciU9BGzvR6xUJ/y4bCNZpyg9gM5p7cdVL8Nz7Oz gpy6xklc8ULYlpZZywbd1JJRHiH5np8wEfL7ZFqz3GBuDrKpZI7/ArnColSdcqFy6IiuJ4 N/eBnfmuBN0T2wGt0/h1GQGb30DgSVJk03TQQvxC08fFFNR8dl+IL5BM4/ZzizpYKUGwWj 107NiMC8P/PENZqrhbruKhssz30lHEjeUgAaNdfAXpweekPnJu6+LoTIYoMcGkgd6BPM8Q UzRIsU5vFAnjfA1emff4lBG6+rt+9farBXeLu5ZQqSePIHmHXl3xJc3wEC1GzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709170; a=rsa-sha256; cv=none; b=UfhpXcuuY5D0pc0nIs0VxS9u6M0/0HozcCEg1EDDaVk3lJ9xZq4TeNnJSx13uT9uvJftQE sLw3L8o/z3IWH2m14Po3snmd+UIPicGvcZMONXs6qmFEiQzkjGEnOEfEm7/1ksxhHpES/6 gnQYrre/pvbVo7/UxxuyDJjWU2nbQIq/+Kuyvj4w9GhjSzN7EY/Nm9Y0hEchfwT04z002c iLBidgELWJdl0pwmHXSueI3WdgUNAXCIg8oCl/TOttsiikLMi12QWsTWw4XQVPBYdUzsgg Yox/nOSLK/iLZa7DMVA/AqlDC48BdQwHTM8SIWl9+4kZT9wgB7CFeNSUJzPerw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6afc00ed139d9cfa63d6f99a24d34622e1b6b792 commit 6afc00ed139d9cfa63d6f99a24d34622e1b6b792 Author: John Baldwin AuthorDate: 2021-02-20 00:33:46 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:44 +0000 ktls: Use COUNTER_U64_DEFINE_EARLY for the ktls_toe_chacha20 counter. I missed updating this counter when rebasing the changes in 9c64fc40290e08f6dc6b75aa04084b04e48a61af after the switch to COUNTER_U64_DEFINE_EARLY in 1755b2b9891bb1bfa7a58383ef5126821f7e46e3. Fixes: 9c64fc40290e Add Chacha20-Poly1305 as a KTLS cipher suite. Sponsored by: Netflix (cherry picked from commit 90972f04026a2248d616d7466053ff53cf8fdf9d) --- sys/kern/uipc_ktls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 567d3d04a6f0..0cb5343b6a2a 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -249,7 +249,7 @@ SYSCTL_COUNTER_U64(_kern_ipc_tls_toe, OID_AUTO, gcm, CTLFLAG_RD, &ktls_toe_gcm, "Active number of TOE TLS sessions using AES-GCM"); -static counter_u64_t ktls_toe_chacha20; +static COUNTER_U64_DEFINE_EARLY(ktls_toe_chacha20); SYSCTL_COUNTER_U64(_kern_ipc_tls_toe, OID_AUTO, chacha20, CTLFLAG_RD, &ktls_toe_chacha20, "Active number of TOE TLS sessions using Chacha20-Poly1305");