From nobody Sat May 3 00:04:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zq7MN6y3hz5vGxq; Sat, 03 May 2025 00:04:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zq7MN6H4Lz40jb; Sat, 03 May 2025 00:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746230688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JZQvK9jfDanezgYR7ydA/GbkPaqxEARbMrXeWAyw+s=; b=dM/pcRcx8B/v8x4x2iGD5lFaH230AIOhCXFg7AGLEsDrlqNB00RuZExGkuIxFVnd6Lt33X ctIX6TLwA53FAs+ljj3WhgIQcvm7gkW+vX0MavzWgw6j3cABxpU7N++7B1eAc6cFPox/ML w/rvCVRAwlUjmkx8NrlSlpHhvOVJmIyBeOXcnBoAt3QUPD6f186JtOsBlxzRqCsJQ3eiCs FhXnvuSFm0RH54o45xa7OEKYQwXSjfMv+QOFXHJKNR8QwCl/fNJcJrcZZGxuo6O/bz4QwF Rbx1XxLEwQtgkrRRrSidFVslyCXVF2TjKdUA43UhO9bnhKgZAgzbHonM1Cu79g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746230688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JZQvK9jfDanezgYR7ydA/GbkPaqxEARbMrXeWAyw+s=; b=by0MdRgFlLjhTRfWTiphIScaDUHhaxbOQtOSglrtFhUx6vU619rPDXgO9YWYzteASVT7jH Pr7S/REKdPRh2K84ZWiUz/l3vAOTEvUZ2FwZ4X4uBOk0ppV/TFqCrv8B8aztBjbffjELc4 qaTQuMfuVHCjUSNY8Be6l5lkuKnb0PxB2CnJPEyh9bSoOOHwl2lKcy6/af3tGL4EKapS4K w/nuJ25Bj2OUN6yvwJovYD+f5lOFhbxRbPqu2clWne4ZUwzGzBlCb3QkGZymyYFu907u8T B23cgACR/iK+0Bm9ZiM6MyAOVFBMEu2uDbgl/oVWTdVy97espfGki4p3hHKJ2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746230688; a=rsa-sha256; cv=none; b=WuXW0ny1omPT6yrReTQw7ipyoeEmEcilrkcF7dF7LIQSoxp4Kt8TFaOdWlqRVlLbtQDIve m3ptz2xE5HpWXv6ZLa3rTDxqkyB3G0qC4ljJHkOrcwK6mXRgHge67jFlsV7CbKWBOJFnH4 R+0idc422afr8/uYK+ZJ7iH9wLpSOZWXxbR2Ri91nAJdRe2QX7VnrQP9eJ0cGYfz1IIbCP U/uJAWPqVfc8ckZatTBg04SN96MrNj0IXlkT0aQZ+KNzqTv6l6wWWfA3bG0f7sgAFfQw/Q Vb+wlZJs/bcpDC+Jd5KW672QqPwi7zTy9AAxGWhXWLHw2/7aES005/8dRvb17Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zq7MN5TXXz3fC; Sat, 03 May 2025 00:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54304mVu035214; Sat, 3 May 2025 00:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54304mQK035211; Sat, 3 May 2025 00:04:48 GMT (envelope-from git) Date: Sat, 3 May 2025 00:04:48 GMT Message-Id: <202505030004.54304mQK035211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 029ed5f574f6 - main - vfs cache: Add a predicate for testing cache entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 029ed5f574f61443fd12e0e70c7ab4dc296b81e5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=029ed5f574f61443fd12e0e70c7ab4dc296b81e5 commit 029ed5f574f61443fd12e0e70c7ab4dc296b81e5 Author: Mark Johnston AuthorDate: 2025-05-02 21:34:16 +0000 Commit: Mark Johnston CommitDate: 2025-05-03 00:04:32 +0000 vfs cache: Add a predicate for testing cache entries No functional change intended. Reviewed by: olce, kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50105 --- sys/kern/vfs_cache.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e96724b928a6..670ac66ae6d7 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_ktrace.h" @@ -459,6 +458,18 @@ cache_ncp_invalidate(struct namecache *ncp) atomic_thread_fence_rel(); } +/* + * Does this entry match the given directory and name? + */ +static bool +cache_ncp_match(struct namecache *ncp, struct vnode *dvp, + struct componentname *cnp) +{ + return (ncp->nc_dvp == dvp && + ncp->nc_nlen == cnp->cn_namelen && + bcmp(ncp->nc_name, cnp->cn_nameptr, cnp->cn_namelen) == 0); +} + /* * Check whether the entry can be safely used. * @@ -1413,8 +1424,7 @@ cache_neg_promote_cond(struct vnode *dvp, struct componentname *cnp, /* * The newly found entry may be something different... */ - if (!(ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen))) { + if (!cache_ncp_match(ncp, dvp, cnp)) { goto out_abort; } @@ -1760,12 +1770,9 @@ cache_zap_unlocked_bucket(struct namecache *ncp, struct componentname *cnp, cache_lock_vnodes(dvlp, vlp); mtx_lock(blp); CK_SLIST_FOREACH(rncp, (NCHHASH(hash)), nc_hash) { - if (rncp == ncp && rncp->nc_dvp == dvp && - rncp->nc_nlen == cnp->cn_namelen && - !bcmp(rncp->nc_name, cnp->cn_nameptr, rncp->nc_nlen)) + if (rncp == ncp && cache_ncp_match(rncp, dvp, cnp)) break; } - if (rncp == NULL) goto out_mismatch; @@ -1872,8 +1879,7 @@ retry: mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -2073,8 +2079,7 @@ retry: mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -2168,8 +2173,7 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, vfs_smr_enter(); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -2569,9 +2573,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, */ ncpp = NCHHASH(hash); CK_SLIST_FOREACH(n2, ncpp, nc_hash) { - if (n2->nc_dvp == dvp && - n2->nc_nlen == cnp->cn_namelen && - !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) { + if (cache_ncp_match(n2, dvp, cnp)) { MPASS(cache_ncp_canuse(n2)); if ((n2->nc_flag & NCF_NEGATIVE) != 0) KASSERT(vp == NULL, @@ -3104,8 +3106,7 @@ cache_validate(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) blp = HASH2BUCKETLOCK(hash); mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) { + if (cache_ncp_match(ncp, dvp, cnp)) { if (ncp->nc_vp != vp) panic("%s: mismatch (%p != %p); ncp %p [%s] dvp %p\n", __func__, vp, ncp->nc_vp, ncp, ncp->nc_name, ncp->nc_dvp); @@ -5554,8 +5555,7 @@ cache_fplookup_next(struct cache_fpl *fpl) MPASS(!cache_fpl_isdotdot(cnp)); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; }