From owner-dev-commits-src-main@freebsd.org Fri Jan 1 00:11:53 2021 Return-Path: Delivered-To: dev-commits-src-main@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 259724D6115; Fri, 1 Jan 2021 00:11:53 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6QS90bl8z4bYK; Fri, 1 Jan 2021 00:11:53 +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 05BE9193F9; Fri, 1 Jan 2021 00:11:53 +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 1010Bqjf005807; Fri, 1 Jan 2021 00:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1010BqJX005806; Fri, 1 Jan 2021 00:11:52 GMT (envelope-from git) Date: Fri, 1 Jan 2021 00:11:52 GMT Message-Id: <202101010011.1010BqJX005806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e17e01bd0e4a - main - cache: refactor dot handling 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/main X-Git-Reftype: branch X-Git-Commit: e17e01bd0e4a528fff69bff8faf7045d4d619aae Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 00:11:53 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e17e01bd0e4a528fff69bff8faf7045d4d619aae commit e17e01bd0e4a528fff69bff8faf7045d4d619aae Author: Mateusz Guzik AuthorDate: 2020-12-28 07:46:02 +0000 Commit: Mateusz Guzik CommitDate: 2021-01-01 00:10:43 +0000 cache: refactor dot handling Tested by: pho --- sys/kern/vfs_cache.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index d5e5e6e3d018..22a5b54b2805 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3746,6 +3746,7 @@ _Static_assert((CACHE_FPL_SUPPORTED_CN_FLAGS & CACHE_FPL_INTERNAL_CN_FLAGS) == 0 "supported and internal flags overlap"); static bool cache_fplookup_is_mp(struct cache_fpl *fpl); +static int cache_fplookup_cross_mount(struct cache_fpl *fpl); static bool cache_fpl_islastcn(struct nameidata *ndp) @@ -4392,6 +4393,7 @@ cache_fplookup_noentry(struct cache_fpl *fpl) static int __noinline cache_fplookup_dot(struct cache_fpl *fpl) { + int error; MPASS(!seqc_in_modify(fpl->dvp_seqc)); /* @@ -4401,6 +4403,12 @@ cache_fplookup_dot(struct cache_fpl *fpl) */ fpl->tvp = fpl->dvp; fpl->tvp_seqc = fpl->dvp_seqc; + if (cache_fplookup_is_mp(fpl)) { + error = cache_fplookup_cross_mount(fpl); + if (__predict_false(error != 0)) { + return (error); + } + } counter_u64_add(dothits, 1); SDT_PROBE3(vfs, namecache, lookup, hit, fpl->dvp, ".", fpl->dvp); @@ -4421,6 +4429,8 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) cnp = fpl->cnp; dvp = fpl->dvp; + MPASS(cache_fpl_isdotdot(cnp)); + /* * XXX this is racy the same way regular lookup is */ @@ -4520,14 +4530,22 @@ cache_fplookup_next(struct cache_fpl *fpl) struct vnode *dvp, *tvp; u_char nc_flag; uint32_t hash; + int error; cnp = fpl->cnp; dvp = fpl->dvp; - if (__predict_false(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')) { - return (cache_fplookup_dot(fpl)); + if (__predict_false(cnp->cn_nameptr[0] == '.')) { + if (cnp->cn_namelen == 1) { + return (cache_fplookup_dot(fpl)); + } + if (cnp->cn_namelen == 2 && cnp->cn_nameptr[1] == '.') { + return (cache_fplookup_dotdot(fpl)); + } } + MPASS(!cache_fpl_isdotdot(cnp)); + hash = cache_get_hash(cnp->cn_nameptr, cnp->cn_namelen, dvp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { @@ -4560,6 +4578,13 @@ cache_fplookup_next(struct cache_fpl *fpl) return (cache_fpl_partial(fpl)); } + if (cache_fplookup_is_mp(fpl)) { + error = cache_fplookup_cross_mount(fpl); + if (__predict_false(error != 0)) { + return (error); + } + } + counter_u64_add(numposhits, 1); SDT_PROBE3(vfs, namecache, lookup, hit, dvp, ncp->nc_name, tvp); return (0); @@ -4973,25 +4998,9 @@ cache_fplookup_impl(struct vnode *dvp, struct cache_fpl *fpl) break; } - if (__predict_false(cache_fpl_isdotdot(cnp))) { - error = cache_fplookup_dotdot(fpl); - if (__predict_false(cache_fpl_terminated(fpl))) { - break; - } - } else { - error = cache_fplookup_next(fpl); - if (__predict_false(cache_fpl_terminated(fpl))) { - break; - } - - VNPASS(!seqc_in_modify(fpl->tvp_seqc), fpl->tvp); - - if (cache_fplookup_is_mp(fpl)) { - error = cache_fplookup_cross_mount(fpl); - if (__predict_false(error != 0)) { - break; - } - } + error = cache_fplookup_next(fpl); + if (__predict_false(cache_fpl_terminated(fpl))) { + break; } VNPASS(!seqc_in_modify(fpl->tvp_seqc), fpl->tvp);