From owner-dev-commits-src-branches@freebsd.org Wed Aug 18 09:50:50 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 10E1E675106;
Wed, 18 Aug 2021 09:50:50 +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 4GqNST63yYz3mwT;
Wed, 18 Aug 2021 09:50: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 A80367125;
Wed, 18 Aug 2021 09:50:49 +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 17I9on4U086805;
Wed, 18 Aug 2021 09:50:49 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17I9onfY086804;
Wed, 18 Aug 2021 09:50:49 GMT (envelope-from git)
Date: Wed, 18 Aug 2021 09:50:49 GMT
Message-Id: <202108180950.17I9onfY086804@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: 2da4005188ce - stable/12 - frag6: do less work in frag6_slowtimo
if possible
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: 2da4005188ced25eee5ccb803586bf31f4574fca
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:50 -0000
The branch stable/12 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=2da4005188ced25eee5ccb803586bf31f4574fca
commit 2da4005188ced25eee5ccb803586bf31f4574fca
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-08-13 11:32:03 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-08-18 09:48:22 +0000
frag6: do less work in frag6_slowtimo if possible
frag6_slowtimo avoidably uses CPU on otherwise idle boxes
Reviewed by: kp
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D31528
(cherry picked from commit 8afe9481cfa382337b8a885f358fe888bddf5982)
---
sys/netinet6/frag6.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index d27d21e536fe..5a31bbff9747 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -901,10 +901,15 @@ frag6_slowtimo(void)
struct ip6q *q6, *q6tmp;
uint32_t bucket;
+ if (atomic_load_int(&frag6_nfrags) == 0)
+ return;
+
VNET_LIST_RLOCK_NOSLEEP();
VNET_FOREACH(vnet_iter) {
CURVNET_SET(vnet_iter);
for (bucket = 0; bucket < IP6REASS_NHASH; bucket++) {
+ if (V_ip6qb[bucket].count == 0)
+ continue;
IP6QB_LOCK(bucket);
head = IP6QB_HEAD(bucket);
TAILQ_FOREACH_SAFE(q6, head, ip6q_tq, q6tmp)