From owner-dev-commits-src-branches@freebsd.org Wed Aug 18 09:50:49 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A533675102;
Wed, 18 Aug 2021 09:50:49 +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 4GqNSS6GVBz3mst;
Wed, 18 Aug 2021 09:50:48 +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 826BE6F66;
Wed, 18 Aug 2021 09:50: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 17I9omLC086780;
Wed, 18 Aug 2021 09:50:48 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17I9omlQ086779;
Wed, 18 Aug 2021 09:50:48 GMT (envelope-from git)
Date: Wed, 18 Aug 2021 09:50:48 GMT
Message-Id: <202108180950.17I9omlQ086779@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Guzik <mjg@FreeBSD.org>
Subject: git: 3fdd170c5825 - stable/12 - frag6: drop the volatile keyword from
frag6_nfrags and mark with __exclusive_cache_line
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mjg
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 3fdd170c5825fd90b050a54b6da5f985ad573159
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Aug 2021 09:50:49 -0000
The branch stable/12 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=3fdd170c5825fd90b050a54b6da5f985ad573159
commit 3fdd170c5825fd90b050a54b6da5f985ad573159
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-08-13 11:28:39 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-08-18 09:48:19 +0000
frag6: drop the volatile keyword from frag6_nfrags and mark with __exclusive_cache_line
The keyword adds nothing as all operations on the var are performed
through atomic_*
Reviewed by: kp
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D31528
(cherry picked from commit c17ae18080b4412435aa2fb91cd6e81dd6cd180b)
---
sys/netinet6/frag6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 15b2c2a14af0..d27d21e536fe 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -116,7 +116,7 @@ VNET_DEFINE_STATIC(bool, frag6_on);
/* System wide (global) maximum and count of packets in reassembly queues. */
static int ip6_maxfrags;
-static volatile u_int frag6_nfrags = 0;
+static u_int __exclusive_cache_line frag6_nfrags;
/* Maximum and current packets in per-VNET reassembly queue. */
VNET_DEFINE_STATIC(int, ip6_maxfragpackets);
@@ -165,7 +165,7 @@ VNET_DEFINE_STATIC(uint32_t, ip6qb_hashseed);
SYSCTL_DECL(_net_inet6_ip6);
SYSCTL_UINT(_net_inet6_ip6, OID_AUTO, frag6_nfrags,
- CTLFLAG_RD, __DEVOLATILE(u_int *, &frag6_nfrags), 0,
+ CTLFLAG_RD, &frag6_nfrags, 0,
"Global number of IPv6 fragments across all reassembly queues.");
static void