From nobody Sun Jun 1 19:53:58 2025 X-Original-To: dev-commits-src-branches@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 4b9SN71brGz5y5nj; Sun, 01 Jun 2025 19:53:59 +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 4b9SN70xCDz3t3m; Sun, 01 Jun 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807639; 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=JSVPhUDEqDS2Iipj1EcYM11gIl73Gys1nGB7ASvCBv4=; b=atLVUiK3lMEG1zB4tgniZFyEZLVO66QFqFVnSY7wvzWeGv0CDHnSSqBHs8dxt9ebH3en7E V0v88ip9IRLpq9Vnd+MRMLg4e4N2f86YGB7BPeYt5e6r7Dw9+Q8XjgsnRbIPRmr1AZnt1G zB9gAz7byJS1NPVdJ++n1mmoIBN2KBRcjVnMa6ce3hKrxneM67wWihdFNRTW7z5KlaF86P LU/AYBxkHoai9VzEFq5aAr1rVXYwpYbxDyKhreQBaabpJisHUFINY+pDACUdcT0EmPAgP5 WM8qwFpPF3RE/wbTuPjoPoLkAkZZuK5Fi7kLDOG7mMx9gTq5KvtBA1CDUHRoqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807639; 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=JSVPhUDEqDS2Iipj1EcYM11gIl73Gys1nGB7ASvCBv4=; b=gRcSUeo4dL8EnbSKG5IcADsQLX/45O2nj9QiVFlFi2UUKrepcdGCu3Vtu7cSMLWSLC/ImG mjsYz9nLQirHpnOTg36lOa50KCAypaaSZzhJsFVJzXvfaQLBGn4BqmaGJhzrdYQrXI4cVM pgyVA+9eET7a4i9uu+QiY+3kZlN1s+k9P7zVMeMA0LV/p13ntIW4CJgXD6DLSoLIZEthgn iJwsJyf5rs+rsmTwNLOxWnwKB6mFiK2zvaLzImFViyEAchA6P4k+7Ivjt9+uxXJG15tPVB Fp9FBqbWsrSnt5HkgQdKOGiEaYFu/oxCbD0UwWlvSAoWVZwzqp8/Ttrp1t6c2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807639; a=rsa-sha256; cv=none; b=WU3KEJWVoP0vbXPxEXTGUguJH9XDWy1rH60Xhb8d5HH0bcGDJE2Bl0+ySNsGAc1sw6nGDU 4ttxjAx+pO0KfYU1hi/z+W+QVkF0olyUA2nj7q5GaLk9/z3CfKqO38B2w5vjZfgC9koWw8 y+KIIEu1UvPK2houisFLMei/VDMQOPNdhg7HtYQbxfASr5zgv13iSbuhlwGDA1nVVo/9Ce IGMmisnO7Hup4X3bvjet0/eko60lNS/5imdGP68WePAd+ztCuW+PkcGrG4Rn62xWvDtd3X UPWDvVFGLZjIOn3i9P2qmr1TFj2ZNhNcJYjF6ngQ7uAdBggkxLnc5YoVbvBppg== 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 4b9SN67524zdrf; Sun, 01 Jun 2025 19:53:58 +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 551JrwcJ045996; Sun, 1 Jun 2025 19:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Jrwrj045993; Sun, 1 Jun 2025 19:53:58 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:53:58 GMT Message-Id: <202506011953.551Jrwrj045993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b080a04e2511 - stable/14 - vfs cache: Add a predicate for testing cache entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b080a04e25113112e0d94a20c8d1c1241a3387e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b080a04e25113112e0d94a20c8d1c1241a3387e9 commit b080a04e25113112e0d94a20c8d1c1241a3387e9 Author: Mark Johnston AuthorDate: 2025-05-02 21:34:16 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:28 +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 (cherry picked from commit 029ed5f574f61443fd12e0e70c7ab4dc296b81e5) --- 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 300173347401..9b2b246d234f 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -34,7 +34,6 @@ * @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95 */ -#include #include "opt_ddb.h" #include "opt_ktrace.h" @@ -372,6 +371,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. * @@ -1325,8 +1336,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; } @@ -1672,12 +1682,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; @@ -1784,8 +1791,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; } @@ -1985,8 +1991,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; } @@ -2080,8 +2085,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; } @@ -2481,9 +2485,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, @@ -3016,8 +3018,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); @@ -5462,8 +5463,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; }