From owner-svn-src-head@freebsd.org Sun Sep 4 08:55:16 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6826BBCEC96; Sun, 4 Sep 2016 08:55:16 +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 mx1.freebsd.org (Postfix) with ESMTPS id 45B7AC83; Sun, 4 Sep 2016 08:55:16 +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 u848tFsG055196; Sun, 4 Sep 2016 08:55:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u848tFbF055195; Sun, 4 Sep 2016 08:55:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201609040855.u848tFbF055195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 4 Sep 2016 08:55:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r305378 - head/sys/kern X-SVN-Group: head 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.22 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: Sun, 04 Sep 2016 08:55:16 -0000 Author: mjg Date: Sun Sep 4 08:55:15 2016 New Revision: 305378 URL: https://svnweb.freebsd.org/changeset/base/305378 Log: cache: put all negative entry management code into dedicated functions Reviewed by: kib MFC after: 1 week Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Sun Sep 4 08:53:58 2016 (r305377) +++ head/sys/kern/vfs_cache.c Sun Sep 4 08:55:15 2016 (r305378) @@ -433,6 +433,50 @@ SYSCTL_PROC(_debug_hashstat, OID_AUTO, n #endif /* + * Negative entries management + */ +static void +cache_negative_hit(struct namecache *ncp) +{ + + rw_assert(&cache_lock, RA_WLOCKED); + TAILQ_REMOVE(&ncneg, ncp, nc_dst); + TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); +} + +static void +cache_negative_insert(struct namecache *ncp) +{ + + rw_assert(&cache_lock, RA_WLOCKED); + MPASS(ncp->nc_vp == NULL); + TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); + numneg++; +} + +static void +cache_negative_remove(struct namecache *ncp) +{ + + rw_assert(&cache_lock, RA_WLOCKED); + MPASS(ncp->nc_vp == NULL); + TAILQ_REMOVE(&ncneg, ncp, nc_dst); + numneg--; +} + +static void +cache_negative_zap_one(void) +{ + struct namecache *ncp; + + rw_assert(&cache_lock, RA_WLOCKED); + ncp = TAILQ_FIRST(&ncneg); + KASSERT(ncp->nc_vp == NULL, ("ncp %p vp %p on ncneg", + ncp, ncp->nc_vp)); + cache_zap(ncp); +} + +/* * cache_zap(): * * Removes a namecache entry from cache, whether it contains an actual @@ -469,8 +513,7 @@ cache_zap(struct namecache *ncp) if (ncp == ncp->nc_vp->v_cache_dd) ncp->nc_vp->v_cache_dd = NULL; } else { - TAILQ_REMOVE(&ncneg, ncp, nc_dst); - numneg--; + cache_negative_remove(ncp); } numcache--; cache_free(ncp); @@ -640,14 +683,7 @@ negative_success: if (!wlocked && !CACHE_UPGRADE_LOCK()) goto wlock; counter_u64_add(numneghits, 1); - /* - * We found a "negative" match, so we shift it to the end of - * the "negative" cache entries queue to satisfy LRU. Also, - * check to see if the entry is a whiteout; indicate this to - * the componentname, if so. - */ - TAILQ_REMOVE(&ncneg, ncp, nc_dst); - TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); + cache_negative_hit(ncp); if (ncp->nc_flag & NCF_WHITE) cnp->cn_flags |= ISWHITEOUT; SDT_PROBE2(vfs, namecache, lookup, hit__negative, dvp, @@ -759,15 +795,13 @@ cache_enter_time(struct vnode *dvp, stru TAILQ_REMOVE(&ncp->nc_vp->v_cache_dst, ncp, nc_dst); } else { - TAILQ_REMOVE(&ncneg, ncp, nc_dst); - numneg--; + cache_negative_remove(ncp); } if (vp != NULL) { TAILQ_INSERT_HEAD(&vp->v_cache_dst, ncp, nc_dst); } else { - TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); - numneg++; + cache_negative_insert(ncp); } ncp->nc_vp = vp; CACHE_WUNLOCK(); @@ -893,17 +927,12 @@ cache_enter_time(struct vnode *dvp, stru } else { if (cnp->cn_flags & ISWHITEOUT) ncp->nc_flag |= NCF_WHITE; - TAILQ_INSERT_TAIL(&ncneg, ncp, nc_dst); - numneg++; + cache_negative_insert(ncp); SDT_PROBE2(vfs, namecache, enter_negative, done, dvp, nc_get_name(ncp)); } - if (numneg * ncnegfactor > numcache) { - ncp = TAILQ_FIRST(&ncneg); - KASSERT(ncp->nc_vp == NULL, ("ncp %p vp %p on ncneg", - ncp, ncp->nc_vp)); - cache_zap(ncp); - } + if (numneg * ncnegfactor > numcache) + cache_negative_zap_one(); CACHE_WUNLOCK(); }