From owner-svn-src-all@freebsd.org Sun May 12 07:56:02 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 743E81590334;
Sun, 12 May 2019 07:56:02 +0000 (UTC) (envelope-from mjg@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 177E88D368;
Sun, 12 May 2019 07:56:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E530927BC7;
Sun, 12 May 2019 07:56:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4C7u1RR036562;
Sun, 12 May 2019 07:56:01 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4C7u1eL036561;
Sun, 12 May 2019 07:56:01 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201905120756.x4C7u1eL036561@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sun, 12 May 2019 07:56:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r347510 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mjg
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 347510
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 177E88D368
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.997,0];
NEURAL_HAM_SHORT(-0.96)[-0.963,0];
NEURAL_HAM_LONG(-1.00)[-1.000,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2019 07:56:02 -0000
Author: mjg
Date: Sun May 12 07:56:01 2019
New Revision: 347510
URL: https://svnweb.freebsd.org/changeset/base/347510
Log:
cache: fix a brainfart in r347505
If bumping over the counter goes over the limit we have to decrement it back.
Previous code would only bump the counter after adding the entry (thus allowing
the cache to go over the limit).
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/kern/vfs_cache.c
Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c Sun May 12 07:55:25 2019 (r347509)
+++ head/sys/kern/vfs_cache.c Sun May 12 07:56:01 2019 (r347510)
@@ -1647,8 +1647,10 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp,
* Avoid blowout in namecache entries.
*/
lnumcache = atomic_fetchadd_long(&numcache, 1) + 1;
- if (__predict_false(lnumcache >= desiredvnodes * ncsizefactor))
+ if (__predict_false(lnumcache >= desiredvnodes * ncsizefactor)) {
+ atomic_add_long(&numcache, -1);
return;
+ }
cache_celockstate_init(&cel);
ndd = NULL;