From owner-svn-src-all@freebsd.org Thu Aug 20 10:05:19 2020 Return-Path: Delivered-To: svn-src-all@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 BB1903B9181; Thu, 20 Aug 2020 10:05:19 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXKyl4XVHz4D1c; Thu, 20 Aug 2020 10:05:19 +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 7EF9C122F4; Thu, 20 Aug 2020 10:05:19 +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 07KA5JV3042058; Thu, 20 Aug 2020 10:05:19 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KA5Jpn042057; Thu, 20 Aug 2020 10:05:19 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202008201005.07KA5Jpn042057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 20 Aug 2020 10:05:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364418 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 364418 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 10:05:19 -0000 Author: mjg Date: Thu Aug 20 10:05:19 2020 New Revision: 364418 URL: https://svnweb.freebsd.org/changeset/base/364418 Log: cache: reimplement cache_lookup_nomakeentry as cache_remove_cnp This in particular removes unused arguments. Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Thu Aug 20 05:18:08 2020 (r364417) +++ head/sys/kern/vfs_cache.c Thu Aug 20 10:05:19 2020 (r364418) @@ -97,6 +97,10 @@ SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit__negativ "struct vnode *", "char *"); SDT_PROBE_DEFINE2(vfs, namecache, lookup, miss, "struct vnode *", "char *"); +SDT_PROBE_DEFINE2(vfs, namecache, removecnp, hit, "struct vnode *", + "struct componentname *"); +SDT_PROBE_DEFINE2(vfs, namecache, removecnp, miss, "struct vnode *", + "struct componentname *"); SDT_PROBE_DEFINE1(vfs, namecache, purge, done, "struct vnode *"); SDT_PROBE_DEFINE1(vfs, namecache, purge_negative, done, "struct vnode *"); SDT_PROBE_DEFINE1(vfs, namecache, purgevfs, done, "struct mount *"); @@ -1306,8 +1310,7 @@ cache_lookup_dot(struct vnode *dvp, struct vnode **vpp } static __noinline int -cache_lookup_nomakeentry(struct vnode *dvp, struct vnode **vpp, - struct componentname *cnp, struct timespec *tsp, int *ticksp) +cache_remove_cnp(struct vnode *dvp, struct componentname *cnp) { struct namecache *ncp; struct rwlock *blp; @@ -1317,18 +1320,16 @@ cache_lookup_nomakeentry(struct vnode *dvp, struct vno if (cnp->cn_namelen == 2 && cnp->cn_nameptr[0] == '.' && cnp->cn_nameptr[1] == '.') { - counter_u64_add(dotdothits, 1); dvlp = VP2VNODELOCK(dvp); dvlp2 = NULL; mtx_lock(dvlp); retry_dotdot: ncp = dvp->v_cache_dd; if (ncp == NULL) { - SDT_PROBE3(vfs, namecache, lookup, miss, dvp, - "..", NULL); mtx_unlock(dvlp); if (dvlp2 != NULL) mtx_unlock(dvlp2); + SDT_PROBE2(vfs, namecache, removecnp, miss, dvp, cnp); return (0); } if ((ncp->nc_flag & NCF_ISDOTDOT) != 0) { @@ -1350,7 +1351,8 @@ retry_dotdot: if (dvlp2 != NULL) mtx_unlock(dvlp2); } - return (0); + SDT_PROBE2(vfs, namecache, removecnp, hit, dvp, cnp); + return (1); } hash = cache_get_hash(cnp->cn_nameptr, cnp->cn_namelen, dvp); @@ -1381,9 +1383,10 @@ retry: } counter_u64_add(numposzaps, 1); cache_free(ncp); - return (0); + SDT_PROBE2(vfs, namecache, removecnp, hit, dvp, cnp); + return (1); out_no_entry: - SDT_PROBE3(vfs, namecache, lookup, miss, dvp, cnp->cn_nameptr, NULL); + SDT_PROBE2(vfs, namecache, removecnp, miss, dvp, cnp); counter_u64_add(nummisszap, 1); return (0); } @@ -1448,8 +1451,10 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, st if (__predict_false(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')) return (cache_lookup_dot(dvp, vpp, cnp, tsp, ticksp)); - if ((cnp->cn_flags & MAKEENTRY) == 0) - return (cache_lookup_nomakeentry(dvp, vpp, cnp, tsp, ticksp)); + if ((cnp->cn_flags & MAKEENTRY) == 0) { + cache_remove_cnp(dvp, cnp); + return (0); + } try_smr = true; if (cnp->cn_nameiop == CREATE)