From nobody Sun Sep 24 21:46:53 2023 X-Original-To: dev-commits-src-all@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 4Rv02j5622z4tWg1; Sun, 24 Sep 2023 21:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rv02j4Bqtz4ZMX; Sun, 24 Sep 2023 21:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695592013; 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=LNJ+KSAtMvRUa5ad5MYXVmFWvCgfAUZm4lrYmfv2Fmk=; b=V/fAbgzt5rr+K1IRjoVkC5MCFCurY2M9AbppRIpSk6OLXkkvCoRfMBRO3x8Y+WTjTl0pF0 KPvJTYRwrLVKugfL0d1AfOblAZ0UJJlsFCYUe9vnKc83zYNOm8ZsZ8Xe16tLE5IA+pGecw ROQg/e+g640lZQhkQtYXYE++Upb/cGZ3SfNy7fj3Ph1NU0tVWddwSuLKGSYejZIDx97s8a tjqecVAUB3D551VCjmJSXGb0wvwiWqf4Ze8WrVQhMvUu5LAST1rzjZO38e1QbdCLReMSRO BhwZhHj905hZDr/+SWZ81IPKwPOZYdoMsPYhQewD06LhZDvRILrPYYh9fU1gTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695592013; a=rsa-sha256; cv=none; b=O55kHlfEjG7iJyLYxGmlg841lxRBLByL11D6Zx3h47Wm/Bmfgmf5CQXKBAWorI75808zH8 /Dbt0NhdXcnxhM0vL8Zx8eMAwwGl+jMPmrtjmsU4glLVaQm8Sa2bPJINdTtNVXG/nRy+V0 osDgipRyxaX5h8ohOxd3u8Pza6K+KPoiJF2AqQkkncBErDpZrfjSmwNkQgDDHOS58718sV dC5H0wI30sBZfW9wMkexxqHcwZWY8LGfQV8tKZe1xx4R7LNIymZAd+mdVyd8Uem5ExuoM4 Q/BY6p+qtvXsCXBCrwDClkHs96s0e0GzKBnk2n4amzChfnh8TJQ/J1scN3jDmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695592013; 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=LNJ+KSAtMvRUa5ad5MYXVmFWvCgfAUZm4lrYmfv2Fmk=; b=ofokaPDUfyltAVKfT10g940gHInbHt8N3p6wjMLEeY0B70oq7EzB2HqtQ7ckHJ3a1hMvu7 CuFant6TigFCy2TGW12nvh4SXgasds4sxtYWZz9x7BJYWFs3vinMD+ItlFjDka4aMiQ58E 4rnhyft7xIxDOazXUDDoL59D2PbTXaA5ejci6cxjnnrPbVZ+WURbF63lmwC2CwPk0AHRfI cvgGzxeZa/p6bI89/iLBzrfOX185TqDm5SQhWXvxKGHwn8eErMzzkVS9s5oZhg99exqiEc 16EVh/CLKImBdWbYG/wJyqf7+XKEQzoMgRHcMge8HjHvTg4Ref3BkwzymFdRdA== 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 4Rv02j3CrQz133Q; Sun, 24 Sep 2023 21:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38OLkrn9030618; Sun, 24 Sep 2023 21:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OLkrSe030615; Sun, 24 Sep 2023 21:46:53 GMT (envelope-from git) Date: Sun, 24 Sep 2023 21:46:53 GMT Message-Id: <202309242146.38OLkrSe030615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: dc804471fa88 - releng/14.0 - vfs cache: garbage collect the fullpathfail2 counter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dc804471fa88a60d8112d7beea59c39cf2c1d123 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=dc804471fa88a60d8112d7beea59c39cf2c1d123 commit dc804471fa88a60d8112d7beea59c39cf2c1d123 Author: Mateusz Guzik AuthorDate: 2023-09-14 20:25:54 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-24 21:45:51 +0000 vfs cache: garbage collect the fullpathfail2 counter The conditions it checks cannot legally be true (modulo races against forced unmount), so assert on it instead. Approved by: re (gjb) (cherry picked from commit 07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2) (cherry picked from commit 8e4a043bad750d85e0028ae6ceb9c9e37842bf4a) --- sys/kern/vfs_cache.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 5b0cd64146ad..0f4d7526ebb5 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -542,7 +542,6 @@ STATNODE_COUNTER(negzaps, numnegzaps, STATNODE_COUNTER(neghits, numneghits, "Number of cache hits (negative)"); /* These count for vn_getcwd(), too. */ STATNODE_COUNTER(fullpathcalls, numfullpathcalls, "Number of fullpath search calls"); -STATNODE_COUNTER(fullpathfail1, numfullpathfail1, "Number of fullpath search errors (ENOTDIR)"); STATNODE_COUNTER(fullpathfail2, numfullpathfail2, "Number of fullpath search errors (VOP_VPTOCNP failures)"); STATNODE_COUNTER(fullpathfail4, numfullpathfail4, "Number of fullpath search errors (ENOMEM)"); @@ -3400,14 +3399,7 @@ vn_fullpath_dir(struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, vp = vp1; continue; } - if (vp->v_type != VDIR) { - vrele(vp); - counter_u64_add(numfullpathfail1, 1); - error = ENOTDIR; - SDT_PROBE3(vfs, namecache, fullpath, return, - error, vp, NULL); - break; - } + VNPASS(vp->v_type == VDIR || VN_IS_DOOMED(vp), vp); error = vn_vptocnp(&vp, buf, &buflen); if (error) break;