From owner-svn-src-head@freebsd.org Mon Jan 20 14:42:12 2020 Return-Path: Delivered-To: svn-src-head@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 30A851FCC27; Mon, 20 Jan 2020 14:42:12 +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 481ZBX0Y6lz4bqG; Mon, 20 Jan 2020 14:42:12 +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 0E223252AB; Mon, 20 Jan 2020 14:42:12 +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 00KEgBQG096684; Mon, 20 Jan 2020 14:42:11 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00KEgBVT096683; Mon, 20 Jan 2020 14:42:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001201442.00KEgBVT096683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 20 Jan 2020 14:42:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356915 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 356915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jan 2020 14:42:12 -0000 Author: mjg Date: Mon Jan 20 14:42:11 2020 New Revision: 356915 URL: https://svnweb.freebsd.org/changeset/base/356915 Log: cache: make numcachehv use counter(9) on all archs Requested by: kib Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Mon Jan 20 13:46:09 2020 (r356914) +++ head/sys/kern/vfs_cache.c Mon Jan 20 14:42:11 2020 (r356915) @@ -340,16 +340,6 @@ SYSCTL_INT(_debug_sizeof, OID_AUTO, namecache, CTLFLAG sizeof(struct namecache), "sizeof(struct namecache)"); /* - * Use counter(9) for numcachehv if the machine is 64-bit. - * - * Stick to an atomic for the rest since there is no long-sized equivalent and - * 64-bit size is both way more than needed and a pessimization. - */ -#ifdef __LP64__ -#define CACHE_NUMCACHEHV_U64 -#endif - -/* * The new name cache statistics */ static SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW, 0, @@ -361,12 +351,7 @@ static SYSCTL_NODE(_vfs, OID_AUTO, cache, CTLFLAG_RW, SYSCTL_COUNTER_U64(_vfs_cache, OID_AUTO, name, CTLFLAG_RD, &name, descr); STATNODE_ULONG(numneg, "Number of negative cache entries"); STATNODE_ULONG(numcache, "Number of cache entries"); -#ifdef CACHE_NUMCACHEHV_U64 STATNODE_COUNTER(numcachehv, "Number of namecache entries with vnodes held"); -#else -static u_long __exclusive_cache_line numcachehv;/* number of cache entries with vnodes held */ -STATNODE_ULONG(numcachehv, "Number of namecache entries with vnodes held"); -#endif STATNODE_COUNTER(numcalls, "Number of cache lookups"); STATNODE_COUNTER(dothits, "Number of '.' hits"); STATNODE_COUNTER(dotdothits, "Number of '..' hits"); @@ -407,36 +392,6 @@ static int vn_fullpath1(struct thread *td, struct vnod static MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries"); -#ifdef CACHE_NUMCACHEHV_U64 -static void -cache_numcachehv_inc(void) -{ - - counter_u64_add(numcachehv, 1); -} - -static void -cache_numcachehv_dec(void) -{ - - counter_u64_add(numcachehv, -1); -} -#else -static void -cache_numcachehv_inc(void) -{ - - atomic_add_long(&numcachehv, 1); -} - -static void -cache_numcachehv_dec(void) -{ - - atomic_subtract_long(&numcachehv, 1); -} -#endif - static int cache_yield; SYSCTL_INT(_vfs_cache, OID_AUTO, yield, CTLFLAG_RD, &cache_yield, 0, "Number of times cache called yield"); @@ -917,7 +872,7 @@ cache_zap_locked(struct namecache *ncp, bool neg_locke LIST_REMOVE(ncp, nc_src); if (LIST_EMPTY(&ncp->nc_dvp->v_cache_src)) { ncp->nc_flag |= NCF_DVDROP; - cache_numcachehv_dec(); + counter_u64_add(numcachehv, -1); } } atomic_subtract_rel_long(&numcache, 1); @@ -1786,7 +1741,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, held_dvp = false; if (LIST_EMPTY(&dvp->v_cache_src) && flag != NCF_ISDOTDOT) { vhold(dvp); - cache_numcachehv_inc(); + counter_u64_add(numcachehv, 1); held_dvp = true; } @@ -1881,7 +1836,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, if (LIST_EMPTY(&dvp->v_cache_src)) { if (!held_dvp) { vhold(dvp); - cache_numcachehv_inc(); + counter_u64_add(numcachehv, 1); } } else { if (held_dvp) { @@ -1892,7 +1847,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, * this from changing. */ vdrop(dvp); - cache_numcachehv_dec(); + counter_u64_add(numcachehv, -1); } } LIST_INSERT_HEAD(&dvp->v_cache_src, ncp, nc_src); @@ -1930,7 +1885,7 @@ out_unlock_free: cache_free(ncp); if (held_dvp) { vdrop(dvp); - cache_numcachehv_dec(); + counter_u64_add(numcachehv, -1); } return; } @@ -2001,9 +1956,7 @@ nchinit(void *dummy __unused) mtx_init(&ncneg_shrink_lock, "ncnegs", NULL, MTX_DEF); -#ifdef CACHE_NUMCACHEHV_U64 numcachehv = counter_u64_alloc(M_WAITOK); -#endif numcalls = counter_u64_alloc(M_WAITOK); dothits = counter_u64_alloc(M_WAITOK); dotdothits = counter_u64_alloc(M_WAITOK);