From nobody Fri Sep 22 21:51:17 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 4RsmDk2v2lz4tTpk; Fri, 22 Sep 2023 21:51:18 +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 4RsmDj70Chz3Pv3; Fri, 22 Sep 2023 21:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695419478; 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=H31v6R35FeWZFdg4sbzuL4j8xIzbp0czsgNObTGnUkM=; b=t1bCFQ1/E+f1+/LoKVLDgk1Ksa8BmTl2XUX+xeu1hpc4J6CAP7K+VyEctDJozxyqSrFj4o 5qGEdhx/JPDKWFQHk4OZc90NppHdVBzVHQiKzCVS6GpNZ6YDl+89Csk5X0EWjLZLKxdH1v LaqFcAGCkvFEwUTQutzRGJBNiv1ETuxn5w92Y5JrxPgoo6rCF4xh9O2+pmRXThfSBlnNmV eUHTbjbf9boUp6vBvxY+l/ZJCLU3KQ6C3d3tVuAuvkef1YbTK42Bj8h3szXJaj9kLp9E8z JN2V1kK81YqrAVgb6k1/FU/9UUtUXkGRiPo4+r0zsauwJ3lUfjlWU6lL5QcR5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695419478; a=rsa-sha256; cv=none; b=NJLXW/WWfvTHuNg3zwV7YSUdgM0OCwQV8/hXV/OXlZiK1myEIbFKM8RvG6cpTKCc40dfMw vVVNxEfWtCBTaNjfrCzxuZYX7cenxg4zhPDfKlIZEtha91/mfaynuD3CqbPNgi3eA0HfPx yf3J3ZK+wg5UcV8pB8KKMw/gHSyMU6d7sucNw/dHl1p/GqfoVIrI7yuzsG8i9DYryz9T1H vjLmCGEzRZZj8sQ42zWrCGba+xee6/IKkGCsA+CIRu0JEfYXaSICOruwRBOICKhTRdX21N xmOgLP0p0+C3blx/res/w3oVETR7QHJiVJhku14cvX6hhcRyRwyHa+i1Q08PPA== 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=1695419478; 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=H31v6R35FeWZFdg4sbzuL4j8xIzbp0czsgNObTGnUkM=; b=phKjPvvnDGb0L9YFA7yi10VdDljY/I4svCNfp7PCECs8O4cfYzSqlNSKPb4efEylN1Rn0b xOJJECoEPZhe8RvKHeTc4tAUdyhQjp6PdlmT4EJc16PQ80wxhJ54+gyGuXpY1Kp9T5Ys7r oOFEgwL8P/WhVyO064xfQC3Mn+U6Nsb+lM+2tLlyUCuzaKHs4avP8aD0nDUWZEACTNwJUf Gg/gRhTNdOxSRMJ1l7kFRGkH8EEWYLKdQSzI/qS991Qh3Ds7xWey9+1NPNkCUJZurfPmBL mmXw0mAomYAvordIy0qcjvKiNyWaZ7pCJw2mRRTAdEg51OR5mqKzVpqUUY8JFA== 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 4RsmDj62wgzdkK; Fri, 22 Sep 2023 21:51:17 +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 38MLpHRW039358; Fri, 22 Sep 2023 21:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MLpHQG039355; Fri, 22 Sep 2023 21:51:17 GMT (envelope-from git) Date: Fri, 22 Sep 2023 21:51:17 GMT Message-Id: <202309222151.38MLpHQG039355@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: 8e4a043bad75 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e4a043bad750d85e0028ae6ceb9c9e37842bf4a Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8e4a043bad750d85e0028ae6ceb9c9e37842bf4a commit 8e4a043bad750d85e0028ae6ceb9c9e37842bf4a Author: Mateusz Guzik AuthorDate: 2023-09-14 20:25:54 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 21:50:47 +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. (cherry picked from commit 07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2) --- 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;